diff options
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 a2bab5c14..4f0814b22 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 $"); | |||
21 | #include "log.h" | 21 | #include "log.h" |
22 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
23 | 23 | ||
24 | #if OPENSSL_VERSION_NUMBER < 0x00906000L | ||
25 | #define SSH_OLD_EVP | ||
26 | #endif | ||
27 | |||
24 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 28 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |
25 | #include "rijndael.h" | 29 | #include "rijndael.h" |
26 | #define AES_KEY rijndael_ctx | 30 | #define AES_KEY rijndael_ctx |
@@ -135,7 +139,9 @@ evp_aes_128_ctr(void) | |||
135 | aes_ctr.init = ssh_aes_ctr_init; | 139 | aes_ctr.init = ssh_aes_ctr_init; |
136 | aes_ctr.cleanup = ssh_aes_ctr_cleanup; | 140 | aes_ctr.cleanup = ssh_aes_ctr_cleanup; |
137 | aes_ctr.do_cipher = ssh_aes_ctr; | 141 | aes_ctr.do_cipher = ssh_aes_ctr; |
142 | #ifndef SSH_OLD_EVP | ||
138 | aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | | 143 | aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | |
139 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; | 144 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; |
145 | #endif | ||
140 | return (&aes_ctr); | 146 | return (&aes_ctr); |
141 | } | 147 | } |