summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c8f249581..142f14cfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
8 NID_X9_62_prime256v1, NID_secp384r1 and NID_secp521r1 and test that the 8 NID_X9_62_prime256v1, NID_secp384r1 and NID_secp521r1 and test that the
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 12
1220131108 1320131108
13 - (dtucker) OpenBSD CVS Sync 14 - (dtucker) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 5d4793cae..20a8cd422 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.541 2013/11/09 07:39:25 dtucker Exp $ 1# $Id: configure.ac,v 1.542 2013/11/09 11:02:31 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.541 $) 18AC_REVISION($Revision: 1.542 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2526,9 +2526,9 @@ AC_LINK_IFELSE(
2526 [ AC_MSG_RESULT([yes]) 2526 [ AC_MSG_RESULT([yes])
2527 enable_nistp521=1 ], 2527 enable_nistp521=1 ],
2528 [ AC_MSG_RESULT([no]) ], 2528 [ AC_MSG_RESULT([no]) ],
2529 [ AC_MSG_WARN([cross-compiling, assuming yes]) 2529 [ AC_MSG_WARN([cross-compiling: assuming yes])
2530 enable_nistp521=1 ] 2530 enable_nistp521=1 ]
2531 ]) 2531 )],
2532 AC_MSG_RESULT([no]) 2532 AC_MSG_RESULT([no])
2533) 2533)
2534 2534