sha256 support enabled by default.

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

diff --git a/configure b/configure
index b9e65ecc502cdda87026d4797e3971f46055621a..5c88f8ec12e9c596c281abac94dfed293d35682f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1580,7 +1580,7 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         disable hardcoded rpath (default=enabled)
-  --enable-sha2           Enable SHA256 and SHA512 RRSIG support, experimental
+  --disable-sha2          Disable SHA256 and SHA512 RRSIG support
   --enable-gost           Enable GOST support, experimental
   --enable-static-exe     enable to compile executables statically against
                           event, ldns libs, for debug purposes
@@ -17910,15 +17910,15 @@ if test "${enable_sha2+set}" = set; then
 fi
 
 case "$enable_sha2" in
-       yes)
+       no)
+       ;;
+       yes|*)
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_SHA2 1
 _ACEOF
 
        ;;
-       no|*)
-       ;;
 esac
 
 # Check whether --enable-gost was given.

diff --git a/configure.ac b/configure.ac
index ae83babda0912cf160fe03d01b9f17a56a048885..677c4c2452b7a9c0363e7ae0d9391e3564e056ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -386,12 +386,12 @@ AC_INCLUDES_DEFAULT
 #include <openssl/evp.h>
 ])
 
-AC_ARG_ENABLE(sha2, AC_HELP_STRING([--enable-sha2], [Enable SHA256 and SHA512 RRSIG support, experimental]))
+AC_ARG_ENABLE(sha2, AC_HELP_STRING([--disable-sha2], [Disable SHA256 and SHA512 RRSIG support]))
 case "$enable_sha2" in
-       yes)
-       AC_DEFINE([USE_SHA2], [1], [Define this to enable SHA256 and SHA512 support.])
+       no)
        ;;
-       no|*)
+       yes|*)
+       AC_DEFINE([USE_SHA2], [1], [Define this to enable SHA256 and SHA512 support.])
        ;;
 esac
 

diff --git a/doc/Changelog b/doc/Changelog
index 0c86ff5a351665c948e8172160db4b7988c16b52..d6e08c331e2fac7b3109b4811c69d370a4ae7b9e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
-29 October 2009: Wouter
+28 October 2009: Wouter
        - removed abort on prealloc failure, error still printed but softfail.
        - iana portlist updated.
+       - RFC 5702: RSASHA256 and RSASHA512 support enabled by default.
 
 27 October 2009: Wouter
        - iana portlist updated.

diff --git a/doc/README b/doc/README
index bb6c8276bc5a94b1c8b37d2b3e4ead884e32090e..a111838e417165a1f72fa85677c0a9f6a6552165 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -63,8 +63,8 @@ This software is under BSD license, see LICENSE for details.
        Needs python-devel and swig development tools.
   * --with-pythonmodule
        Compile the python module that processes responses in the server.
-  * --enable-sha2
-       Enable draft support for RSASHA256 and RSASHA512 crypto.
+  * --disable-sha2
+       Disable support for RSASHA256 and RSASHA512 crypto.
   * --enable-gost
        Enable draft support for GOST crypto.