diff options
| author | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
| commit | 5c3a55846a87a40d10aaf08123e4101388d22b87 (patch) | |
| tree | a45c4d5280d6302b64e7f6565715bb358e62102d /cipher.c | |
| parent | 7ff4e6dbe588aab63f1547e917734730f388aaa4 (diff) | |
- (djm) Sync with V_3_7 branch:
- (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 { { "rijndael-cbc@lysator.liu.se", SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, #endif +#if OPENSSL_VERSION_NUMBER >= 0x00906000L { "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 }, +#endif { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } }; |