giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #497 from tolonuga/master 

Fix regression tests: some parameters got renamed (#496)
This commit is contained in:
Frank Morgner 2015-07-27 01:36:34 +02:00
parent 28de49b34c 9fed9591ca
commit 7eb62a0898
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/regression/crypt0007
View File

@ -10,7 +10,7 @@
msg <<EOF msg <<EOF
::: :::
::: Testing on-card decryption facilities (1048 bit) ::: Testing on-card decryption facilities (1024 bit)
::: :::
EOF EOF
@ -23,7 +23,7 @@ p15_init --no-so-pin
p15_set_pin -a 01 p15_set_pin -a 01
suppress_error_msg="Key length/algorithm not supported by card" suppress_error_msg="Key length/algorithm not supported by card"
if p15_gen_key rsa/1048 --id 45 --key-usage decrypt -a 01; then if p15_gen_key rsa/1024 --id 45 --key-usage decrypt -a 01; then
msg "Extracting public key" msg "Extracting public key"
run_check_status $p15tool --read-public-key 45 -o $p run_check_status $p15tool --read-public-key 45 -o $p

4
src/tests/regression/functions
View File

@ -255,7 +255,7 @@ EOF
function p15_erase { function p15_erase {
msg "Erasing card ($*)" msg "Erasing card ($*)"
run_display_output $p15init --erase \ run_display_output $p15init --erase-card \
--secret @FF=999999 \ --secret @FF=999999 \
"$@" >&3 >&4 "$@" >&3 >&4
success success
@ -356,6 +356,6 @@ function p15_validate {
msg "Validating card using pkcs11-tool" msg "Validating card using pkcs11-tool"
run_display_output $p11tool -t --login --pin 0000 \ run_display_output $p11tool -t --login --pin 0000 \
--module $p11module \ --module $p11module \
--slot-label "OpenSC Test Card" $* < /dev/null --token-label "OpenSC Test Card" $* < /dev/null
success success
} }