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_aes_gcm.m4 | 42 ++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

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

diff --git a/SoftHSMv2/m4/acx_botan_aes_gcm.m4 b/SoftHSMv2/m4/acx_botan_aes_gcm.m4
index d52c9cb..4873e30 100644
--- a/SoftHSMv2/m4/acx_botan_aes_gcm.m4
+++ b/SoftHSMv2/m4/acx_botan_aes_gcm.m4
@@ -8,29 +8,35 @@ AC_DEFUN([ACX_BOTAN_AES_GCM],[
 	LIBS="$CRYPTO_LIBS $LIBS"
 
 	AC_LANG_PUSH([C++])
-	AC_RUN_IFELSE([
-		AC_LANG_SOURCE([[
-			#include <botan/botan.h>
-			#include <botan/version.h>
-			int main()
-			{
-				using namespace Botan;
+	AC_CACHE_VAL([acx_cv_lib_botan_aes_gcm_support],[
+		acx_cv_lib_botan_aes_gcm_support=no
+		AC_COMPILE_IFELSE([
+			AC_LANG_SOURCE([[
+				#include <botan/botan.h>
+				#include <botan/version.h>
+				int main()
+				{
+					using namespace Botan;
 
 #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0)
-				return 0;
+					return 0;
+#else
+#error "Botan too old"
 #endif
-				return 1;
-			}
-		]])
-	],[
-		AC_MSG_RESULT([Found AES GCM])
-		AC_DEFINE([WITH_AES_GCM], [1],
-			  [Compile with AES GCM])
-	],[
-		AC_MSG_RESULT([Cannot find AES GCM support, upgrade to Botan >= v2.0.0])
-
+				}
+			]])
+		],[
+			AC_MSG_RESULT([Found AES GCM])
+			acx_cv_lib_botan_aes_gcm_support=yes
+		],[
+			AC_MSG_RESULT([Cannot find AES GCM support, upgrade to Botan >= v2.0.0])
+		])
 	])
 	AC_LANG_POP([C++])
+	if test "x$acx_cv_lib_botan_aes_gcm_support" = xyes; then
+		AC_DEFINE([WITH_AES_GCM], [1],
+			  [Compile with AES GCM])
+	fi
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS
-- 
cgit 1.2.3-korg