[src/trunk]: src/crypto/external/bsd/openssh/dist openssh: Reduce diff from u...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f0cc13ca579
branches:  trunk
changeset: 378236:4f0cc13ca579
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Jul 28 04:25:22 2023 +0000

description:
openssh: Reduce diff from upstream; remove never-enabled #if 0'ed block

diffstat:

 crypto/external/bsd/openssh/dist/cipher.h |  13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diffs (28 lines):

diff -r a92537c13cfc -r 4f0cc13ca579 crypto/external/bsd/openssh/dist/cipher.h
--- a/crypto/external/bsd/openssh/dist/cipher.h Fri Jul 28 02:41:30 2023 +0000
+++ b/crypto/external/bsd/openssh/dist/cipher.h Fri Jul 28 04:25:22 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cipher.h,v 1.15 2020/02/27 00:24:40 christos Exp $     */
+/*     $NetBSD: cipher.h,v 1.16 2023/07/28 04:25:22 rin Exp $  */
 /* $OpenBSD: cipher.h,v 1.55 2020/01/23 10:24:29 dtucker Exp $ */
 
 /*
@@ -49,18 +49,7 @@
 #define CIPHER_DECRYPT         0
 
 struct sshcipher;
-#if 0
-struct sshcipher_ctx {
-       int     plaintext;
-       int     encrypt;
-       EVP_CIPHER_CTX *evp;
-       struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
-       struct aesctr_ctx ac_ctx; /* XXX union with evp? */
-       const struct sshcipher *cipher;
-};
-#else
 struct sshcipher_ctx;
-#endif
 
 const struct sshcipher *cipher_by_name(const char *);
 const char *cipher_warning_message(const struct sshcipher_ctx *);