View | Details | Raw Unified | Return to bug 2466 | Differences between
and this patch

Collapse All | Expand All

(-)a/cipher.c (-2 / +8 lines)
Lines 86-98 static const struct sshcipher ciphers[] = { Link Here
86
#ifdef WITH_OPENSSL
86
#ifdef WITH_OPENSSL
87
	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
87
	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
88
	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
88
	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
89
# ifndef OPENSSL_NO_BF
89
	{ "blowfish-cbc",
90
	{ "blowfish-cbc",
90
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
91
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
92
# endif /* OPENSSL_NO_BF */
93
# ifndef OPENSSL_NO_CAST
91
	{ "cast128-cbc",
94
	{ "cast128-cbc",
92
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
95
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
96
# endif /* OPENSSL_NO_CAST */
97
# ifndef OPENSSL_NO_RC4
93
	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
98
	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
94
	{ "arcfour128",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
99
	{ "arcfour128",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
95
	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
100
	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
101
# endif /* OPENSSL_NO_RC4 */
96
	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
102
	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
97
	{ "aes192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
103
	{ "aes192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
98
	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
104
	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
Lines 626-632 cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) Link Here
626
int
632
int
627
cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
633
cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
628
{
634
{
629
#ifdef WITH_OPENSSL
635
#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
630
	const struct sshcipher *c = cc->cipher;
636
	const struct sshcipher *c = cc->cipher;
631
	int plen = 0;
637
	int plen = 0;
632
638
Lines 645-651 cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat) Link Here
645
void
651
void
646
cipher_set_keycontext(struct sshcipher_ctx *cc, const u_char *dat)
652
cipher_set_keycontext(struct sshcipher_ctx *cc, const u_char *dat)
647
{
653
{
648
#ifdef WITH_OPENSSL
654
#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
649
	const struct sshcipher *c = cc->cipher;
655
	const struct sshcipher *c = cc->cipher;
650
	int plen;
656
	int plen;
651
657

Return to bug 2466