From 7626b75b3c71173ba62c2f92d22bab8f4291e44a Mon Sep 17 00:00:00 2001
From: Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com>
Date: Wed, 2 Jan 2019 09:59:48 -0800
Subject: Update SoftHSM v2.0 to the latest version

Change-Id: Ib3ec2c297f897c82776a66fe2ad55b18984c0337
Issue-ID: AAF-687
Signed-off-by: Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com>
---
 SoftHSMv2/m4/acx_botan_gost.m4 | 65 +++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

(limited to 'SoftHSMv2/m4/acx_botan_gost.m4')

diff --git a/SoftHSMv2/m4/acx_botan_gost.m4 b/SoftHSMv2/m4/acx_botan_gost.m4
index 3720f4a..ba4c334 100644
--- a/SoftHSMv2/m4/acx_botan_gost.m4
+++ b/SoftHSMv2/m4/acx_botan_gost.m4
@@ -8,43 +8,50 @@ AC_DEFUN([ACX_BOTAN_GOST],[
 	LIBS="$CRYPTO_LIBS $LIBS"
 
 	AC_LANG_PUSH([C++])
-	AC_RUN_IFELSE([
-		AC_LANG_SOURCE([[
-			#include <botan/init.h>
-			#include <botan/gost_3410.h>
-			#include <botan/oids.h>
-			#include <botan/version.h>
-			int main()
-			{
-				Botan::LibraryInitializer::initialize();
-				const std::string name("gost_256A");
-				const Botan::OID oid(Botan::OIDS::lookup(name));
-				const Botan::EC_Group ecg(oid);
-				try {
+	AC_CACHE_VAL([acx_cv_lib_botan_gost_support],[
+		acx_cv_lib_botan_gost_support=no
+		AC_RUN_IFELSE([
+			AC_LANG_SOURCE([[
+				#include <botan/init.h>
+				#include <botan/gost_3410.h>
+				#include <botan/oids.h>
+				#include <botan/version.h>
+				int main()
+				{
+					Botan::LibraryInitializer::initialize();
+					const std::string name("gost_256A");
+					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;
-			}
-		]])
-	],[
-		AC_MSG_RESULT([Found GOST])
-	],[
-		AC_MSG_RESULT([Cannot find GOST])
-		AC_MSG_ERROR([
+					return 0;
+				}
+			]])
+		],[
+			AC_MSG_RESULT([Found GOST])
+			acx_cv_lib_botan_gost_support=yes
+		],[
+			AC_MSG_RESULT([Cannot find GOST])
+			AC_MSG_ERROR([
 Botan library has no valid GOST support. Please upgrade to a later version
 of Botan, above or including version 1.10.6 or 1.11.5.
 Alternatively disable GOST support in SoftHSM with --disable-gost
 ])
-	],[])
+		],[
+			AC_MSG_WARN([Cannot test, assuming GOST])
+			acx_cv_lib_botan_gost_support=yes
+		])
+	])
 	AC_LANG_POP([C++])
 
 	CPPFLAGS=$tmp_CPPFLAGS
-- 
cgit 1.2.3-korg