This commit was manufactured by cvs2git to create tag 'bluhm_20181106'.bluhm_20181106

11 files changed, 0 insertions, 1885 deletions

diff --git a/src/regress/usr.bin/openssl/Makefile b/src/regress/usr.bin/openssl/Makefile
deleted file mode 100644
index 0ef7928ea4..0000000000
--- a/src/regress/usr.bin/openssl/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#       $OpenBSD: Makefile,v 1.6 2018/03/19 03:41:40 beck Exp $
-
-SUBDIR= options
-
-CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
-CLEANFILES+= appstest_dir
-
-REGRESS_TARGETS=ssl-enc ssl-dsa ssl-rsa appstest
-
-OPENSSL=/usr/bin/openssl
-CLEAR1=p
-CIPHER=cipher
-CLEAR2=clear
-LIBCRYPTO=-lcrypto
-
-${CLEAR1}: openssl.cnf
-        cat ${.CURDIR}/openssl.cnf > ${CLEAR1}
-
-CLEANFILES+=${CLEAR1}
-
-ENCTARGETS=aes-128-cbc aes-128-cfb aes-128-cfb1 aes-128-cfb8
-ENCTARGETS+=aes-128-ecb aes-128-ofb aes-192-cbc aes-192-cfb
-ENCTARGETS+=aes-192-cfb1 aes-192-cfb8 aes-192-ecb aes-192-ofb
-ENCTARGETS+=aes-256-cbc aes-256-cfb aes-256-cfb1 aes-256-cfb8
-ENCTARGETS+=aes-256-ecb aes-256-ofb
-ENCTARGETS+=bf-cbc bf-cfb bf-ecb bf-ofb
-ENCTARGETS+=cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb
-ENCTARGETS+=des-cbc des-cfb des-cfb8 des-ecb des-ede
-ENCTARGETS+=des-ede-cbc des-ede-cfb des-ede-ofb des-ede3
-ENCTARGETS+=des-ede3-cbc des-ede3-cfb des-ede3-ofb des-ofb desx-cbc
-ENCTARGETS+=rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb
-ENCTARGETS+=rc4 rc4-40
-
-.for ENC in ${ENCTARGETS}
-${CIPHER}.${ENC}: ${CLEAR1}
-        ${OPENSSL} enc -${ENC} -bufsize 113 -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}
-${CIPHER}.${ENC}.b64: ${CLEAR1}
-        ${OPENSSL} enc -${ENC} -bufsize 113 -a -e -k test < ${CLEAR1} > ${CIPHER}.${ENC}.b64
-
-${CLEAR2}.${ENC}: ${CIPHER}.${ENC}
-        ${OPENSSL} enc -${ENC} -bufsize 157 -d -k test < ${CIPHER}.${ENC} > ${CLEAR2}.${ENC}
-${CLEAR2}.${ENC}.b64: ${CIPHER}.${ENC}.b64
-        ${OPENSSL} enc -${ENC} -bufsize 157 -a -d -k test < ${CIPHER}.${ENC}.b64 > ${CLEAR2}.${ENC}.b64
-
-ssl-enc-${ENC}: ${CLEAR1} ${CLEAR2}.${ENC}
-        cmp ${CLEAR1} ${CLEAR2}.${ENC}
-ssl-enc-${ENC}.b64: ${CLEAR1} ${CLEAR2}.${ENC}.b64
-        cmp ${CLEAR1} ${CLEAR2}.${ENC}.b64
-
-REGRESS_TARGETS+=ssl-enc-${ENC} ssl-enc-${ENC}.b64
-CLEANFILES+=${CIPHER}.${ENC} ${CIPHER}.${ENC}.b64 ${CLEAR2}.${ENC} ${CLEAR2}.${ENC}.b64
-.endfor
-
-ssl-enc:
-        env OPENSSL=${OPENSSL} sh ${.CURDIR}/testenc.sh ${.OBJDIR} ${.CURDIR}
-ssl-dsa:
-        env OPENSSL=${OPENSSL} sh ${.CURDIR}/testdsa.sh ${.OBJDIR} ${.CURDIR}
-ssl-rsa:
-        env OPENSSL=${OPENSSL} sh ${.CURDIR}/testrsa.sh ${.OBJDIR} ${.CURDIR}
-appstest:
-        env OPENSSL=${OPENSSL} sh ${.CURDIR}/appstest.sh -q
-
-clean:
-        rm -rf ${CLEANFILES}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/usr.bin/openssl/README b/src/regress/usr.bin/openssl/README
deleted file mode 100644
index 2682d873e7..0000000000
--- a/src/regress/usr.bin/openssl/README
+++ /dev/null
@@ -1,7 +0,0 @@
-testenc.sh tests encryption routines
-testdsa.sh tests DSA certificate generation
-test_server.sh starts a tls1 server using the above generated certificate
-test_client.sh starts a client to talk to the server.
-testrsa.sh tests RSA certificate generation
-appstest.sh tests openssl command
-
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh
deleted file mode 100755
index 788870fab1..0000000000
--- a/src/regress/usr.bin/openssl/appstest.sh
+++ /dev/null
@@ -1,1237 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: appstest.sh,v 1.15 2018/09/15 13:26:13 inoguchi Exp $
-#
-# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-#
-# appstest.sh - test script for openssl command according to man OPENSSL(1)
-#
-# input  : none
-# output : all files generated by this script go under $ssldir
-#
-
-function section_message {
-        echo ""
-        echo "#---------#---------#---------#---------#---------#---------#---------#--------"
-        echo "==="
-        echo "=== (Section) $1 `date +'%Y/%m/%d %H:%M:%S'`"
-        echo "==="
-}
-
-function start_message {
-        echo ""
-        echo "[TEST] $1"
-}
-
-function stop_s_server {
-        if [ ! -z "$s_server_pid" ] ; then
-                echo ":-| stop s_server [ $s_server_pid ]"
-                sleep 1
-                kill -TERM $s_server_pid
-                wait $s_server_pid
-                s_server_pid=
-        fi
-}
-
-function check_exit_status {
-        status=$1
-        if [ $status -ne 0 ] ; then
-                stop_s_server
-                echo ":-< error occurs, exit status = [ $status ]"
-                exit $status
-        else
-                echo ":-) success. "
-        fi
-}
-
-function usage {
-        echo "usage: appstest.sh [-iq]"
-}
-
-function test_usage_lists_others {
-        # === COMMAND USAGE ===
-        section_message "COMMAND USAGE"
-        
-        start_message "output usages of all commands."
-        
-        cmds=`$openssl_bin list-standard-commands`
-        $openssl_bin -help 2>> $user1_dir/usages.out
-        for c in $cmds ; do
-                $openssl_bin $c -help 2>> $user1_dir/usages.out
-        done 
-        
-        start_message "check all list-* commands."
-        
-        lists=""
-        lists="$lists list-standard-commands"
-        lists="$lists list-message-digest-commands list-message-digest-algorithms"
-        lists="$lists list-cipher-commands list-cipher-algorithms"
-        lists="$lists list-public-key-algorithms"
-        
-        listsfile=$user1_dir/lists.out
-        
-        for l in $lists ; do
-                echo "" >> $listsfile
-                echo "$l" >> $listsfile
-                $openssl_bin $l >> $listsfile
-        done
-        
-        start_message "check interactive mode"
-        $openssl_bin <<__EOF__
-help
-quit
-__EOF__
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- listing operations ---
-        section_message "listing operations"
-        
-        start_message "ciphers"
-        $openssl_bin ciphers -V
-        check_exit_status $?
-        
-        start_message "errstr"
-        $openssl_bin errstr 2606A074
-        check_exit_status $?
-        $openssl_bin errstr -stats 2606A074 > $user1_dir/errstr-stats.out
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- random number etc. operations ---
-        section_message "random number etc. operations"
-        
-        start_message "passwd"
-        
-        pass="test-pass-1234"
-        
-        echo $pass | $openssl_bin passwd -stdin -1
-        check_exit_status $?
-        
-        echo $pass | $openssl_bin passwd -stdin -apr1
-        check_exit_status $?
-        
-        echo $pass | $openssl_bin passwd -stdin -crypt
-        check_exit_status $?
-        
-        start_message "prime"
-        
-        $openssl_bin prime 1
-        check_exit_status $?
-        
-        $openssl_bin prime 2
-        check_exit_status $?
-        
-        $openssl_bin prime -bits 64 -checks 3 -generate -hex -safe 5
-        check_exit_status $?
-        
-        start_message "rand"
-        
-        $openssl_bin rand -base64 100
-        check_exit_status $?
-        
-        $openssl_bin rand -hex 100
-        check_exit_status $?
-}
-
-function test_md {
-        # === MESSAGE DIGEST COMMANDS ===
-        section_message "MESSAGE DIGEST COMMANDS"
-        
-        start_message "dgst - See [MESSAGE DIGEST COMMANDS] section."
-        
-        text="1234567890abcdefghijklmnopqrstuvwxyz"
-        dgstdat=$user1_dir/dgst.dat
-        echo $text > $dgstdat
-        hmac_key="test-hmac-key"
-        cmac_key="1234567890abcde1234567890abcde12"
-        
-        digests=`$openssl_bin list-message-digest-commands`
-        
-        for d in $digests ; do
-        
-                echo -n "$d ... "
-                $openssl_bin dgst -$d -out $dgstdat.$d $dgstdat
-                check_exit_status $?
-        
-                echo -n "$d HMAC ... "
-                $openssl_bin dgst -$d -hmac $hmac_key -out $dgstdat.$d.hmac \
-                        $dgstdat
-                check_exit_status $?
-        
-                echo -n "$d CMAC ... "
-                $openssl_bin dgst -$d -mac cmac -macopt cipher:aes-128-cbc \
-                        -macopt hexkey:$cmac_key -out $dgstdat.$d.cmac $dgstdat
-                check_exit_status $?
-        done
-}
-
-function test_encoding_cipher {
-        # === ENCODING AND CIPHER COMMANDS ===
-        section_message "ENCODING AND CIPHER COMMANDS"
-        
-        start_message "enc - See [ENCODING AND CIPHER COMMANDS] section."
-        
-        text="1234567890abcdefghijklmnopqrstuvwxyz"
-        encfile=$user1_dir/encfile.dat
-        echo $text > $encfile
-        pass="test-pass-1234"
-        
-        ciphers=`$openssl_bin list-cipher-commands`
-        
-        for c in $ciphers ; do
-                echo -n "$c ... encoding ... "
-                $openssl_bin enc -$c -e -base64 -pass pass:$pass \
-                        -in $encfile -out $encfile-$c.enc
-                check_exit_status $?
-        
-                echo -n "decoding ... "
-                $openssl_bin enc -$c -d -base64 -pass pass:$pass \
-                        -in $encfile-$c.enc -out $encfile-$c.dec
-                check_exit_status $?
-        
-                echo -n "cmp ... "
-                cmp $encfile $encfile-$c.dec
-                check_exit_status $?
-        done
-}
-
-function test_key {
-        # === various KEY operations ===
-        section_message "various KEY operations"
-        
-        key_pass=test-key-pass
-        
-        # DH
-        
-        start_message "gendh - Obsoleted by dhparam."
-        gendh2=$key_dir/gendh2.pem
-        $openssl_bin gendh -2 -out $gendh2
-        check_exit_status $?
-        
-        start_message "dh - Obsoleted by dhparam."
-        $openssl_bin dh -in $gendh2 -check -text -out $gendh2.out
-        check_exit_status $?
-        
-        if [ $no_long_tests = 0 ] ; then
-                start_message "dhparam - Superseded by genpkey and pkeyparam."
-                dhparam2=$key_dir/dhparam2.pem
-                $openssl_bin dhparam -2 -out $dhparam2
-                check_exit_status $?
-                $openssl_bin dhparam -in $dhparam2 -check -text \
-                        -out $dhparam2.out
-                check_exit_status $?
-        else
-                start_message "SKIPPING dhparam - Superseded by genpkey and pkeyparam. (quick mode)"
-        fi
-        
-        # DSA
-        
-        start_message "dsaparam - Superseded by genpkey and pkeyparam."
-        dsaparam512=$key_dir/dsaparam512.pem
-        $openssl_bin dsaparam -genkey -out $dsaparam512 512
-        check_exit_status $?
-        
-        start_message "dsa"
-        $openssl_bin dsa -in $dsaparam512 -text -out $dsaparam512.out
-        check_exit_status $?
-        
-        start_message "gendsa - Superseded by genpkey and pkey."
-        gendsa_des3=$key_dir/gendsa_des3.pem
-        $openssl_bin gendsa -des3 -out $gendsa_des3 \
-                -passout pass:$key_pass $dsaparam512
-        check_exit_status $?
-        
-        # RSA
-        
-        start_message "genrsa - Superseded by genpkey."
-        genrsa_aes256=$key_dir/genrsa_aes256.pem
-        $openssl_bin genrsa -f4 -aes256 -out $genrsa_aes256 \
-                -passout pass:$key_pass 2048
-        check_exit_status $?
-        
-        start_message "rsa"
-        $openssl_bin rsa -in $genrsa_aes256 -passin pass:$key_pass \
-                -check -text -out $genrsa_aes256.out
-        check_exit_status $?
-        
-        start_message "rsautl - Superseded by pkeyutl."
-        rsautldat=$key_dir/rsautl.dat
-        rsautlsig=$key_dir/rsautl.sig
-        echo "abcdefghijklmnopqrstuvwxyz1234567890" > $rsautldat
-        
-        $openssl_bin rsautl -sign -in $rsautldat -inkey $genrsa_aes256 \
-                -passin pass:$key_pass -out $rsautlsig
-        check_exit_status $?
-        
-        $openssl_bin rsautl -verify -in $rsautlsig -inkey $genrsa_aes256 \
-                -passin pass:$key_pass
-        check_exit_status $?
-        
-        # EC
-        
-        start_message "ecparam -list-curves"
-        $openssl_bin ecparam -list_curves
-        check_exit_status $?
-        
-        # get all EC curves
-        ec_curves=`$openssl_bin ecparam -list_curves | grep ':' | cut -d ':' -f 1`
-        
-        start_message "ecparam and ec"
-        
-        for curve in $ec_curves ;
-        do
-                ecparam=$key_dir/ecparam_$curve.pem
-        
-                echo -n "ec - $curve ... ecparam ... "
-                $openssl_bin ecparam -out $ecparam -name $curve -genkey \
-                        -param_enc explicit -conv_form compressed -C
-                check_exit_status $?
-        
-                echo -n "ec ... "
-                $openssl_bin ec -in $ecparam -text \
-                        -out $ecparam.out 2> /dev/null
-                check_exit_status $?
-        done
-        
-        # PKEY
-        
-        start_message "genpkey"
-        
-        # DH by GENPKEY
-        
-        genpkey_dh_param=$key_dir/genpkey_dh_param.pem
-        $openssl_bin genpkey -genparam -algorithm DH -out $genpkey_dh_param \
-                -pkeyopt dh_paramgen_prime_len:1024
-        check_exit_status $?
-        
-        genpkey_dh=$key_dir/genpkey_dh.pem
-        $openssl_bin genpkey -paramfile $genpkey_dh_param -out $genpkey_dh
-        check_exit_status $?
-        
-        # DSA by GENPKEY
-        
-        genpkey_dsa_param=$key_dir/genpkey_dsa_param.pem
-        $openssl_bin genpkey -genparam -algorithm DSA -out $genpkey_dsa_param \
-                -pkeyopt dsa_paramgen_bits:1024
-        check_exit_status $?
-        
-        genpkey_dsa=$key_dir/genpkey_dsa.pem
-        $openssl_bin genpkey -paramfile $genpkey_dsa_param -out $genpkey_dsa
-        check_exit_status $?
-        
-        # RSA by GENPKEY
-        
-        genpkey_rsa=$key_dir/genpkey_rsa.pem
-        $openssl_bin genpkey -algorithm RSA -out $genpkey_rsa \
-                -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:3
-        check_exit_status $?
-        
-        # EC by GENPKEY
-        
-        genpkey_ec_param=$key_dir/genpkey_ec_param.pem
-        $openssl_bin genpkey -genparam -algorithm EC -out $genpkey_ec_param \
-                -pkeyopt ec_paramgen_curve:secp384r1
-        check_exit_status $?
-        
-        genpkey_ec=$key_dir/genpkey_ec.pem
-        $openssl_bin genpkey -paramfile $genpkey_ec_param -out $genpkey_ec
-        check_exit_status $?
-        
-        start_message "pkeyparam"
-        
-        $openssl_bin pkeyparam -in $genpkey_dh_param -text \
-                -out $genpkey_dh_param.out
-        check_exit_status $?
-        
-        $openssl_bin pkeyparam -in $genpkey_dsa_param -text \
-                -out $genpkey_dsa_param.out
-        check_exit_status $?
-        
-        $openssl_bin pkeyparam -in $genpkey_ec_param -text \
-                -out $genpkey_ec_param.out
-        check_exit_status $?
-        
-        start_message "pkey"
-        
-        $openssl_bin pkey -in $genpkey_dh -text -out $genpkey_dh.out
-        check_exit_status $?
-        
-        $openssl_bin pkey -in $genpkey_dsa -text -out $genpkey_dsa.out
-        check_exit_status $?
-        
-        $openssl_bin pkey -in $genpkey_rsa -text -out $genpkey_rsa.out
-        check_exit_status $?
-        
-        $openssl_bin pkey -in $genpkey_ec -text -out $genpkey_ec.out
-        check_exit_status $?
-        
-        start_message "pkeyutl"
-        
-        pkeyutldat=$key_dir/pkeyutl.dat
-        pkeyutlsig=$key_dir/pkeyutl.sig
-        echo "abcdefghijklmnopqrstuvwxyz1234567890" > $pkeyutldat
-        
-        $openssl_bin pkeyutl -sign -in  $pkeyutldat -inkey $genpkey_rsa \
-                -out $pkeyutlsig
-        check_exit_status $?
-        
-        $openssl_bin pkeyutl -verify -in $pkeyutldat -sigfile $pkeyutlsig \
-                -inkey $genpkey_rsa
-        check_exit_status $?
-        
-        $openssl_bin pkeyutl -verifyrecover -in $pkeyutlsig -inkey $genpkey_rsa
-        check_exit_status $?
-}
-
-function test_pki {
-        section_message "setup local CA"
-
-        #
-        # prepare test openssl.cnf
-        #
-
-        cat << __EOF__ > $ssldir/openssl.cnf
-oid_section = new_oids
-[ new_oids ]
-tsa_policy1 = 1.2.3.4.1
-tsa_policy2 = 1.2.3.4.5.6
-tsa_policy3 = 1.2.3.4.5.7
-[ ca ]
-default_ca    = CA_default
-[ CA_default ]
-dir           = ./$ca_dir
-crl_dir       = \$dir/crl
-database      = \$dir/index.txt
-new_certs_dir = \$dir/newcerts
-serial        = \$dir/serial
-crlnumber     = \$dir/crlnumber
-default_days  = 1
-default_md    = default
-policy        = policy_match
-[ policy_match ]
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-[ req ]
-distinguished_name      = req_distinguished_name 
-[ req_distinguished_name ]
-countryName                     = Country Name
-countryName_default             = JP
-countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = State or Province Name
-stateOrProvinceName_default     = Tokyo
-organizationName                = Organization Name
-organizationName_default        = TEST_DUMMY_COMPANY
-commonName                      = Common Name
-[ tsa ]
-default_tsa   = tsa_config1 
-[ tsa_config1 ]
-dir           = ./$tsa_dir
-serial        = \$dir/serial
-crypto_device = builtin
-digests       = sha1, sha256, sha384, sha512
-default_policy = tsa_policy1
-other_policies = tsa_policy2, tsa_policy3
-[ tsa_ext ]
-keyUsage = critical,nonRepudiation
-extendedKeyUsage = critical,timeStamping
-[ ocsp_ext ]
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation,digitalSignature,keyEncipherment
-extendedKeyUsage = OCSPSigning
-__EOF__
-
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        #
-        # setup test CA
-        #
-        
-        mkdir -p $ca_dir
-        mkdir -p $tsa_dir
-        mkdir -p $ocsp_dir
-        mkdir -p $server_dir
-        
-        mkdir -p $ca_dir/certs
-        mkdir -p $ca_dir/private
-        mkdir -p $ca_dir/crl
-        mkdir -p $ca_dir/newcerts
-        chmod 700 $ca_dir/private
-        echo "01" > $ca_dir/serial
-        touch $ca_dir/index.txt 
-        touch $ca_dir/crlnumber
-        echo "01" > $ca_dir/crlnumber
-        
-        # 
-        # setup test TSA 
-        #
-        mkdir -p $tsa_dir/private
-        chmod 700 $tsa_dir/private
-        echo "01" > $tsa_dir/serial
-        touch $tsa_dir/index.txt 
-        
-        # 
-        # setup test OCSP 
-        #
-        mkdir -p $ocsp_dir/private
-        chmod 700 $ocsp_dir/private
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- CA initiate (generate CA key and cert) --- 
-        
-        start_message "req ... generate CA key and self signed cert"
-        
-        ca_cert=$ca_dir/ca_cert.pem 
-        ca_key=$ca_dir/private/ca_key.pem ca_pass=test-ca-pass 
-        
-        if [ $mingw = 0 ] ; then
-                subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=testCA.test_dummy.com/'
-        else
-                subj='//C=JP\ST=Tokyo\O=TEST_DUMMY_COMPANY\CN=testTSA.test_dummy.com\'
-        fi
-        
-        $openssl_bin req -new -x509 -newkey rsa:2048 -out $ca_cert \
-                -keyout $ca_key -days 1 -passout pass:$ca_pass -batch \
-                -subj $subj
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- TSA initiate (generate TSA key and cert) ---
-        
-        start_message "req ... generate TSA key and cert"
-        
-        # generate CSR for TSA
-        
-        tsa_csr=$tsa_dir/tsa_csr.pem
-        tsa_key=$tsa_dir/private/tsa_key.pem
-        tsa_pass=test-tsa-pass
-        
-        if [ $mingw = 0 ] ; then
-                subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=testTSA.test_dummy.com/'
-        else
-                subj='//C=JP\ST=Tokyo\O=TEST_DUMMY_COMPANY\CN=testTSA.test_dummy.com\'
-        fi
-        
-        $openssl_bin req -new -keyout $tsa_key -out $tsa_csr \
-                -passout pass:$tsa_pass -subj $subj
-        check_exit_status $?
-        
-        start_message "ca ... sign by CA with TSA extensions"
-        
-        tsa_cert=$tsa_dir/tsa_cert.pem
-        
-        $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \
-                -in $tsa_csr -out $tsa_cert -extensions tsa_ext
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- OCSP initiate (generate OCSP key and cert) ---
-        
-        start_message "req ... generate OCSP key and cert"
-        
-        # generate CSR for OCSP 
-        
-        ocsp_csr=$ocsp_dir/ocsp_csr.pem
-        ocsp_key=$ocsp_dir/private/ocsp_key.pem
-        
-        if [ $mingw = 0 ] ; then
-                subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=testOCSP.test_dummy.com/'
-        else
-                subj='//C=JP\ST=Tokyo\O=TEST_DUMMY_COMPANY\CN=testOCSP.test_dummy.com\'
-        fi
-        
-        $openssl_bin req -new -keyout $ocsp_key -nodes -out $ocsp_csr \
-                -subj $subj
-        check_exit_status $?
-        
-        start_message "ca ... sign by CA with OCSP extensions"
-        
-        ocsp_cert=$ocsp_dir/ocsp_cert.pem
-        
-        $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \
-                -in $ocsp_csr -out $ocsp_cert -extensions ocsp_ext
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- server-admin operations (generate server key and csr) ---
-        section_message "server-admin operations (generate server key and csr)"
-        
-        start_message "req ... generate server csr#1"
-        
-        server_key=$server_dir/server_key.pem
-        server_csr=$server_dir/server_csr.pem
-        server_pass=test-server-pass
-        
-        if [ $mingw = 0 ] ; then
-                subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=localhost.test_dummy.com/'
-        else
-                subj='//C=JP\ST=Tokyo\O=TEST_DUMMY_COMPANY\CN=localhost.test_dummy.com\'
-        fi
-        
-        $openssl_bin req -new -keyout $server_key -out $server_csr \
-                -passout pass:$server_pass -subj $subj
-        check_exit_status $?
-        
-        start_message "req ... generate server csr#2 (interactive mode)"
-        
-        revoke_key=$server_dir/revoke_key.pem
-        revoke_csr=$server_dir/revoke_csr.pem
-        revoke_pass=test-revoke-pass
-
-        $openssl_bin req -new -keyout $revoke_key -out $revoke_csr \
-                -passout pass:$revoke_pass <<__EOF__
-JP
-Tokyo
-TEST_DUMMY_COMPANY
-revoke.test_dummy.com
-__EOF__
-        check_exit_status $?
-
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- CA operations (issue cert for server) ---
-        section_message "CA operations (issue cert for server)"
-        
-        start_message "ca ... issue cert for server csr#1"
-        
-        server_cert=$server_dir/server_cert.pem
-        $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \
-                -in $server_csr -out $server_cert
-        check_exit_status $?
-        
-        start_message "x509 ... issue cert for server csr#2"
-        
-        revoke_cert=$server_dir/revoke_cert.pem
-        $openssl_bin x509 -req -in $revoke_csr -CA $ca_cert -CAkey $ca_key \
-                -passin pass:$ca_pass -CAcreateserial -out $revoke_cert
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- CA operations (revoke cert and generate crl) ---
-        section_message "CA operations (revoke cert and generate crl)"
-        
-        start_message "ca ... revoke server cert#2"
-        crl_file=$ca_dir/crl.pem
-        $openssl_bin ca -gencrl -out $crl_file -crldays 30 \
-                -revoke $revoke_cert \
-                -keyfile $ca_key -passin pass:$ca_pass -cert $ca_cert
-        check_exit_status $?
-        
-        start_message "crl ... CA generates CRL"
-        $openssl_bin crl -in $crl_file -fingerprint
-        check_exit_status $?
-        
-        crl_p7=$ca_dir/crl.p7
-        start_message "crl2pkcs7 ... convert CRL to pkcs7"
-        $openssl_bin crl2pkcs7 -in $crl_file -certfile $ca_cert -out $crl_p7
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- server-admin operations (check csr, verify cert, certhash) ---
-        section_message "server-admin operations (check csr, verify cert, certhash)"
-        
-        start_message "asn1parse ... parse server csr#1"
-        $openssl_bin asn1parse -in $server_csr -i -dlimit 100 -length 1000 \
-                -strparse 01 > $server_csr.asn1parse.out
-        check_exit_status $?
-        
-        start_message "verify ... server cert#1"
-        $openssl_bin verify -verbose -CAfile $ca_cert $server_cert
-        check_exit_status $?
-        
-        start_message "x509 ... get detail info about server cert#1"
-        $openssl_bin x509 -in $server_cert -text -C -dates -startdate -enddate \
-                -fingerprint -issuer -issuer_hash -issuer_hash_old \
-                -subject -subject_hash -subject_hash_old -ocsp_uri \
-                -ocspid -modulus -pubkey -serial -email > $server_cert.x509.out
-        check_exit_status $?
-        
-        if [ $mingw = 0 ] ; then
-                start_message "certhash"
-                $openssl_bin certhash -v $server_dir
-                check_exit_status $?
-        fi
-        
-        # self signed
-        start_message "x509 ... generate self signed server cert"
-        server_self_cert=$server_dir/server_self_cert.pem
-        $openssl_bin x509 -in $server_cert -signkey $server_key \
-                -passin pass:$server_pass -out $server_self_cert
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- 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
-        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 $?
-        
-        # server-admin cert verify
-        
-        start_message "nseq"
-        $openssl_bin nseq -in $spkacpem -toseq -out $spkacpem.nseq
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- user1 operations (generate user1 key and csr) ---
-        section_message "user1 operations (generate user1 key and csr)"
-        
-        # trust
-        start_message "x509 ... trust testCA cert"
-        user1_trust=$user1_dir/user1_trust_ca.pem
-        $openssl_bin x509 -in $ca_cert -addtrust clientAuth \
-                -setalias "trusted testCA" -purpose -out $user1_trust
-        check_exit_status $?
-        
-        start_message "req ... generate private key and csr for user1"
-        
-        user1_key=$user1_dir/user1_key.pem
-        user1_csr=$user1_dir/user1_csr.pem
-        user1_pass=test-user1-pass
-        
-        if [ $mingw = 0 ] ; then
-                subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=user1.test_dummy.com/'
-        else
-                subj='//C=JP\ST=Tokyo\O=TEST_DUMMY_COMPANY\CN=user1.test_dummy.com\'
-        fi
-        
-        $openssl_bin req -new -keyout $user1_key -out $user1_csr \
-                -passout pass:$user1_pass -subj $subj
-        check_exit_status $?
-        
-        #---------#---------#---------#---------#---------#---------#---------
-        
-        # --- CA operations (issue cert for user1) ---
-        section_message "CA operations (issue cert for user1)"
-        
-        start_message "ca ... issue cert for user1"
-        
-        user1_cert=$user1_dir/user1_cert.pem
-        $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -key $ca_pass \
-                -in $user1_csr -out $user1_cert
-        check_exit_status $?
-}
-
-function test_tsa {
-        # --- TSA operations ---
-        section_message "TSA operations"
-        
-        tsa_dat=$user1_dir/tsa.dat
-        cat << __EOF__ > $tsa_dat
-Hello Bob,
-Sincerely yours
-Alice
-__EOF__
-
-        # Query
-        start_message "ts ... create time stamp request"
-        
-        tsa_tsq=$user1_dir/tsa.tsq
-        
-        $openssl_bin ts -query -sha1 -data $tsa_dat -no_nonce -out $tsa_tsq
-        check_exit_status $?
-        
-        start_message "ts ... print time stamp request"
-        
-        $openssl_bin ts -query -in $tsa_tsq -text
-        check_exit_status $?
-        
-        # Reply
-        start_message "ts ... create time stamp response for a request"
-        
-        tsa_tsr=$user1_dir/tsa.tsr
-        
-        $openssl_bin ts -reply -queryfile $tsa_tsq -inkey $tsa_key \
-                -passin pass:$tsa_pass -signer $tsa_cert -chain $ca_cert \
-                -out $tsa_tsr
-        check_exit_status $?
-        
-        # Verify
-        start_message "ts ... verify time stamp response"
-        
-        $openssl_bin ts -verify -queryfile $tsa_tsq -in $tsa_tsr \
-                -CAfile $ca_cert -untrusted $tsa_cert
-        check_exit_status $?
-}
-
-function test_smime {
-        # --- S/MIME operations ---
-        section_message "S/MIME operations"
-        
-        smime_txt=$user1_dir/smime.txt
-        smime_msg=$user1_dir/smime.msg
-        smime_ver=$user1_dir/smime.ver
-        
-        cat << __EOF__ > $smime_txt
-Hello Bob,
-Sincerely yours
-Alice
-__EOF__
-        
-        # sign
-        start_message "smime ... sign to message"
-        
-        $openssl_bin smime -sign -in $smime_txt -text -out $smime_msg \
-                -signer $user1_cert -inkey $user1_key -passin pass:$user1_pass
-        check_exit_status $?
-        
-        # verify
-        start_message "smime ... verify message"
-        
-        $openssl_bin smime -verify -in $smime_msg -signer $user1_cert \
-                -CAfile $ca_cert -out $smime_ver
-        check_exit_status $?
-}
-
-function test_ocsp {
-        # --- OCSP operations ---
-        section_message "OCSP operations"
-        
-        # request
-        start_message "ocsp ... create OCSP request"
-        
-        ocsp_req=$user1_dir/ocsp_req.der
-        $openssl_bin ocsp -issuer $ca_cert -cert $server_cert \
-                -cert $revoke_cert -CAfile $ca_cert -reqout $ocsp_req
-        check_exit_status $?
-        
-        # response
-        start_message "ocsp ... create OCPS response for a request"
-        
-        ocsp_res=$user1_dir/ocsp_res.der
-        $openssl_bin ocsp -index  $ca_dir/index.txt -CA $ca_cert \
-                -CAfile $ca_cert -rsigner $ocsp_cert -rkey $ocsp_key \
-                -reqin $ocsp_req -respout $ocsp_res -text > $ocsp_res.out 2>&1
-        check_exit_status $?
-        
-        # ocsp server
-        start_message "ocsp ... start OCSP server in background"
-        
-        ocsp_port=8888
-        
-        $openssl_bin ocsp -index  $ca_dir/index.txt -CA $ca_cert \
-                -CAfile $ca_cert -rsigner $ocsp_cert -rkey $ocsp_key \
-                -port '*:'$ocsp_port -nrequest 1 &
-        check_exit_status $?
-        ocsp_svr_pid=$!
-        echo "ocsp server pid = [ $ocsp_svr_pid ]"
-        sleep 1
-        
-        # send query to ocsp server
-        start_message "ocsp ... send OCSP request to server"
-        
-        ocsp_qry=$user1_dir/ocsp_qry.der
-        $openssl_bin ocsp -issuer $ca_cert -cert $server_cert \
-                -cert $revoke_cert -CAfile $ca_cert \
-                -url http://localhost:$ocsp_port -resp_text \
-                -respout $ocsp_qry > $ocsp_qry.out 2>&1
-        check_exit_status $?
-}
-
-function test_pkcs {
-        # --- PKCS operations ---
-        section_message "PKCS operations"
-        
-        pkcs_pass=test-pkcs-pass
-        
-        start_message "pkcs7 ... output certs in crl(pkcs7)"
-        $openssl_bin pkcs7 -in $crl_p7 -print_certs -text -out $crl_p7.out
-        check_exit_status $?
-        
-        start_message "pkcs8 ... convert key to pkcs8"
-        $openssl_bin pkcs8 -in $user1_key -topk8 -out $user1_key.p8 \
-                -passin pass:$user1_pass -passout pass:$user1_pass \
-                -v1 pbeWithSHA1AndDES-CBC -v2 des3
-        check_exit_status $?
-        
-        start_message "pkcs8 ... convert pkcs8 to key in DER format"
-        $openssl_bin pkcs8 -in $user1_key.p8 -passin pass:$user1_pass \
-                -outform DER -out $user1_key.p8.der
-        check_exit_status $?
-        
-        start_message "pkcs12 ... create"
-        $openssl_bin pkcs12 -export -in $server_cert -inkey $server_key \
-                -passin pass:$server_pass -certfile $ca_cert -CAfile $ca_cert \
-                -caname "server_p12" -passout pass:$pkcs_pass \
-                -certpbe AES-256-CBC -keypbe AES-256-CBC -chain \
-                -out $server_cert.p12
-        check_exit_status $?
-        
-        start_message "pkcs12 ... verify"
-        $openssl_bin pkcs12 -in $server_cert.p12 -passin pass:$pkcs_pass -info \
-                -noout
-        check_exit_status $?
-        
-        start_message "pkcs12 ... to PEM"
-        $openssl_bin pkcs12 -in $server_cert.p12 -passin pass:$pkcs_pass \
-                -passout pass:$pkcs_pass -out $server_cert.p12.pem
-        check_exit_status $?
-}
-
-function test_server_client {
-        # --- client/server operations (TLS) ---
-        section_message "client/server operations (TLS)"
-
-        s_id="$1"
-        c_id="$2"
-        sc="$1$2"
-
-        test_pause_sec=0.2
-
-        if [ $s_id = "0" ] ; then
-                s_bin=$openssl_bin
-        else
-                s_bin=$other_openssl_bin
-        fi
-
-        if [ $c_id = "0" ] ; then
-                c_bin=$openssl_bin
-        else
-                c_bin=$other_openssl_bin
-        fi
-
-        echo "s_server is [`$s_bin version`]"
-        echo "s_client is [`$c_bin version`]"
-
-        host="localhost"
-        port=4433
-        sess_dat=$user1_dir/s_client_${sc}_sess.dat
-        s_server_out=$server_dir/s_server_${sc}_tls.out
-
-        $s_bin version | grep 'OpenSSL 1.1.1' > /dev/null
-        if [ $? -eq 0 ] ; then
-                extra_opts="-4"
-        else
-                extra_opts=""
-        fi
-        
-        start_message "s_server ... start TLS/SSL test server"
-        $s_bin s_server -accept $port -CAfile $ca_cert \
-                -cert $server_cert -key $server_key -pass pass:$server_pass \
-                -context "appstest.sh" -id_prefix "APPSTEST.SH" -crl_check \
-                -nextprotoneg "http/1.1,spdy/3" -alpn "http/1.1,spdy/3" -www \
-                -cipher ALL $extra_opts \
-                -msg -tlsextdebug > $s_server_out 2>&1 &
-        check_exit_status $?
-        s_server_pid=$!
-        echo "s_server pid = [ $s_server_pid ]"
-        sleep 1
-        
-        # protocol = TLSv1
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_1_0.out
-        
-        start_message "s_client ... connect to TLS/SSL test server by TLSv1"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -tls1 -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep 'Protocol  : TLSv1$' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        # protocol = TLSv1.1
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_1_1.out
-        
-        start_message "s_client ... connect to TLS/SSL test server by TLSv1.1"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -tls1_1 -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep 'Protocol  : TLSv1\.1$' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        # protocol = TLSv1.2
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_1_2.out
-        
-        start_message "s_client ... connect to TLS/SSL test server by TLSv1.2"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -tls1_2 -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep 'Protocol  : TLSv1\.2$' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        # all available ciphers with random order
-        
-        s_ciph=$server_dir/s_ciph_${sc}
-        if [ $s_id = "0" ] ; then
-                $s_bin ciphers -v ALL:!ECDSA:!kGOST | awk '{print $1}' > $s_ciph
-        else
-                $s_bin ciphers -v | awk '{print $1}' > $s_ciph
-        fi
-
-        c_ciph=$user1_dir/c_ciph_${sc}
-        if [ $c_id = "0" ] ; then
-                $c_bin ciphers -v ALL:!ECDSA:!kGOST | awk '{print $1}' > $c_ciph
-        else
-                $c_bin ciphers -v | awk '{print $1}' > $c_ciph
-        fi
-
-        ciphers=$user1_dir/ciphers_${sc}
-        grep -x -f $s_ciph $c_ciph | sort -R > $ciphers
-
-        cnum=0
-        for c in `cat $ciphers` ; do
-                cnum=`expr $cnum + 1`
-                cnstr=`printf %03d $cnum`
-                s_client_out=$user1_dir/s_client_${sc}_tls_${cnstr}_${c}.out
-        
-                start_message "s_client ... connect to TLS/SSL test server with [ $cnstr ] $c"
-                sleep $test_pause_sec
-                $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                        -cipher $c \
-                        -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-                check_exit_status $?
-        
-                grep "Cipher    : $c" $s_client_out > /dev/null
-                check_exit_status $?
-        
-                grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-                check_exit_status $?
-        done
-        
-        # Get session ticket to reuse
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_reuse_1.out
-        
-        start_message "s_client ... connect to TLS/SSL test server to get session id"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -nextprotoneg "spdy/3,http/1.1" -alpn "spdy/3,http/1.1" \
-                -sess_out $sess_dat \
-                -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep '^New, TLS.*$' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        # Reuse session ticket
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_reuse_2.out
-        
-        start_message "s_client ... connect to TLS/SSL test server reusing session id"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -sess_in $sess_dat \
-                -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep '^Reused, TLS.*$' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        check_exit_status $?
-        
-        # invalid verification pattern
-        
-        s_client_out=$user1_dir/s_client_${sc}_tls_invalid.out
-        
-        start_message "s_client ... connect to TLS/SSL test server but verify error"
-        sleep $test_pause_sec
-        $c_bin s_client -connect $host:$port -CAfile $ca_cert \
-                -showcerts -crl_check -issuer_checks -policy_check \
-                -msg -tlsextdebug < /dev/null > $s_client_out 2>&1
-        check_exit_status $?
-        
-        grep 'Verify return code: 0 (ok)' $s_client_out > /dev/null
-        if [ $? -eq 0 ] ; then
-                check_exit_status 1
-        else
-                check_exit_status 0
-        fi
-        
-        # s_time
-        start_message "s_time ... connect to TLS/SSL test server"
-        $c_bin s_time -connect $host:$port -CApath $ca_dir -time 2
-        check_exit_status $?
-        
-        # sess_id
-        start_message "sess_id"
-        $c_bin sess_id -in $sess_dat -text -out $sess_dat.out
-        check_exit_status $?
-        
-        stop_s_server
-}
-
-function test_speed {
-        # === PERFORMANCE ===
-        section_message "PERFORMANCE"
-        
-        if [ $no_long_tests = 0 ] ; then
-                start_message "speed"
-                $openssl_bin speed sha512 rsa2048 -multi 2 -elapsed
-                check_exit_status $?
-        else
-                start_message "SKIPPING speed (quick mode)"
-        fi
-}
-
-function test_version {
-        # --- VERSION INFORMATION ---
-        section_message "VERSION INFORMATION"
-        
-        start_message "version"
-        $openssl_bin version -a
-        check_exit_status $?
-}
-
-#---------#---------#---------#---------#---------#---------#---------#---------
-
-openssl_bin=${OPENSSL:-/usr/bin/openssl}
-other_openssl_bin=${OTHER_OPENSSL:-/usr/local/bin/eopenssl}
-
-interop_tests=0
-no_long_tests=0
-
-while [ "$1" != "" ]; do
-        case $1 in
-                -i | --interop)         shift
-                                        interop_tests=1
-                                        ;;
-                -q | --quick )          shift
-                                        no_long_tests=1
-                                        ;;
-                * )                     usage
-                                        exit 1
-        esac
-done
-
-if [ ! -x $openssl_bin ] ; then
-        echo ":-< \$OPENSSL [$openssl_bin]  is not executable."
-        exit 1
-fi
-
-if [ $interop_tests = 1 -a ! -x $other_openssl_bin ] ; then
-        echo ":-< \$OTHER_OPENSSL [$other_openssl_bin] is not executable."
-        exit 1
-fi
-
-#
-# create ssldir, and all files generated by this script goes under this dir.
-#
-ssldir="appstest_dir"
-
-if [ -d $ssldir ] ; then
-        echo "directory [ $ssldir ] exists, this script deletes this directory ..."
-        /bin/rm -rf $ssldir
-fi
-
-mkdir -p $ssldir
-
-ca_dir=$ssldir/testCA
-tsa_dir=$ssldir/testTSA
-ocsp_dir=$ssldir/testOCSP
-server_dir=$ssldir/server
-user1_dir=$ssldir/user1
-mkdir -p $user1_dir
-key_dir=$ssldir/key
-mkdir -p $key_dir
-
-export OPENSSL_CONF=$ssldir/openssl.cnf
-touch $OPENSSL_CONF
-
-uname_s=`uname -s | grep 'MINGW'`
-if [ "$uname_s" = "" ] ; then
-        mingw=0
-else
-        mingw=1
-fi
-
-#
-# process tests
-#
-test_usage_lists_others
-test_md
-test_encoding_cipher
-test_key
-test_pki
-test_tsa
-test_smime
-test_ocsp
-test_pkcs
-test_server_client 0 0
-if [ $interop_tests = 1 ] ; then
-        test_server_client 0 1
-        test_server_client 1 0
-fi
-test_speed
-test_version
-
-section_message "END"
-
-exit 0
-
diff --git a/src/regress/usr.bin/openssl/openssl.cnf b/src/regress/usr.bin/openssl/openssl.cnf
deleted file mode 100644
index 4490810058..0000000000
--- a/src/regress/usr.bin/openssl/openssl.cnf
+++ /dev/null
@@ -1,27 +0,0 @@
-#       $OpenBSD: openssl.cnf,v 1.2 2015/09/16 01:39:05 lteo Exp $
-
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# hacked by iang to do DSA certs - Server
-
-####################################################################
-[ req ]
-distinguished_name    = req_distinguished_name
-encrypt_rsa_key               = no
-
-[ req_distinguished_name ]
-countryName                   = Country Name (2 letter code)
-countryName_default           = CA
-countryName_value             = CA
-
-organizationName                = Organization Name (eg, company)
-organizationName_value          = Shake it Vera 
-
-0.commonName                  = Common Name (eg, YOUR name)
-0.commonName_value            = Wastelandus
-
-1.commonName                  = Common Name (eg, YOUR name)
-1.commonName_value            = Maximus
-
diff --git a/src/regress/usr.bin/openssl/options/Makefile b/src/regress/usr.bin/openssl/options/Makefile
deleted file mode 100644
index ba3857ad39..0000000000
--- a/src/regress/usr.bin/openssl/options/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/12/28 14:01:33 jsing Exp $
-
-PROG=   optionstest
-SRCS=   optionstest.c
-
-LDADD=  -lcrypto -lssl
-DPADD=  ${LIBCRYPTO} ${LIBSSL}
-
-OSSLSRC= ${.CURDIR}/../../../../usr.bin/openssl/
-CFLAGS+= -I${OSSLSRC}
-
-.PATH:  ${OSSLSRC}
-SRCS+=  apps.c
-
-CFLAGS+= -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/usr.bin/openssl/options/optionstest.c b/src/regress/usr.bin/openssl/options/optionstest.c
deleted file mode 100644
index 17c2e1af78..0000000000
--- a/src/regress/usr.bin/openssl/options/optionstest.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/*      $OpenBSD: optionstest.c,v 1.9 2017/04/16 14:40:47 kettenis Exp $        */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/bio.h>
-#include <openssl/conf.h>
-
-#include "apps.h"
-
-/* Needed to keep apps.c happy... */
-BIO *bio_err;
-CONF *config;
-
-static int argfunc(char *arg);
-static int defaultarg(int argc, char **argv, int *argsused);
-static int multiarg(int argc, char **argv, int *argsused);
-
-static struct {
-        char *arg;
-        int flag;
-} test_config;
-
-static struct option test_options[] = {
-        {
-                .name = "arg",
-                .argname = "argname",
-                .type = OPTION_ARG,
-                .opt.arg = &test_config.arg,
-        },
-        {
-                .name = "argfunc",
-                .argname = "argname",
-                .type = OPTION_ARG_FUNC,
-                .opt.argfunc = argfunc,
-        },
-        {
-                .name = "flag",
-                .type = OPTION_FLAG,
-                .opt.flag = &test_config.flag,
-        },
-        {
-                .name = "multiarg",
-                .type = OPTION_ARGV_FUNC,
-                .opt.argvfunc = multiarg,
-        },
-        {
-                .name = NULL,
-                .type = OPTION_ARGV_FUNC,
-                .opt.argvfunc = defaultarg,
-        },
-        { NULL },
-};
-
-char *args1[] = { "opts" };
-char *args2[] = { "opts", "-arg", "arg", "-flag" };
-char *args3[] = { "opts", "-arg", "arg", "-flag", "unnamed" };
-char *args4[] = { "opts", "-arg", "arg", "unnamed", "-flag" };
-char *args5[] = { "opts", "unnamed1", "-arg", "arg", "-flag", "unnamed2" };
-char *args6[] = { "opts", "-argfunc", "arg", "-flag" };
-char *args7[] = { "opts", "-arg", "arg", "-flag", "-", "-unnamed" };
-char *args8[] = { "opts", "-arg", "arg", "-flag", "file1", "file2", "file3" };
-char *args9[] = { "opts", "-arg", "arg", "-flag", "file1", "-file2", "file3" };
-char *args10[] = { "opts", "-arg", "arg", "-flag", "-", "file1", "file2" };
-char *args11[] = { "opts", "-arg", "arg", "-flag", "-", "-file1", "-file2" };
-char *args12[] = { "opts", "-multiarg", "arg1", "arg2", "-flag", "unnamed" };
-char *args13[] = { "opts", "-multiargz", "arg1", "arg2", "-flagz", "unnamed" };
-
-struct options_test {
-        int argc;
-        char **argv;
-        enum {
-                OPTIONS_TEST_NONE,
-                OPTIONS_TEST_UNNAMED,
-                OPTIONS_TEST_ARGSUSED,
-        } type;
-        char *unnamed;
-        int used;
-        int want;
-        char *wantarg;
-        int wantflag;
-};
-
-struct options_test options_tests[] = {
-        {
-                /* Test 1 - No arguments (only program name). */
-                .argc = 1,
-                .argv = args1,
-                .type = OPTIONS_TEST_NONE,
-                .want = 0,
-                .wantarg = NULL,
-                .wantflag = 0,
-        },
-        {
-                /* Test 2 - Named arguments (unnamed not permitted). */
-                .argc = 4,
-                .argv = args2,
-                .type = OPTIONS_TEST_NONE,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 3 - Named arguments (unnamed permitted). */
-                .argc = 4,
-                .argv = args2,
-                .type = OPTIONS_TEST_UNNAMED,
-                .unnamed = NULL,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 4 - Named and single unnamed (unnamed not permitted). */
-                .argc = 5,
-                .argv = args3,
-                .type = OPTIONS_TEST_NONE,
-                .want = 1,
-        },
-        {
-                /* Test 5 - Named and single unnamed (unnamed permitted). */
-                .argc = 5,
-                .argv = args3,
-                .type = OPTIONS_TEST_UNNAMED,
-                .unnamed = "unnamed",
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 6 - Named and single unnamed (different sequence). */
-                .argc = 5,
-                .argv = args4,
-                .type = OPTIONS_TEST_UNNAMED,
-                .unnamed = "unnamed",
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 7 - Multiple unnamed arguments (should fail). */
-                .argc = 6,
-                .argv = args5,
-                .type = OPTIONS_TEST_UNNAMED,
-                .want = 1,
-        },
-        {
-                /* Test 8 - Function. */
-                .argc = 4,
-                .argv = args6,
-                .type = OPTIONS_TEST_NONE,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 9 - Named and single unnamed (hyphen separated). */
-                .argc = 6,
-                .argv = args7,
-                .type = OPTIONS_TEST_UNNAMED,
-                .unnamed = "-unnamed",
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 10 - Named and multiple unnamed. */
-                .argc = 7,
-                .argv = args8,
-                .used = 4,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 11 - Named and multiple unnamed. */
-                .argc = 7,
-                .argv = args9,
-                .used = 4,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 12 - Named and multiple unnamed. */
-                .argc = 7,
-                .argv = args10,
-                .used = 5,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 13 - Named and multiple unnamed. */
-                .argc = 7,
-                .argv = args11,
-                .used = 5,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 14 - Named only. */
-                .argc = 4,
-                .argv = args2,
-                .used = 4,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = "arg",
-                .wantflag = 1,
-        },
-        {
-                /* Test 15 - Multiple argument callback. */
-                .argc = 6,
-                .argv = args12,
-                .unnamed = "unnamed",
-                .type = OPTIONS_TEST_UNNAMED,
-                .want = 0,
-                .wantarg = NULL,
-                .wantflag = 1,
-        },
-        {
-                /* Test 16 - Multiple argument callback. */
-                .argc = 6,
-                .argv = args12,
-                .used = 5,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = NULL,
-                .wantflag = 1,
-        },
-        {
-                /* Test 17 - Default callback. */
-                .argc = 6,
-                .argv = args13,
-                .unnamed = "unnamed",
-                .type = OPTIONS_TEST_UNNAMED,
-                .want = 0,
-                .wantarg = NULL,
-                .wantflag = 1,
-        },
-        {
-                /* Test 18 - Default callback. */
-                .argc = 6,
-                .argv = args13,
-                .used = 5,
-                .type = OPTIONS_TEST_ARGSUSED,
-                .want = 0,
-                .wantarg = NULL,
-                .wantflag = 1,
-        },
-};
-
-#define N_OPTIONS_TESTS \
-    (sizeof(options_tests) / sizeof(*options_tests))
-
-static int
-argfunc(char *arg)
-{
-        test_config.arg = arg;
-        return (0);
-}
-
-static int
-defaultarg(int argc, char **argv, int *argsused)
-{
-        if (argc < 1)
-                return (1);
-
-        if (strcmp(argv[0], "-multiargz") == 0) {
-                if (argc < 3)
-                        return (1);
-                *argsused = 3;
-                return (0);
-        } else if (strcmp(argv[0], "-flagz") == 0) {
-                test_config.flag = 1;
-                *argsused = 1;
-                return (0);
-        }
-
-        return (1);
-}
-
-static int
-multiarg(int argc, char **argv, int *argsused)
-{
-        if (argc < 3)
-                return (1);
-
-        *argsused = 3;
-        return (0);
-}
-
-static int
-do_options_test(int test_no, struct options_test *ot)
-{
-        int *argsused = NULL;
-        char *unnamed = NULL;
-        char **arg = NULL;
-        int used = 0;
-        int ret;
-
-        if (ot->type == OPTIONS_TEST_UNNAMED)
-                arg = &unnamed;
-        else if (ot->type == OPTIONS_TEST_ARGSUSED)
-                argsused = &used;
-
-        memset(&test_config, 0, sizeof(test_config));
-        ret = options_parse(ot->argc, ot->argv, test_options, arg, argsused);
-        if (ret != ot->want) {
-                fprintf(stderr, "FAIL: test %i options_parse() returned %i, "
-                    "want %i\n", test_no, ret, ot->want);
-                return (1);
-        }
-        if (ret != 0)
-                return (0);
-
-        if ((test_config.arg != NULL || ot->wantarg != NULL) &&
-            (test_config.arg == NULL || ot->wantarg == NULL ||
-             strcmp(test_config.arg, ot->wantarg) != 0)) {
-                fprintf(stderr, "FAIL: test %i got arg '%s', want '%s'\n",
-                    test_no, test_config.arg, ot->wantarg);
-                return (1);
-        }
-        if (test_config.flag != ot->wantflag) {
-                fprintf(stderr, "FAIL: test %i got flag %i, want %i\n",
-                    test_no, test_config.flag, ot->wantflag);
-                return (1);
-        }
-        if (ot->type == OPTIONS_TEST_UNNAMED &&
-            (unnamed != NULL || ot->unnamed != NULL) &&
-            (unnamed == NULL || ot->unnamed == NULL ||
-             strcmp(unnamed, ot->unnamed) != 0)) {
-                fprintf(stderr, "FAIL: test %i got unnamed '%s', want '%s'\n",
-                    test_no, unnamed, ot->unnamed);
-                return (1);
-        }
-        if (ot->type == OPTIONS_TEST_ARGSUSED && used != ot->used) {
-                fprintf(stderr, "FAIL: test %i got used %i, want %i\n",
-                    test_no, used, ot->used);
-                return (1);
-        }
-
-        return (0);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        for (i = 0; i < N_OPTIONS_TESTS; i++) {
-                printf("Test %zu%s\n", (i + 1), options_tests[i].want == 0 ?
-                    "" : " is expected to complain");
-                failed += do_options_test(i + 1, &options_tests[i]);
-        }
-
-        return (failed);
-}
diff --git a/src/regress/usr.bin/openssl/test_client.sh b/src/regress/usr.bin/openssl/test_client.sh
deleted file mode 100644
index fed2baace0..0000000000
--- a/src/regress/usr.bin/openssl/test_client.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: test_client.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
-
-echo
-echo This starts a tls1 mode client to talk to the server run by 
-echo ./testserver.sh. You should start the server first. 
-echo
-echo type in this window after ssl negotiation and your output should
-echo be echoed by the server. 
-echo
-echo
-${OPENSSL:-/usr/bin/openssl} s_client -tls1
diff --git a/src/regress/usr.bin/openssl/test_server.sh b/src/regress/usr.bin/openssl/test_server.sh
deleted file mode 100644
index ec4a78a27a..0000000000
--- a/src/regress/usr.bin/openssl/test_server.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: test_server.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
-
-echo This starts a tls1 mode server using the DSA certificate in ./server.pem
-echo Run ./testclient.sh in another window and type at it, you should 
-echo see the results of the ssl negotiation, and stuff you type in the client
-echo should echo in this window
-echo
-echo
-${OPENSSL:-/usr/bin/openssl} s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/src/regress/usr.bin/openssl/testdsa.sh b/src/regress/usr.bin/openssl/testdsa.sh
deleted file mode 100644
index a04ba171ff..0000000000
--- a/src/regress/usr.bin/openssl/testdsa.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: testdsa.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
-
-
-#Test DSA certificate generation of openssl
-
-cd $1
-
-# Generate DSA paramter set
-openssl_bin=${OPENSSL:-/usr/bin/openssl}
-$openssl_bin dsaparam 512 -out dsa512.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-# Denerate a DSA certificate
-$openssl_bin req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-# Now check the certificate
-$openssl_bin x509 -text -in testdsa.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-exit 0
diff --git a/src/regress/usr.bin/openssl/testenc.sh b/src/regress/usr.bin/openssl/testenc.sh
deleted file mode 100644
index 89b3068a08..0000000000
--- a/src/regress/usr.bin/openssl/testenc.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: testenc.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
-
-testsrc=$2/openssl.cnf
-test=$1/p
-cmd=${OPENSSL:-/usr/bin/openssl}
-
-cd $1
-
-cat $testsrc >$test;
-
-echo cat
-$cmd enc < $test > $test.cipher
-$cmd enc < $test.cipher >$test.clear
-cmp $test $test.clear
-if [ $? != 0 ]
-then
-        exit 1
-else
-        /bin/rm $test.cipher $test.clear
-fi
-echo base64
-$cmd enc -a -e < $test > $test.cipher
-$cmd enc -a -d < $test.cipher >$test.clear
-cmp $test $test.clear
-if [ $? != 0 ]
-then
-        exit 1
-else
-        /bin/rm $test.cipher $test.clear
-fi
-
-/bin/rm -f $test
-exit 0
-
-# These tests are now done by the makefile.
-
-for i in rc4 \
-        des-cfb des-ede-cfb des-ede3-cfb \
-        des-ofb des-ede-ofb des-ede3-ofb \
-        des-ecb des-ede des-ede3 desx \
-        des-cbc des-ede-cbc des-ede3-cbc \
-        rc2-ecb rc2-cfb rc2-ofb rc2-cbc \
-        bf-ecb bf-cfb bf-ofb bf-cbc rc4 \
-        cast5-ecb cast5-cfb cast5-ofb cast5-cbc
-do
-        echo $i
-        $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher
-        $cmd $i -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
-        cmp $test $test.$i.clear
-        if [ $? != 0 ]
-        then
-                exit 1
-        else
-                /bin/rm $test.$i.cipher $test.$i.clear
-        fi
-
-        echo $i base64
-        $cmd $i -bufsize 113 -a -e -k test < $test > $test.$i.cipher
-        $cmd $i -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
-        cmp $test $test.$i.clear
-        if [ $? != 0 ]
-        then
-                exit 1
-        else
-                /bin/rm $test.$i.cipher $test.$i.clear
-        fi
-done
-rm -f $test
diff --git a/src/regress/usr.bin/openssl/testrsa.sh b/src/regress/usr.bin/openssl/testrsa.sh
deleted file mode 100644
index 36f5e639e8..0000000000
--- a/src/regress/usr.bin/openssl/testrsa.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: testrsa.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
-
-
-#Test RSA certificate generation of openssl
-
-cd $1
-openssl_bin=${OPENSSL:-/usr/bin/openssl}
-
-# Generate RSA private key
-$openssl_bin genrsa -out rsakey.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-# Generate an RSA certificate
-$openssl_bin req -config $2/openssl.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-# Now check the certificate
-$openssl_bin x509 -text -in rsacert.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-exit 0