]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: remove hack to use non-system libcrypto
authordjm@openbsd.org <djm@openbsd.org>
Mon, 21 Jan 2019 09:13:41 +0000 (09:13 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 21 Jan 2019 12:38:10 +0000 (23:38 +1100)
OpenBSD-Regress-ID: ce72487327eee4dfae1ab0212a1f33871fe0809f

regress/agent-pkcs11.sh

index a57dad6ee42bb6c92cd575505ea0bab5e3cf7e96..5dd771263dca80cefc7748956a36213b9f0e7983 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: agent-pkcs11.sh,v 1.5 2019/01/20 23:26:44 djm Exp $
+#      $OpenBSD: agent-pkcs11.sh,v 1.6 2019/01/21 09:13:41 djm Exp $
 #      Placed in the Public Domain.
 
 tid="pkcs11 agent test"
@@ -73,10 +73,8 @@ openssl genpkey \
 openssl pkcs8 -nocrypt -in $EC |\
     softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin
 
-LIBCRYPTO=${OBJ}/../../../../lib/libcrypto/obj
-
 trace "start agent"
-eval `LD_LIBRARY_PATH=$LIBCRYPTO ${SSHAGENT} -s` > /dev/null
+eval `${SSHAGENT} -s` > /dev/null
 r=$?
 if [ $r -ne 0 ]; then
        fail "could not start ssh-agent: exit code $r"