Attachment 2738 Details for Bug 2466 – handle RC4, CAST and/or Blowfish being disabled in libcrypto

[patch] handle RC4, CAST and/or Blowfish being disabled in libcrypto

openssh-openssl-disabled-ciphers.patch (text/plain), 1.60 KB, created by Darren Tucker on 2015-10-26 14:32:23 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2015-10-26 14:32:23 AEDT

Size: 1.60 KB

patch

obsolete

>diff --git a/cipher.c b/cipher.c
>index 02dae6f..35a5538 100644
>--- a/cipher.c
>+++ b/cipher.c
>@@ -86,13 +86,19 @@ static const struct sshcipher ciphers[] = {
> #ifdef WITH_OPENSSL
> 	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
> 	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
>+# 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 */
> 	{ "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 },
>@@ -626,7 +632,7 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
> 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 +651,7 @@ cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
> 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