aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-12-14 19:29:32 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-12-14 19:29:32 +0300
commitf44cb7f9c054c7c827ce3edf57f1b3713c251183 (patch)
tree2236a70bb14f98ea6e457cdcac4a2bd1d2db25cd
parentbb9e1722466fb536bb7df52bbc3c5c6d8e66237a (diff)
Make use of export testscript builtin
-rw-r--r--tests/client.testscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/client.testscript b/tests/client.testscript
index 10470d4..c64e6ed 100644
--- a/tests/client.testscript
+++ b/tests/client.testscript
@@ -32,19 +32,19 @@ test.arguments += rsautl -sign -keyform engine -engine pkcs11
+sed -n -e 's/^OPENSSL_AGENT_PKCS11_PID=(.+);.+$/\1/p' <"$script" | set pid
+sed -n -e 's/^OPENSSL_AGENT_PKCS11_SOCK=(.+);.+;$/\1/p' <"$script" | set sock
- vars = OPENSSL_AGENT_PKCS11_SOCK="$sock"
+ +export OPENSSL_AGENT_PKCS11_SOCK="$sock"
: sign
:
{
- env $vars -- $* --simulate success -inkey 'pkcs11:' >'signature' : simulate-opt
- env $vars -- $* -inkey 'pkcs11:' >'signature' : no-simulate-opt
+ $* --simulate success -inkey 'pkcs11:' >'signature' : simulate-opt
+ $* -inkey 'pkcs11:' >'signature' : no-simulate-opt
}
: failure
:
{
- env $vars -- $* --simulate failure -inkey 'pkcs11:' 2>>EOE != 0
+ $* --simulate failure -inkey 'pkcs11:' 2>>EOE != 0
error: unable to sign using simulated private key
EOE
}
@@ -52,7 +52,7 @@ test.arguments += rsautl -sign -keyform engine -engine pkcs11
: wrong-key
:
{
- env $vars -- $* --simulate success -inkey 'pkcs11:object=key' 2>>EOE != 0
+ $* --simulate success -inkey 'pkcs11:object=key' 2>>EOE != 0
error: private key doesn't match
EOE
}