diff options
| author | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
| commit | 5c3a55846a87a40d10aaf08123e4101388d22b87 (patch) | |
| tree | a45c4d5280d6302b64e7f6565715bb358e62102d /cipher-ctr.c | |
| parent | 7ff4e6dbe588aab63f1547e917734730f388aaa4 (diff) | |
- (djm) Sync with V_3_7 branch:
- (djm) Fix SSH1 challenge kludge
- (djm) Bug #671: Fix builds on OpenBSD
- (djm) Bug #676: Fix PAM stack corruption
- (djm) Fix bad free() in PAM code
- (djm) Don't call pam_end before pam_init
- (djm) Enable build with old OpenSSL again
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
Diffstat (limited to 'cipher-ctr.c')
| -rw-r--r-- | cipher-ctr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index a2bab5c1..4f0814b2 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c @@ -21,6 +21,10 @@ RCSID("$OpenBSD: cipher-ctr.c,v 1.2 2003/06/17 18:14:23 markus Exp $"); #include "log.h" #include "xmalloc.h" +#if OPENSSL_VERSION_NUMBER < 0x00906000L +#define SSH_OLD_EVP +#endif + #if OPENSSL_VERSION_NUMBER < 0x00907000L #include "rijndael.h" #define AES_KEY rijndael_ctx @@ -135,7 +139,9 @@ evp_aes_128_ctr(void) aes_ctr.init = ssh_aes_ctr_init; aes_ctr.cleanup = ssh_aes_ctr_cleanup; aes_ctr.do_cipher = ssh_aes_ctr; +#ifndef SSH_OLD_EVP aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; +#endif return (&aes_ctr); } |