diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-12-04 23:20:50 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-12-04 23:20:50 +1100 |
commit | ebdef76b5df3c33b05128b4fb2cc484427f99ca6 (patch) | |
tree | f85300cb02af52a48ee1de7726e6382688504add /configure.ac | |
parent | d89745b9e7e2048c13b0173eadc2d41e23b6a79d (diff) |
- (dtucker) [configure.ac moduli.c openbsd-compat/openssl-compat.{c,h}] Add
shims for the new, non-deprecated OpenSSL key generation functions for
platforms that don't have the new interfaces.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c3700d8dd..0ea76c8fd 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.458 2010/11/08 22:26:23 tim Exp $ | 1 | # $Id: configure.ac,v 1.459 2010/12/04 12:20:50 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 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.458 $) | 18 | AC_REVISION($Revision: 1.459 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -2136,6 +2136,8 @@ int main(void) { SSLeay_add_all_algorithms(); } | |||
2136 | ] | 2136 | ] |
2137 | ) | 2137 | ) |
2138 | 2138 | ||
2139 | AC_CHECK_FUNCS(RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex) | ||
2140 | |||
2139 | AC_ARG_WITH(ssl-engine, | 2141 | AC_ARG_WITH(ssl-engine, |
2140 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], | 2142 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], |
2141 | [ if test "x$withval" != "xno" ; then | 2143 | [ if test "x$withval" != "xno" ; then |