md5, sha1, sha256, sha512: support mandating use of openssl

* m4/gl-openssl.m4 (gl_CRYPTO_CHECK): Adjust the --with-openssl
description, to list the now 3 separate options.  Also don't
mention the default=no, since this is implicit given the option
is described as --with-openssl rather than --without-openssl.
If projects change the default they're free to document that.
With --with-openssl[=yes] we now error out when the specified
hash algorithm is not available in libcrypto.

diff --git a/ChangeLog b/ChangeLog
index 3389905..50a16ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-12-03  Pádraig Brady <P@draigBrady.com>
+
+       md5, sha1, sha256, sha512: support mandating use of openssl
+       * m4/gl-openssl.m4 (gl_crypto_check): Adjust the --with-openssl
+       description, to list the now 3 separate options.  also don't
+       mention the default=no, since this is implicit given the option
+       is described as --with-openssl rather than --without-openssl.
+       If projects change the default they're free to document that.
+       with --with-openssl[=yes] we now error out when the specified
+       hash algorithm is not available in libcrypto.
+
 2013-12-03  Ivailo  <xakepa10@gmail.com>
 
        test-xvasprintf: (trivial) fix to disable some -Wformat-security diags

diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4
index f6c55b2..85bf85f 100644 (file)
--- a/m4/gl-openssl.m4
+++ b/m4/gl-openssl.m4
@@ -8,7 +8,8 @@ AC_DEFUN([gl_CRYPTO_CHECK],
 [
   AC_ARG_WITH([openssl],
     [AS_HELP_STRING([--with-openssl],
-      [use libcrypto hash routines if available: default=no])],
+      [use libcrypto hash routines. Valid ARGs are:
+       'yes', 'no', 'optional' => use if available])],
     [],
     [with_openssl=no])
 
@@ -26,8 +27,10 @@ AC_DEFUN([gl_CRYPTO_CHECK],
         [LIB_CRYPTO='-lcrypto'
          AC_DEFINE([HAVE_OPENSSL_$1],[1],
            [Define to 1 if libcrypto is used for $1])])])
-    if test "x$with_openssl" = xyes; then
-      if test "x$LIB_CRYPTO" = x; then
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        AC_MSG_ERROR([openssl development library not found for $1])
+      else
         AC_MSG_WARN([openssl development library not found for $1])
       fi
     fi