summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac12
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index feaf96eb7..723ab4d45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
14 #ifdef HAVE_STDINT_H. 14 #ifdef HAVE_STDINT_H.
15 - (dtucker) [defines.h] Add typedefs for uintXX_t types for platforms that 15 - (dtucker) [defines.h] Add typedefs for uintXX_t types for platforms that
16 don't have them. 16 don't have them.
17 - (dtucker) [configure.ac] Split AC_CHECK_FUNCS for OpenSSL functions into
18 separate lines and alphabetize for easier diffing of changes.
17 19
1820140118 2020140118
19 - (djm) OpenBSD CVS Sync 21 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 37db0fa7d..abd912f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.548 2014/01/16 22:53:24 dtucker Exp $ 1# $Id: configure.ac,v 1.549 2014/01/17 04:12:16 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.548 $) 18AC_REVISION($Revision: 1.549 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2350,7 +2350,13 @@ AC_LINK_IFELSE(
2350 ] 2350 ]
2351) 2351)
2352 2352
2353AC_CHECK_FUNCS([RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method HMAC_CTX_init]) 2353AC_CHECK_FUNCS([ \
2354 BN_is_prime_ex \
2355 DSA_generate_parameters_ex \
2356 HMAC_CTX_init \
2357 RSA_generate_key_ex \
2358 RSA_get_default_method \
2359])
2354 2360
2355AC_ARG_WITH([ssl-engine], 2361AC_ARG_WITH([ssl-engine],
2356 [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], 2362 [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ],