From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 13 Apr 2012 16:21:04 +0000 (+0000)
Subject: - ECDSA support (RFC 6605) by default. Use --disable-ecdsa for older
X-Git-Tag: release-1.4.17rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53a448ffae9d220e38ce459b28148e3d9fc45300;p=thirdparty%2Funbound.git

- ECDSA support (RFC 6605) by default. Use --disable-ecdsa for older
  openssl.


git-svn-id: file:///svn/unbound/trunk@2661 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index d15dfe158..bdfb8e698 100755
--- a/configure
+++ b/configure
@@ -1447,7 +1447,7 @@ Optional Features:
                           purposes
   --disable-sha2          Disable SHA256 and SHA512 RRSIG support
   --disable-gost          Disable GOST support
-  --enable-ecdsa          Enable ECDSA support, experimental
+  --disable-ecdsa         Disable ECDSA support
   --enable-static-exe     enable to compile executables statically against
                           event, ldns libs, for debug purposes
   --enable-lock-checks    enable to check lock and unlock calls, for debug
@@ -16622,19 +16622,21 @@ fi
 
 use_ecdsa="no"
 case "$enable_ecdsa" in
-    yes)
+    no)
+      ;;
+    *)
       ac_fn_c_check_func "$LINENO" "ECDSA_sign" "ac_cv_func_ECDSA_sign"
 if test "x$ac_cv_func_ECDSA_sign" = xyes; then :
 
 else
-  as_fn_error $? "OpenSSL does not support ECDSA" "$LINENO" 5
+  as_fn_error $? "OpenSSL does not support ECDSA: please upgrade or rerun with --disable-ecdsa" "$LINENO" 5
 fi
 
       ac_fn_c_check_func "$LINENO" "SHA384_Init" "ac_cv_func_SHA384_Init"
 if test "x$ac_cv_func_SHA384_Init" = xyes; then :
 
 else
-  as_fn_error $? "OpenSSL does not support SHA384" "$LINENO" 5
+  as_fn_error $? "OpenSSL does not support SHA384: please upgrade or rerun with --disable-ecdsa" "$LINENO" 5
 fi
 
       ac_fn_c_check_decl "$LINENO" "NID_X9_62_prime256v1" "ac_cv_have_decl_NID_X9_62_prime256v1" "$ac_includes_default
@@ -16653,7 +16655,7 @@ _ACEOF
 if test $ac_have_decl = 1; then :
 
 else
-  as_fn_error $? "OpenSSL does not support the ECDSA curves" "$LINENO" 5
+  as_fn_error $? "OpenSSL does not support the ECDSA curves: please upgrade or rerun with --disable-ecdsa" "$LINENO" 5
 fi
 ac_fn_c_check_decl "$LINENO" "NID_secp384r1" "ac_cv_have_decl_NID_secp384r1" "$ac_includes_default
 #include <openssl/evp.h>
@@ -16671,7 +16673,7 @@ _ACEOF
 if test $ac_have_decl = 1; then :
 
 else
-  as_fn_error $? "OpenSSL does not support the ECDSA curves" "$LINENO" 5
+  as_fn_error $? "OpenSSL does not support the ECDSA curves: please upgrade or rerun with --disable-ecdsa" "$LINENO" 5
 fi
 
       # see if OPENSSL 1.0.0 or later (has EVP MD and Verify independency)
@@ -16697,10 +16699,6 @@ _ACEOF
 
       use_ecdsa="yes"
       ;;
-    no)
-      ;;
-    *)
-      ;;
 esac
 
 # check for libevent
diff --git a/configure.ac b/configure.ac
index 65729b6bf..b87feefd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,7 +660,7 @@ case "$enable_gost" in
 	;;
 esac
 
-AC_ARG_ENABLE(ecdsa, AC_HELP_STRING([--enable-ecdsa], [Enable ECDSA support]))
+AC_ARG_ENABLE(ecdsa, AC_HELP_STRING([--disable-ecdsa], [Disable ECDSA support]))
 use_ecdsa="no"
 case "$enable_ecdsa" in
     no)
diff --git a/doc/Changelog b/doc/Changelog
index a18b371a5..2815ab010 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+13 April 2012: Wouter
+	- ECDSA support (RFC 6605) by default. Use --disable-ecdsa for older
+	  openssl.
+
 10 April 2012: Wouter
 	- Applied patch from Daisuke HIGASHI for rrset-roundrobin and
 	  minimal-responses features.