aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2019-02-07 07:29:12 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2019-02-07 07:29:12 -0500
commit926cab1082eadd590ff657b487f8e42e3459a964 (patch)
tree54a72d51b47150e2a35cbe0bd1c7268ec02ffaee
parent9c6745287c65484309b52d2b3ccdb47bc2ce2906 (diff)
downloadopenssl-pkcs11-export-926cab1082eadd590ff657b487f8e42e3459a964.tar.gz
Fixes for package building
- remove gnutls dependency (p11tool) it's only used for pretty output - make openssl.cnf find the openssl-pkcs11 module directly Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rwxr-xr-xtests/init.sh2
-rw-r--r--tests/openssl.cnf4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/init.sh b/tests/init.sh
index dbe2eac..cba7a0f 100755
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -35,5 +35,3 @@ public key = ${srcdir}/key-pass.pub
private key = ${srcdir}/key-engine.key
EOF
-
-p11tool --list-all 'pkcs11:manufacturer=openssl-pkcs11'
diff --git a/tests/openssl.cnf b/tests/openssl.cnf
index 1e32bb4..de84cb0 100644
--- a/tests/openssl.cnf
+++ b/tests/openssl.cnf
@@ -7,6 +7,10 @@ engines = engines_section
[engines_section]
testengine = testengine_section
+pkcs11 = pkcs11_section
[testengine_section]
dynamic_path = $ENV::srcdir/.libs/testengine.so
+
+[pkcs11_section]
+MODULE_PATH = $ENV::srcdir/../.libs/openssl-pkcs11.so