diff options
author | tb <> | 2024-07-08 06:00:34 +0000 |
---|---|---|
committer | tb <> | 2024-07-08 06:00:34 +0000 |
commit | f07ce6a42c87dbe9eba43aa75699d4430cb57ac0 (patch) | |
tree | e777cd0b8920a6ee27073e634929262c9d5d2adb /src | |
parent | bbcb53027fa7a44c9c75122742a1200ac704c038 (diff) | |
download | openbsd-f07ce6a42c87dbe9eba43aa75699d4430cb57ac0.tar.gz openbsd-f07ce6a42c87dbe9eba43aa75699d4430cb57ac0.tar.bz2 openbsd-f07ce6a42c87dbe9eba43aa75699d4430cb57ac0.zip |
Adjust regress for SPKAC removal
ok jsing
Diffstat (limited to 'src')
-rwxr-xr-x | src/regress/usr.bin/openssl/appstest.sh | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh index 84004df945..572cc73617 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.63 2024/03/03 13:29:19 tb Exp $ | 3 | # $OpenBSD: appstest.sh,v 1.64 2024/07/08 06:00:34 tb Exp $ |
4 | # | 4 | # |
5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> | 5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> |
6 | # | 6 | # |
@@ -959,43 +959,6 @@ __EOF__ | |||
959 | 959 | ||
960 | #---------#---------#---------#---------#---------#---------#--------- | 960 | #---------#---------#---------#---------#---------#---------#--------- |
961 | 961 | ||
962 | # --- Netscape SPKAC operations --- | ||
963 | section_message "Netscape SPKAC operations" | ||
964 | |||
965 | # server-admin generates SPKAC | ||
966 | |||
967 | start_message "spkac" | ||
968 | spkacfile=$server_dir/spkac.file | ||
969 | |||
970 | $openssl_bin spkac -key $genpkey_rsa -challenge hello -out $spkacfile | ||
971 | check_exit_status $? | ||
972 | |||
973 | $openssl_bin spkac -in $spkacfile -verify -out $spkacfile.out | ||
974 | check_exit_status $? | ||
975 | |||
976 | spkacreq=$server_dir/spkac.req | ||
977 | cat << __EOF__ > $spkacreq | ||
978 | countryName = JP | ||
979 | stateOrProvinceName = Tokyo | ||
980 | organizationName = TEST_DUMMY_COMPANY | ||
981 | commonName = spkac.test-dummy.com | ||
982 | __EOF__ | ||
983 | cat $spkacfile >> $spkacreq | ||
984 | |||
985 | # CA signs SPKAC | ||
986 | start_message "ca ... CA signs SPKAC csr" | ||
987 | spkaccert=$server_dir/spkac.cert | ||
988 | $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \ | ||
989 | -spkac $spkacreq -out $spkaccert > $spkaccert.log 2>&1 | ||
990 | check_exit_status $? | ||
991 | |||
992 | start_message "x509 ... convert DER format SPKAC cert to PEM" | ||
993 | spkacpem=$server_dir/spkac.pem | ||
994 | $openssl_bin x509 -in $spkaccert -inform DER -out $spkacpem -outform PEM | ||
995 | check_exit_status $? | ||
996 | |||
997 | #---------#---------#---------#---------#---------#---------#--------- | ||
998 | |||
999 | # --- user1 operations (generate user1 key and csr) --- | 962 | # --- user1 operations (generate user1 key and csr) --- |
1000 | section_message "user1 operations (generate user1 key and csr)" | 963 | section_message "user1 operations (generate user1 key and csr)" |
1001 | 964 | ||