Update SoftHSM v2.0 to the latest version

[aaf/sshsm.git] / SoftHSMv2 / m4 / acx_botan_ecc.m4

diff --git a/SoftHSMv2/m4/acx_botan_ecc.m4 b/SoftHSMv2/m4/acx_botan_ecc.m4
index 9bce21d..1dd067e 100644 (file)
--- a/SoftHSMv2/m4/acx_botan_ecc.m4
+++ b/SoftHSMv2/m4/acx_botan_ecc.m4
@@ -8,42 +8,49 @@ AC_DEFUN([ACX_BOTAN_ECC],[
        LIBS="$CRYPTO_LIBS $LIBS"
 
        AC_LANG_PUSH([C++])
-       AC_RUN_IFELSE([
-               AC_LANG_SOURCE([[
-                       #include <botan/init.h>
-                       #include <botan/ec_group.h>
-                       #include <botan/oids.h>
-                       #include <botan/version.h>
-                       int main()
-                       {
-                               Botan::LibraryInitializer::initialize();
-                               const std::string name("secp256r1");
-                               const Botan::OID oid(Botan::OIDS::lookup(name));
-                               const Botan::EC_Group ecg(oid);
-                               try {
+       AC_CACHE_VAL([acx_cv_lib_botan_ecc_support],[
+               acx_cv_lib_botan_ecc_support=no
+               AC_RUN_IFELSE([
+                       AC_LANG_SOURCE([[
+                               #include <botan/init.h>
+                               #include <botan/ec_group.h>
+                               #include <botan/oids.h>
+                               #include <botan/version.h>
+                               int main()
+                               {
+                                       Botan::LibraryInitializer::initialize();
+                                       const std::string name("secp256r1");
+                                       const Botan::OID oid(Botan::OIDS::lookup(name));
+                                       const Botan::EC_Group ecg(oid);
+                                       try {
 #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0)
-                                       const std::vector<Botan::byte> der =
-                                           ecg.DER_encode(Botan::EC_DOMPAR_ENC_OID);
+                                               const std::vector<Botan::byte> der =
+                                               ecg.DER_encode(Botan::EC_DOMPAR_ENC_OID);
 #else
-                                       const Botan::SecureVector<Botan::byte> der =
-                                           ecg.DER_encode(Botan::EC_DOMPAR_ENC_OID);
+                                               const Botan::SecureVector<Botan::byte> der =
+                                               ecg.DER_encode(Botan::EC_DOMPAR_ENC_OID);
 #endif
-                               } catch(...) {
-                                       return 1;
+                                       } catch(...) {
+                                               return 1;
+                                       }
+                                       return 0;
                                }
-                               return 0;
-                       }
-               ]])
-       ],[
-               AC_MSG_RESULT([Found P256])
-       ],[
-               AC_MSG_RESULT([Cannot find P256])
-               AC_MSG_ERROR([
+                       ]])
+               ],[
+                       AC_MSG_RESULT([Found P256])
+                       acx_cv_lib_botan_ecc_support=yes
+               ],[
+                       AC_MSG_RESULT([Cannot find P256])
+                       AC_MSG_ERROR([
 Botan library has no valid ECC support. Please upgrade to a later version
 of Botan, above or including version 1.10.6 or 1.11.5.
 Alternatively disable ECC support in SoftHSM with --disable-ecc
 ])
-       ],[])
+               ],[
+                       AC_MSG_WARN([Cannot test, assuming P256])
+                       acx_cv_lib_botan_ecc_support=yes
+               ])
+       ])
        AC_LANG_POP([C++])
 
        CPPFLAGS=$tmp_CPPFLAGS