[master] forbid --with-openssl and --enable-native-pkcs11 together

diff --git a/configure b/configure
index 0211dcf501fa97a87a756b96b9ac046ac383265a..572f685b516f193c853b529d9d1d0efe0f274bc6 100755 (executable)
--- a/configure
+++ b/configure
@@ -15378,6 +15378,12 @@ $as_echo "no" >&6; }
 If you don't want OpenSSL, use --without-openssl" "$LINENO" 5
                ;;
        *)
+               if test "$want_native_pkcs11" = "yes"
+               then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+                       as_fn_error $? "OpenSSL and native PKCS11 cannot be used together." "$LINENO" 5
+               fi
                if test "$use_openssl" = "yes"
                then
                        # User did not specify a path - guess it
@@ -16111,28 +16117,36 @@ $as_echo "using native PKCS11 crypto" >&6; }
                PKCS11LINKOBJS='${PKCS11LINKOBJS}'
                PKCS11LINKSRCS='${PKCS11LINKSRCS}'
                PKCS11_TEST=pkcs11
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PKCS11 ECDSA" >&5
+$as_echo_n "checking for PKCS11 ECDSA... " >&6; }
                case "$with_ecdsa" in
                no)
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled PKCS11 ECDSA" >&5
-$as_echo "disabled PKCS11 ECDSA" >&6; }
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
                        ;;
                *)
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
+$as_echo "enabled" >&6; }
                        PKCS11_ECDSA="yes"
 
 $as_echo "#define HAVE_PKCS11_ECDSA 1" >>confdefs.h
 
                        ;;
                esac
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PKCS11 GOST" >&5
+$as_echo_n "checking for PKCS11 GOST... " >&6; }
                case "$with_gost" in
                yes)
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
+$as_echo "enabled" >&6; }
                        PKCS11_GOST="yes"
 
 $as_echo "#define HAVE_PKCS11_GOST 1" >>confdefs.h
 
                        ;;
                *)
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled PKCS11 GOST" >&5
-$as_echo "disabled PKCS11 GOST" >&6; }
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
                        ;;
                esac
                ;;
@@ -16151,8 +16165,6 @@ esac
 
 # for PKCS11 benchmarks
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking clock_gettime" >&5
-$as_echo_n "checking clock_gettime... " >&6; }
 have_clock_gt=no
 ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
 if test "x$ac_cv_func_clock_gettime" = xyes; then :

diff --git a/configure.in b/configure.in
index 479f320f8d92cdc8870338991b06c509354205c8..213c177086260fd87e78cb20f18b7bcff4516a43 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1355,6 +1355,11 @@ case "$use_openssl" in
 If you don't want OpenSSL, use --without-openssl])
                ;;
        *)
+               if test "$want_native_pkcs11" = "yes"
+               then
+                        AC_MSG_RESULT()
+                       AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
+               fi
                if test "$use_openssl" = "yes"
                then
                        # User did not specify a path - guess it
@@ -1910,24 +1915,28 @@ case "$want_native_pkcs11" in
                PKCS11LINKOBJS='${PKCS11LINKOBJS}'
                PKCS11LINKSRCS='${PKCS11LINKSRCS}'
                PKCS11_TEST=pkcs11
+               AC_MSG_CHECKING(for PKCS11 ECDSA)
                case "$with_ecdsa" in
                no)
-                       AC_MSG_RESULT([disabled PKCS11 ECDSA])
+                       AC_MSG_RESULT(disabled)
                        ;;
                *)
+                       AC_MSG_RESULT(enabled)
                        PKCS11_ECDSA="yes"
                        AC_DEFINE(HAVE_PKCS11_ECDSA, 1,
                                  [Define if your PKCS11 provider supports ECDSA.])
                        ;;
                esac
+               AC_MSG_CHECKING(for PKCS11 GOST)
                case "$with_gost" in
                yes)
+                       AC_MSG_RESULT(enabled)
                        PKCS11_GOST="yes"
                        AC_DEFINE(HAVE_PKCS11_GOST, 1,
                                  [Define if your PKCS11 provider supports GOST.])
                        ;;
                *)
-                       AC_MSG_RESULT([disabled PKCS11 GOST])
+                       AC_MSG_RESULT(disabled)
                        ;;
                esac
                ;;
@@ -1945,7 +1954,6 @@ AC_SUBST(PKCS11_TEST)
 
 # for PKCS11 benchmarks
 
-AC_MSG_CHECKING(clock_gettime)
 have_clock_gt=no
 AC_CHECK_FUNC(clock_gettime,have_clock_gt=yes,)
 if test "$have_clock_gt" = "no"; then