diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-07-25 12:13:03 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-07-25 22:35:24 +1000 |
| commit | 727ce36c8c5941bde99216d27109405907caae4f (patch) | |
| tree | 4711cc47cddf4d3383af5c0648d499a73fb929e8 /regress/agent-pkcs11.sh | |
| parent | 55e17101a9075f6a63af724261c5744809dcb95c (diff) | |
| download | openssh-git-727ce36c8c5941bde99216d27109405907caae4f.tar.gz | |
upstream: Replace OPENSSL as the variable that points to the
openssl binary with OPENSSL_BIN. This will allow us to use the OPENSSL
variable from mk.conf or the make(1) command line indicating if we're
building with our without OpenSSL, and ultimately get the regress tests
working in the OPENSSL=no configuration.
OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e
Diffstat (limited to 'regress/agent-pkcs11.sh')
| -rw-r--r-- | regress/agent-pkcs11.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh index c9bd9d32..268a70de 100644 --- a/regress/agent-pkcs11.sh +++ b/regress/agent-pkcs11.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-pkcs11.sh,v 1.8 2021/05/24 10:25:18 dtucker Exp $ +# $OpenBSD: agent-pkcs11.sh,v 1.9 2021/07/25 12:13:03 dtucker Exp $ # Placed in the Public Domain. tid="pkcs11 agent test" @@ -62,16 +62,16 @@ notty() { trace "generating keys" RSA=${DIR}/RSA EC=${DIR}/EC -$OPENSSL genpkey -algorithm rsa > $RSA -$OPENSSL pkcs8 -nocrypt -in $RSA |\ +$OPENSSL_BIN genpkey -algorithm rsa > $RSA +$OPENSSL_BIN pkcs8 -nocrypt -in $RSA |\ softhsm2-util --slot "$slot" --label 01 --id 01 --pin "$TEST_SSH_PIN" --import /dev/stdin -$OPENSSL genpkey \ +$OPENSSL_BIN genpkey \ -genparam \ -algorithm ec \ -pkeyopt ec_paramgen_curve:prime256v1 |\ - $OPENSSL genpkey \ + $OPENSSL_BIN genpkey \ -paramfile /dev/stdin > $EC -$OPENSSL pkcs8 -nocrypt -in $EC |\ +$OPENSSL_BIN pkcs8 -nocrypt -in $EC |\ softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin trace "start agent" |