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_eddsa.m4 | 49 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 SoftHSMv2/m4/acx_botan_eddsa.m4

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

diff --git a/SoftHSMv2/m4/acx_botan_eddsa.m4 b/SoftHSMv2/m4/acx_botan_eddsa.m4
new file mode 100644
index 0000000..88090b7
--- /dev/null
+++ b/SoftHSMv2/m4/acx_botan_eddsa.m4
@@ -0,0 +1,49 @@
+AC_DEFUN([ACX_BOTAN_EDDSA],[
+	AC_MSG_CHECKING(for Botan EDDSA support)
+
+	tmp_CPPFLAGS=$CPPFLAGS
+	tmp_LIBS=$LIBS
+
+	CPPFLAGS="$CPPFLAGS $CRYPTO_INCLUDES"
+	LIBS="$CRYPTO_LIBS $LIBS"
+
+	AC_LANG_PUSH([C++])
+	AC_CACHE_VAL([acx_cv_lib_botan_eddsa_support],[
+		acx_cv_lib_botan_eddsa_support=no
+		AC_RUN_IFELSE([
+			AC_LANG_SOURCE([[
+				#include <botan/init.h>
+				#include <botan/ed25519.h>
+				#include <botan/version.h>
+				int main()
+				{
+					Botan::secure_vector<uint8_t> k(32);
+					try {
+						Botan::Ed25519_PrivateKey* key =
+						new Botan::Ed25519_PrivateKey(k);
+					} catch(...) {
+						return 1;
+					}
+					return 0;
+				}
+			]])
+		],[
+			AC_MSG_RESULT([Found Ed25519])
+			acx_cv_lib_botan_eddsa_support=yes
+		],[
+			AC_MSG_RESULT([Cannot find Ed25519])
+			AC_MSG_ERROR([
+Botan library has no valid EDDSA support. Please upgrade to a later version
+of Botan with EDDSA support.
+Alternatively disable EDDSA support in SoftHSM with --disable-eddsa
+])
+		],[
+			AC_MSG_WARN([Cannot test, assuming EDDSA])
+			acx_cv_lib_botan_eddsa_support=yes
+		])
+	])
+	AC_LANG_POP([C++])
+
+	CPPFLAGS=$tmp_CPPFLAGS
+	LIBS=$tmp_LIBS
+])
-- 
cgit 1.2.3-korg