From c34e03e4711cabffae3504bcfdac26b67250c45d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 10 Sep 2002 22:26:17 +1000 Subject: - (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL. Patch from Robert Halubek --- cipher.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'cipher.c') diff --git a/cipher.c b/cipher.c index 9e8ef999b..1933d3eab 100644 --- a/cipher.c +++ b/cipher.c @@ -437,6 +437,18 @@ swap_bytes(const u_char *src, u_char *dst, int n) } } +#ifdef SSH_OLD_EVP +static void bf_ssh1_init (EVP_CIPHER_CTX * ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + if (iv != NULL) + memcpy (&(ctx->oiv[0]), iv, 8); + memcpy (&(ctx->iv[0]), &(ctx->oiv[0]), 8); + if (key != NULL) + BF_set_key (&(ctx->c.bf_ks), EVP_CIPHER_CTX_key_length (ctx), + key); +} +#endif static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL; static int @@ -458,6 +470,9 @@ evp_ssh1_bf(void) memcpy(&ssh1_bf, EVP_bf_cbc(), sizeof(EVP_CIPHER)); orig_bf = ssh1_bf.do_cipher; ssh1_bf.nid = NID_undef; +#ifdef SSH_OLD_EVP + ssh1_bf.init = bf_ssh1_init; +#endif ssh1_bf.do_cipher = bf_ssh1_cipher; ssh1_bf.key_len = 32; return (&ssh1_bf); -- cgit v1.2.3