summaryrefslogtreecommitdiff
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 380fe60fe..55031f702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 [cipher-ctr.c] 4 [cipher-ctr.c]
5 Use EVP_CIPHER_CTX_key_length for key length. ok markus@ 5 Use EVP_CIPHER_CTX_key_length for key length. ok markus@
6 (This will fix builds with OpenSSL 0.9.5) 6 (This will fix builds with OpenSSL 0.9.5)
7 - (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5.
8 ok djm@, markus@
7 9
820040206 1020040206
9 - (dtucker) [acss.c acss.h] Fix $Id tags. 11 - (dtucker) [acss.c acss.h] Fix $Id tags.
@@ -1818,4 +1820,4 @@
1818 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1820 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1819 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1821 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1820 1822
1821$Id: ChangeLog,v 1.3216 2004/02/06 23:41:48 dtucker Exp $ 1823$Id: ChangeLog,v 1.3217 2004/02/07 01:29:39 dtucker Exp $
diff --git a/cipher.c b/cipher.c
index 8744cb7b7..c13ff5862 100644
--- a/cipher.c
+++ b/cipher.c
@@ -98,7 +98,7 @@ struct Cipher {
98 { "rijndael-cbc@lysator.liu.se", 98 { "rijndael-cbc@lysator.liu.se",
99 SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, 99 SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc },
100#endif 100#endif
101#if OPENSSL_VERSION_NUMBER >= 0x00906000L 101#if OPENSSL_VERSION_NUMBER >= 0x00905000L
102 { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, 102 { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr },
103 { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, 103 { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr },
104 { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, 104 { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },