diff options
| author | Damien Miller <djm@mindrot.org> | 2002-09-10 22:26:17 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-09-10 22:26:17 +1000 |
| commit | c34e03e4711cabffae3504bcfdac26b67250c45d (patch) | |
| tree | 553d6d95bc205aca9b207be241b3d6f467e0e93e | |
| parent | e9994cb4d77d36f54af146a9ca0ea4db03b861b6 (diff) | |
- (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL.
Patch from Robert Halubek <rob@adso.com.pl>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | cipher.c | 15 |
2 files changed, 18 insertions, 1 deletions
@@ -1,6 +1,8 @@ 20020910 - (djm) Bug #365: Read /.ssh/environment properly under CygWin. Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com> + - (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL. + Patch from Robert Halubek <rob@adso.com.pl> 20020905 - (djm) OpenBSD CVS Sync @@ -1612,4 +1614,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2449 2002/09/10 11:43:53 djm Exp $ +$Id: ChangeLog,v 1.2450 2002/09/10 12:26:17 djm Exp $ @@ -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); |