diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-05-24 10:25:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-06-01 14:38:41 +1000 |
| commit | 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1 (patch) | |
| tree | c6c6ce84f820fd07824bf4f01ce6a84592acea69 /regress/agent-pkcs11.sh | |
| parent | 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439 (diff) | |
| download | openssh-git-07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1.tar.gz | |
upstream: Find openssl binary via environment variable. This
allows overriding if necessary (eg in -portable where we're testing against a
specific version of OpenSSL).
OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
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 fbbaea51..c9bd9d32 100644 --- a/regress/agent-pkcs11.sh +++ b/regress/agent-pkcs11.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-pkcs11.sh,v 1.7 2019/11/26 23:43:10 djm Exp $ +# $OpenBSD: agent-pkcs11.sh,v 1.8 2021/05/24 10:25:18 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 genpkey -algorithm rsa > $RSA +$OPENSSL pkcs8 -nocrypt -in $RSA |\ softhsm2-util --slot "$slot" --label 01 --id 01 --pin "$TEST_SSH_PIN" --import /dev/stdin -openssl genpkey \ +$OPENSSL genpkey \ -genparam \ -algorithm ec \ -pkeyopt ec_paramgen_curve:prime256v1 |\ - openssl genpkey \ + $OPENSSL genpkey \ -paramfile /dev/stdin > $EC -openssl pkcs8 -nocrypt -in $EC |\ +$OPENSSL pkcs8 -nocrypt -in $EC |\ softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin trace "start agent" |