From bb2c31b4fd0e3ced4b209ebf528a1722f71bcfd8 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 Aug 2016 15:04:05 +0100
Subject: [PATCH] Pull Thales configuration into this repository.

---
 mdx/uk/nshield.cfg | 4 ++++
 preprod.properties | 2 +-
 prod.properties    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 mdx/uk/nshield.cfg

diff --git a/mdx/uk/nshield.cfg b/mdx/uk/nshield.cfg
new file mode 100644
index 00000000..d04ed48f
--- /dev/null
+++ b/mdx/uk/nshield.cfg
@@ -0,0 +1,4 @@
+library=/opt/nfast/toolkits/pkcs11/libcknfast.so
+name=nShield
+description=nShield Token
+slot=-1
diff --git a/preprod.properties b/preprod.properties
index 875707fe..0e03cf0d 100644
--- a/preprod.properties
+++ b/preprod.properties
@@ -12,7 +12,7 @@ sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
-sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg
+sign.uk.pkcs11Config = ${basedir}/mdx/uk/nshield.cfg
 
 #
 # Signing key alias within the keystore.
diff --git a/prod.properties b/prod.properties
index 844ba821..b3baa8b8 100644
--- a/prod.properties
+++ b/prod.properties
@@ -12,7 +12,7 @@ sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
-sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg
+sign.uk.pkcs11Config = ${basedir}/mdx/uk/nshield.cfg
 
 #
 # Signing key alias within the keystore.