summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 142f14cfd..3f9cfae04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
9 latter actually works before using it. Fedora (at least) has NID_secp521r1 9 latter actually works before using it. Fedora (at least) has NID_secp521r1
10 that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897). 10 that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897).
11 - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test. 11 - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test.
12 - (dtucker) [configure.ac] Add missing "test".
12 13
1320131108 1420131108
14 - (dtucker) OpenBSD CVS Sync 15 - (dtucker) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 20a8cd422..f3fe43d7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.542 2013/11/09 11:02:31 dtucker Exp $ 1# $Id: configure.ac,v 1.543 2013/11/09 11:32:51 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.542 $) 18AC_REVISION($Revision: 1.543 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2536,7 +2536,7 @@ COMMENT_OUT_ECC="#no ecc#"
2536TEST_SSH_ECC=no 2536TEST_SSH_ECC=no
2537 2537
2538if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \ 2538if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \
2539 x$enable_nistp521 = x1; then 2539 test x$enable_nistp521 = x1; then
2540 AC_DEFINE(OPENSSL_HAS_ECC, [1], [OpenSSL has ECC]) 2540 AC_DEFINE(OPENSSL_HAS_ECC, [1], [OpenSSL has ECC])
2541fi 2541fi
2542if test x$enable_nistp256 = x1; then 2542if test x$enable_nistp256 = x1; then