diff options
| author | Damien Miller <djm@mindrot.org> | 2013-01-09 16:42:47 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-01-09 16:42:47 +1100 |
| commit | d522c68872689e2e80d9667da1c9a18d04b001cd (patch) | |
| tree | 418d206dc74252baf58aa08b6ce27d789f476378 /configure.ac | |
| parent | 1d75abfe23cadf8cdba0bd2cfd54f3bc1ca80dc5 (diff) | |
- (djm) [cipher.c configure.ac openbsd-compat/openssl-compat.h]
Fix merge botch, automatically detect AES-GCM in OpenSSL, move a little
cipher compat code to openssl-compat.h
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 64c231b7..36761233 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.499 2012/12/12 21:18:56 djm Exp $ +# $Id: configure.ac,v 1.500 2013/01/09 05:42:47 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.499 $) +AC_REVISION($Revision: 1.500 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2320,6 +2320,26 @@ AC_LINK_IFELSE( ] ) +# Check for OpenSSL with EVP_aes_*gcm +AC_MSG_CHECKING([whether OpenSSL has AES GCM via EVP]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[ +#include <string.h> +#include <openssl/evp.h> + ]], [[ + exit(EVP_aes_128_gcm() == NULL || + EVP_aes_256_gcm() == NULL); + ]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE([OPENSSL_HAVE_EVPGCM], [1], + [libcrypto has EVP AES GCM]) + ], + [ + AC_MSG_RESULT([no]) + ] +) + AC_MSG_CHECKING([if EVP_DigestUpdate returns an int]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ |