diff options
| author | Damien Miller <djm@mindrot.org> | 2013-02-11 10:39:12 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-02-11 10:39:12 +1100 |
| commit | b6f73b3af6fa14df1306d763dd7ec38f68de6f79 (patch) | |
| tree | f5f8780e1b63d379a66130e8e0db035deceecd6a /configure.ac | |
| parent | 951b53b1bede98fdcfeeac8c5c00dbf3948d9b75 (diff) | |
| download | openssh-git-b6f73b3af6fa14df1306d763dd7ec38f68de6f79.tar.gz | |
- (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
libcrypto that lacks EVP_CIPHER_CTX_ctrl
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6df09e21..e96e81e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.502 2013/02/08 00:50:09 dtucker Exp $ +# $Id: configure.ac,v 1.503 2013/02/10 23:39:13 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.502 $) +AC_REVISION($Revision: 1.503 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2339,7 +2339,12 @@ AC_LINK_IFELSE( #include <openssl/evp.h> ]], [[ exit(EVP_aes_128_gcm() == NULL || - EVP_aes_256_gcm() == NULL); + EVP_aes_256_gcm() == NULL || + EVP_CTRL_GCM_SET_IV_FIXED == 0 || + EVP_CTRL_GCM_IV_GEN == 0 || + EVP_CTRL_GCM_SET_TAG == 0 || + EVP_CTRL_GCM_GET_TAG == 0 || + EVP_CIPHER_CTX_ctrl(NULL, 0, 0, NULL) == 0); ]])], [ AC_MSG_RESULT([yes]) @@ -2351,6 +2356,10 @@ AC_LINK_IFELSE( ] ) +AC_SEARCH_LIBS([EVP_CIPHER_CTX_ctrl], [crypto], + [AC_DEFINE([HAVE_EVP_CIPHER_CTX_CTRL], [1], + [Define if libcrypto has EVP_CIPHER_CTX_ctrl])]) + AC_MSG_CHECKING([if EVP_DigestUpdate returns an int]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ |