diff options
author | inoguchi <> | 2019-06-23 05:05:07 +0000 |
---|---|---|
committer | inoguchi <> | 2019-06-23 05:05:07 +0000 |
commit | f01cfee1e4b22d2a5fbeeb5b0107bc4797473a8e (patch) | |
tree | ab75f3dbd9bdeb016c9f23face04fa47e1446f46 | |
parent | b99fc6e536f40b3f737377eb841560cb31f370ba (diff) | |
download | openbsd-f01cfee1e4b22d2a5fbeeb5b0107bc4797473a8e.tar.gz openbsd-f01cfee1e4b22d2a5fbeeb5b0107bc4797473a8e.tar.bz2 openbsd-f01cfee1e4b22d2a5fbeeb5b0107bc4797473a8e.zip |
Add more option test to dgst in appstest.sh
-rwxr-xr-x | src/regress/usr.bin/openssl/appstest.sh | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh index f47f30ce61..57f4cdf17b 100755 --- a/src/regress/usr.bin/openssl/appstest.sh +++ b/src/regress/usr.bin/openssl/appstest.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $OpenBSD: appstest.sh,v 1.19 2019/06/22 15:51:54 inoguchi Exp $ | 3 | # $OpenBSD: appstest.sh,v 1.20 2019/06/23 05:05:07 inoguchi Exp $ |
4 | # | 4 | # |
5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> | 5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> |
6 | # | 6 | # |
@@ -160,24 +160,53 @@ function test_md { | |||
160 | echo $text > $dgstdat | 160 | echo $text > $dgstdat |
161 | hmac_key="test-hmac-key" | 161 | hmac_key="test-hmac-key" |
162 | cmac_key="1234567890abcde1234567890abcde12" | 162 | cmac_key="1234567890abcde1234567890abcde12" |
163 | dgstkey=$user1_dir/dgstkey.pem | ||
164 | dgstpass=test-dgst-pass | ||
165 | dgstpub=$user1_dir/dgstpub.pem | ||
166 | dgstsig=$user1_dir/dgst.sig | ||
167 | |||
168 | $openssl_bin genrsa -aes256 -passout pass:$dgstpass -out $dgstkey | ||
169 | check_exit_status $? | ||
170 | |||
171 | $openssl_bin pkey -in $dgstkey -passin pass:$dgstpass -pubout \ | ||
172 | -out $dgstpub | ||
173 | check_exit_status $? | ||
163 | 174 | ||
164 | digests=`$openssl_bin list-message-digest-commands` | 175 | digests=`$openssl_bin list-message-digest-commands` |
165 | 176 | ||
166 | for d in $digests ; do | 177 | for d in $digests ; do |
167 | 178 | ||
168 | echo -n "$d ... " | 179 | echo -n "$d ... " |
169 | $openssl_bin dgst -$d -out $dgstdat.$d $dgstdat | 180 | $openssl_bin dgst -$d -hex -out $dgstdat.$d $dgstdat |
170 | check_exit_status $? | 181 | check_exit_status $? |
171 | 182 | ||
172 | echo -n "$d HMAC ... " | 183 | echo -n "$d HMAC ... " |
173 | $openssl_bin dgst -$d -hmac $hmac_key -out $dgstdat.$d.hmac \ | 184 | $openssl_bin dgst -$d -c -hmac $hmac_key -out $dgstdat.$d.hmac \ |
174 | $dgstdat | 185 | $dgstdat |
175 | check_exit_status $? | 186 | check_exit_status $? |
176 | 187 | ||
177 | echo -n "$d CMAC ... " | 188 | echo -n "$d CMAC ... " |
178 | $openssl_bin dgst -$d -mac cmac -macopt cipher:aes-128-cbc \ | 189 | $openssl_bin dgst -$d -r -mac cmac -macopt cipher:aes-128-cbc \ |
179 | -macopt hexkey:$cmac_key -out $dgstdat.$d.cmac $dgstdat | 190 | -macopt hexkey:$cmac_key -out $dgstdat.$d.cmac $dgstdat |
180 | check_exit_status $? | 191 | check_exit_status $? |
192 | |||
193 | echo -n "$d sign ... " | ||
194 | $openssl_bin dgst -sign $dgstkey -keyform pem \ | ||
195 | -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:8 \ | ||
196 | -passin pass:$dgstpass -binary -out $dgstsig.$d $dgstdat | ||
197 | check_exit_status $? | ||
198 | |||
199 | echo -n "$d verify ... " | ||
200 | $openssl_bin dgst -verify $dgstpub \ | ||
201 | -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:8 \ | ||
202 | -signature $dgstsig.$d $dgstdat | ||
203 | check_exit_status $? | ||
204 | |||
205 | echo -n "$d prverify ... " | ||
206 | $openssl_bin dgst -prverify $dgstkey -passin pass:$dgstpass \ | ||
207 | -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:8 \ | ||
208 | -signature $dgstsig.$d $dgstdat | ||
209 | check_exit_status $? | ||
181 | done | 210 | done |
182 | } | 211 | } |
183 | 212 | ||