diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-02-07 12:29:39 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-07 12:29:39 +1100 |
commit | 693f8a8aae5b79360f13f478c09235061aa59647 (patch) | |
tree | 7598aefae46df36be5c1a825c702caf0d6e81e03 | |
parent | fc57f71fb1106a5b1b6d37cb595a21d36a049e7e (diff) |
- (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5.
ok djm@, markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | cipher.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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 | ||
8 | 20040206 | 10 | 20040206 |
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 $ |
@@ -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 }, |