Module Name: src
Committed By: rin
Date: Fri Jul 28 04:25:22 UTC 2023
Modified Files:
src/crypto/external/bsd/openssh/dist: cipher.h
Log Message:
openssh: Reduce diff from upstream; remove never-enabled #if 0'ed block
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/cipher.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/cipher.h
diff -u src/crypto/external/bsd/openssh/dist/cipher.h:1.15 src/crypto/external/bsd/openssh/dist/cipher.h:1.16
--- src/crypto/external/bsd/openssh/dist/cipher.h:1.15 Thu Feb 27 00:24:40 2020
+++ src/crypto/external/bsd/openssh/dist/cipher.h Fri Jul 28 04:25:22 2023
@@ -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 *);
