From b7c56b65c12f51fe0dbae798d19c8f58224a5d95 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 25 Jul 2022 21:43:00 +1000 Subject: Remove workarounds for OpenSSL missing AES-GCM. We have some compatibility hacks that were added to support OpenSSL versions that do not support AES GCM mode. Since that time, however, the minimum OpenSSL version that we support has moved to 1.0.1 which *does* have GCM, so this is no longer needed. ok djm@ --- cipher.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'cipher.c') diff --git a/cipher.c b/cipher.c index 5b3a86d6..623f6afc 100644 --- a/cipher.c +++ b/cipher.c @@ -94,12 +94,10 @@ static const struct sshcipher ciphers[] = { { "aes128-ctr", 16, 16, 0, 0, 0, EVP_aes_128_ctr }, { "aes192-ctr", 16, 24, 0, 0, 0, EVP_aes_192_ctr }, { "aes256-ctr", 16, 32, 0, 0, 0, EVP_aes_256_ctr }, -# ifdef OPENSSL_HAVE_EVPGCM { "aes128-gcm@openssh.com", 16, 16, 12, 16, 0, EVP_aes_128_gcm }, { "aes256-gcm@openssh.com", 16, 32, 12, 16, 0, EVP_aes_256_gcm }, -# endif /* OPENSSL_HAVE_EVPGCM */ #else { "aes128-ctr", 16, 16, 0, 0, CFLAG_AESCTR, NULL }, { "aes192-ctr", 16, 24, 0, 0, CFLAG_AESCTR, NULL }, -- cgit v1.2.1