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 /cipher.c | |
parent | e9994cb4d77d36f54af146a9ca0ea4db03b861b6 (diff) |
- (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL.
Patch from Robert Halubek <rob@adso.com.pl>
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -437,6 +437,18 @@ swap_bytes(const u_char *src, u_char *dst, int n) | |||
437 | } | 437 | } |
438 | } | 438 | } |
439 | 439 | ||
440 | #ifdef SSH_OLD_EVP | ||
441 | static void bf_ssh1_init (EVP_CIPHER_CTX * ctx, const unsigned char *key, | ||
442 | const unsigned char *iv, int enc) | ||
443 | { | ||
444 | if (iv != NULL) | ||
445 | memcpy (&(ctx->oiv[0]), iv, 8); | ||
446 | memcpy (&(ctx->iv[0]), &(ctx->oiv[0]), 8); | ||
447 | if (key != NULL) | ||
448 | BF_set_key (&(ctx->c.bf_ks), EVP_CIPHER_CTX_key_length (ctx), | ||
449 | key); | ||
450 | } | ||
451 | #endif | ||
440 | static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL; | 452 | static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL; |
441 | 453 | ||
442 | static int | 454 | static int |
@@ -458,6 +470,9 @@ evp_ssh1_bf(void) | |||
458 | memcpy(&ssh1_bf, EVP_bf_cbc(), sizeof(EVP_CIPHER)); | 470 | memcpy(&ssh1_bf, EVP_bf_cbc(), sizeof(EVP_CIPHER)); |
459 | orig_bf = ssh1_bf.do_cipher; | 471 | orig_bf = ssh1_bf.do_cipher; |
460 | ssh1_bf.nid = NID_undef; | 472 | ssh1_bf.nid = NID_undef; |
473 | #ifdef SSH_OLD_EVP | ||
474 | ssh1_bf.init = bf_ssh1_init; | ||
475 | #endif | ||
461 | ssh1_bf.do_cipher = bf_ssh1_cipher; | 476 | ssh1_bf.do_cipher = bf_ssh1_cipher; |
462 | ssh1_bf.key_len = 32; | 477 | ssh1_bf.key_len = 32; |
463 | return (&ssh1_bf); | 478 | return (&ssh1_bf); |