summaryrefslogtreecommitdiff
path: root/regress/agent-pkcs11.sh
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 09:13:41 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 23:38:10 +1100
commitbeab553f0a9578ef9bffe28b2c779725e77b39ec (patch)
treee0f477cebc661ba64106156189e95588baea1e45 /regress/agent-pkcs11.sh
parent4dc06bd57996f1a46b4c3bababe0d09bc89098f7 (diff)
upstream: remove hack to use non-system libcrypto
OpenBSD-Regress-ID: ce72487327eee4dfae1ab0212a1f33871fe0809f
Diffstat (limited to 'regress/agent-pkcs11.sh')
-rw-r--r--regress/agent-pkcs11.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh
index a57dad6ee..5dd771263 100644
--- a/regress/agent-pkcs11.sh
+++ b/regress/agent-pkcs11.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: agent-pkcs11.sh,v 1.5 2019/01/20 23:26:44 djm Exp $ 1# $OpenBSD: agent-pkcs11.sh,v 1.6 2019/01/21 09:13:41 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="pkcs11 agent test" 4tid="pkcs11 agent test"
@@ -73,10 +73,8 @@ openssl genpkey \
73openssl pkcs8 -nocrypt -in $EC |\ 73openssl pkcs8 -nocrypt -in $EC |\
74 softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin 74 softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin
75 75
76LIBCRYPTO=${OBJ}/../../../../lib/libcrypto/obj
77
78trace "start agent" 76trace "start agent"
79eval `LD_LIBRARY_PATH=$LIBCRYPTO ${SSHAGENT} -s` > /dev/null 77eval `${SSHAGENT} -s` > /dev/null
80r=$? 78r=$?
81if [ $r -ne 0 ]; then 79if [ $r -ne 0 ]; then
82 fail "could not start ssh-agent: exit code $r" 80 fail "could not start ssh-agent: exit code $r"