sync with OpenBSD -current

This commit is contained in:
purplerain 2024-07-08 18:11:41 +00:00
parent b97c2ce374
commit d93a7459f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
97 changed files with 717 additions and 833 deletions

View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: appstest.sh,v 1.63 2024/03/03 13:29:19 tb Exp $
# $OpenBSD: appstest.sh,v 1.64 2024/07/08 06:00:34 tb Exp $
#
# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org>
#
@ -959,43 +959,6 @@ __EOF__
#---------#---------#---------#---------#---------#---------#---------
# --- Netscape SPKAC operations ---
section_message "Netscape SPKAC operations"
# server-admin generates SPKAC
start_message "spkac"
spkacfile=$server_dir/spkac.file
$openssl_bin spkac -key $genpkey_rsa -challenge hello -out $spkacfile
check_exit_status $?
$openssl_bin spkac -in $spkacfile -verify -out $spkacfile.out
check_exit_status $?
spkacreq=$server_dir/spkac.req
cat << __EOF__ > $spkacreq
countryName = JP
stateOrProvinceName = Tokyo
organizationName = TEST_DUMMY_COMPANY
commonName = spkac.test-dummy.com
__EOF__
cat $spkacfile >> $spkacreq
# CA signs SPKAC
start_message "ca ... CA signs SPKAC csr"
spkaccert=$server_dir/spkac.cert
$openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \
-spkac $spkacreq -out $spkaccert > $spkaccert.log 2>&1
check_exit_status $?
start_message "x509 ... convert DER format SPKAC cert to PEM"
spkacpem=$server_dir/spkac.pem
$openssl_bin x509 -in $spkaccert -inform DER -out $spkacpem -outform PEM
check_exit_status $?
#---------#---------#---------#---------#---------#---------#---------
# --- user1 operations (generate user1 key and csr) ---
section_message "user1 operations (generate user1 key and csr)"