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

Collapse All | Expand All

(-)a/cipher-bf1.c (-2 / +2 lines)
Lines 20-26 Link Here
20
20
21
#include "includes.h"
21
#include "includes.h"
22
22
23
#ifdef WITH_OPENSSL
23
#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_BF)
24
24
25
#include <sys/types.h>
25
#include <sys/types.h>
26
26
Lines 100-103 evp_ssh1_bf(void) Link Here
100
	ssh1_bf.key_len = 32;
100
	ssh1_bf.key_len = 32;
101
	return (&ssh1_bf);
101
	return (&ssh1_bf);
102
}
102
}
103
#endif /* WITH_OPENSSL */
103
#endif /* defined(WITH_OPENSSL) && !defined(OPENSSL_NO_BF) */
(-)a/cipher.c (-2 / +10 lines)
Lines 81-98 static const struct sshcipher ciphers[] = { Link Here
81
#ifdef WITH_SSH1
81
#ifdef WITH_SSH1
82
	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
82
	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
83
	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
83
	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
84
# ifndef OPENSSL_NO_BF
84
	{ "blowfish",	SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
85
	{ "blowfish",	SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
86
# endif /* OPENSSL_NO_BF */
85
#endif /* WITH_SSH1 */
87
#endif /* WITH_SSH1 */
86
#ifdef WITH_OPENSSL
88
#ifdef WITH_OPENSSL
87
	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
89
	{ "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 },
90
	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
91
# ifndef OPENSSL_NO_BF
89
	{ "blowfish-cbc",
92
	{ "blowfish-cbc",
90
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
93
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
94
# endif /* OPENSSL_NO_BF */
95
# ifndef OPENSSL_NO_CAST
91
	{ "cast128-cbc",
96
	{ "cast128-cbc",
92
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
97
			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
98
# endif /* OPENSSL_NO_CAST */
99
# ifndef OPENSSL_NO_RC4
93
	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
100
	{ "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 },
101
	{ "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 },
102
	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
103
# endif /* OPENSSL_NO_RC4 */
96
	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
104
	{ "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 },
105
	{ "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 },
106
	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
Lines 625-631 cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) Link Here
625
int
633
int
626
cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
634
cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat)
627
{
635
{
628
#ifdef WITH_OPENSSL
636
#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
629
	const struct sshcipher *c = cc->cipher;
637
	const struct sshcipher *c = cc->cipher;
630
	int plen = 0;
638
	int plen = 0;
631
639
Lines 644-650 cipher_get_keycontext(const struct sshcipher_ctx *cc, u_char *dat) Link Here
644
void
652
void
645
cipher_set_keycontext(struct sshcipher_ctx *cc, const u_char *dat)
653
cipher_set_keycontext(struct sshcipher_ctx *cc, const u_char *dat)
646
{
654
{
647
#ifdef WITH_OPENSSL
655
#if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_RC4)
648
	const struct sshcipher *c = cc->cipher;
656
	const struct sshcipher *c = cc->cipher;
649
	int plen;
657
	int plen;
650
658

Return to bug 2466