summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--cipher.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 380fe60f..55031f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
[cipher-ctr.c]
Use EVP_CIPHER_CTX_key_length for key length. ok markus@
(This will fix builds with OpenSSL 0.9.5)
+ - (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5.
+ ok djm@, markus@
20040206
- (dtucker) [acss.c acss.h] Fix $Id tags.
@@ -1818,4 +1820,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3216 2004/02/06 23:41:48 dtucker Exp $
+$Id: ChangeLog,v 1.3217 2004/02/07 01:29:39 dtucker Exp $
diff --git a/cipher.c b/cipher.c
index 8744cb7b..c13ff586 100644
--- a/cipher.c
+++ b/cipher.c
@@ -98,7 +98,7 @@ struct Cipher {
{ "rijndael-cbc@lysator.liu.se",
SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc },
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x00906000L
+#if OPENSSL_VERSION_NUMBER >= 0x00905000L
{ "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr },
{ "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr },
{ "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },