diff options
author | Damien Miller <djm@mindrot.org> | 2003-09-23 19:24:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-09-23 19:24:21 +1000 |
commit | e043e8e2211ee07e98f95fe975cca56959eb6c59 (patch) | |
tree | 862aceabb43ef9c0ce7400e1ca981033e17df61d /cipher.c | |
parent | 03575cc07de0c67586e56a5e1ee2d3a3ee35300c (diff) |
- (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.c')
-rw-r--r-- | cipher.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -87,9 +87,11 @@ struct Cipher { | |||
87 | { "rijndael-cbc@lysator.liu.se", | 87 | { "rijndael-cbc@lysator.liu.se", |
88 | SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, | 88 | SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, |
89 | #endif | 89 | #endif |
90 | #if OPENSSL_VERSION_NUMBER >= 0x00906000L | ||
90 | { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, | 91 | { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, |
91 | { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, | 92 | { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, |
92 | { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, | 93 | { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, |
94 | #endif | ||
93 | 95 | ||
94 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } | 96 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } |
95 | }; | 97 | }; |