Attachment 2703 Details for Bug 2466 – patch with preprocessor checks of available ciphers

[patch] patch with preprocessor checks of available ciphers

openssh-7.1p1.patch (text/plain), 2.38 KB, created by Hugo Lopata on 2015-09-14 20:54:36 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Hugo Lopata

Created: 2015-09-14 20:54:36 AEST

Size: 2.38 KB

patch

obsolete

>diff -Naur openssh-7.1p1.old/cipher.c openssh-7.1p1.new/cipher.c
>--- openssh-7.1p1.old/cipher.c	2015-09-14 11:41:37.149922172 +0200
>+++ openssh-7.1p1.new/cipher.c	2015-09-14 12:09:09.778117121 +0200
>@@ -85,14 +85,23 @@
> #endif /* WITH_SSH1 */
> #ifdef WITH_OPENSSL
> 	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
>+# ifndef OPENSSL_NO_DES
> 	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
>+# endif /* OPENSSL_NO_DES */
>+# ifndef OPENSSL_NO_BF
> 	{ "blowfish-cbc",
> 			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
>+# endif /* OPENSSL_NO_BF */
>+# ifndef OPENSSL_NO_CAST
> 	{ "cast128-cbc",
> 			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
>+# endif /* OPENSSL_NO_CAST */
>+# ifndef OPENSSL_NO_RC4
> 	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
> 	{ "arcfour128",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
> 	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
>+# endif /* OPENSSL_NO_RC4 */
>+# ifndef OPENSSL_NO_AES
> 	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
> 	{ "aes192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
> 	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
>@@ -101,12 +110,13 @@
> 	{ "aes128-ctr",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },
> 	{ "aes192-ctr",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },
> 	{ "aes256-ctr",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },
>-# ifdef OPENSSL_HAVE_EVPGCM
>+#  ifdef OPENSSL_HAVE_EVPGCM
> 	{ "aes128-gcm@openssh.com",
> 			SSH_CIPHER_SSH2, 16, 16, 12, 16, 0, 0, EVP_aes_128_gcm },
> 	{ "aes256-gcm@openssh.com",
> 			SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm },
>-# endif /* OPENSSL_HAVE_EVPGCM */
>+#  endif /* OPENSSL_HAVE_EVPGCM */
>+# endif /* OPENSSL_NO_AES */
> #else /* WITH_OPENSSL */
> 	{ "aes128-ctr",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, CFLAG_AESCTR, NULL },
> 	{ "aes192-ctr",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, CFLAG_AESCTR, NULL },
>@@ -626,7 +636,7 @@
> int
> cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
> {
>-#ifdef WITH_OPENSSL
>+#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
> 	const struct sshcipher *c = cc->cipher;
> 	int plen = 0;
> 
>@@ -645,7 +655,7 @@
> void
> cipher_set_keycontext(struct sshcipher_ctx *cc, const u_char *dat)
> {
>-#ifdef WITH_OPENSSL
>+#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
> 	const struct sshcipher *c = cc->cipher;
> 	int plen;
>

Actions: View | Diff

Attachments on bug 2466: 2703 | 2738 | 2850