diff options
-rwxr-xr-x | src/regress/usr.bin/openssl/appstest.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh index 23478f7606..bed3a3cf7d 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.26 2019/11/05 12:05:34 inoguchi Exp $ | 3 | # $OpenBSD: appstest.sh,v 1.27 2019/11/05 12:14:14 inoguchi Exp $ |
4 | # | 4 | # |
5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> | 5 | # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> |
6 | # | 6 | # |
@@ -71,7 +71,7 @@ function test_usage_lists_others { | |||
71 | $openssl_bin -help 2>> $user1_dir/usages.out | 71 | $openssl_bin -help 2>> $user1_dir/usages.out |
72 | for c in $cmds ; do | 72 | for c in $cmds ; do |
73 | $openssl_bin $c -help 2>> $user1_dir/usages.out | 73 | $openssl_bin $c -help 2>> $user1_dir/usages.out |
74 | done | 74 | done |
75 | 75 | ||
76 | start_message "check all list-* commands." | 76 | start_message "check all list-* commands." |
77 | 77 | ||
@@ -529,7 +529,7 @@ organizationalUnitName = optional | |||
529 | commonName = supplied | 529 | commonName = supplied |
530 | emailAddress = optional | 530 | emailAddress = optional |
531 | [ req ] | 531 | [ req ] |
532 | distinguished_name = req_distinguished_name | 532 | distinguished_name = req_distinguished_name |
533 | [ req_distinguished_name ] | 533 | [ req_distinguished_name ] |
534 | countryName = Country Name | 534 | countryName = Country Name |
535 | countryName_default = JP | 535 | countryName_default = JP |
@@ -541,7 +541,7 @@ organizationName = Organization Name | |||
541 | organizationName_default = TEST_DUMMY_COMPANY | 541 | organizationName_default = TEST_DUMMY_COMPANY |
542 | commonName = Common Name | 542 | commonName = Common Name |
543 | [ tsa ] | 543 | [ tsa ] |
544 | default_tsa = tsa_config1 | 544 | default_tsa = tsa_config1 |
545 | [ tsa_config1 ] | 545 | [ tsa_config1 ] |
546 | dir = ./$tsa_dir | 546 | dir = ./$tsa_dir |
547 | serial = \$dir/serial | 547 | serial = \$dir/serial |
@@ -575,32 +575,32 @@ __EOF__ | |||
575 | mkdir -p $ca_dir/newcerts | 575 | mkdir -p $ca_dir/newcerts |
576 | chmod 700 $ca_dir/private | 576 | chmod 700 $ca_dir/private |
577 | echo "01" > $ca_dir/serial | 577 | echo "01" > $ca_dir/serial |
578 | touch $ca_dir/index.txt | 578 | touch $ca_dir/index.txt |
579 | touch $ca_dir/crlnumber | 579 | touch $ca_dir/crlnumber |
580 | echo "01" > $ca_dir/crlnumber | 580 | echo "01" > $ca_dir/crlnumber |
581 | 581 | ||
582 | # | 582 | # |
583 | # setup test TSA | 583 | # setup test TSA |
584 | # | 584 | # |
585 | mkdir -p $tsa_dir/private | 585 | mkdir -p $tsa_dir/private |
586 | chmod 700 $tsa_dir/private | 586 | chmod 700 $tsa_dir/private |
587 | echo "01" > $tsa_dir/serial | 587 | echo "01" > $tsa_dir/serial |
588 | touch $tsa_dir/index.txt | 588 | touch $tsa_dir/index.txt |
589 | 589 | ||
590 | # | 590 | # |
591 | # setup test OCSP | 591 | # setup test OCSP |
592 | # | 592 | # |
593 | mkdir -p $ocsp_dir/private | 593 | mkdir -p $ocsp_dir/private |
594 | chmod 700 $ocsp_dir/private | 594 | chmod 700 $ocsp_dir/private |
595 | 595 | ||
596 | #---------#---------#---------#---------#---------#---------#--------- | 596 | #---------#---------#---------#---------#---------#---------#--------- |
597 | 597 | ||
598 | # --- CA initiate (generate CA key and cert) --- | 598 | # --- CA initiate (generate CA key and cert) --- |
599 | 599 | ||
600 | start_message "req ... generate CA key and self signed cert" | 600 | start_message "req ... generate CA key and self signed cert" |
601 | 601 | ||
602 | ca_cert=$ca_dir/ca_cert.pem | 602 | ca_cert=$ca_dir/ca_cert.pem |
603 | ca_key=$ca_dir/private/ca_key.pem ca_pass=test-ca-pass | 603 | ca_key=$ca_dir/private/ca_key.pem ca_pass=test-ca-pass |
604 | 604 | ||
605 | if [ $mingw = 0 ] ; then | 605 | if [ $mingw = 0 ] ; then |
606 | subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=testCA.test_dummy.com/' | 606 | subj='/C=JP/ST=Tokyo/O=TEST_DUMMY_COMPANY/CN=testCA.test_dummy.com/' |
@@ -657,7 +657,7 @@ __EOF__ | |||
657 | 657 | ||
658 | start_message "req ... generate OCSP key and cert" | 658 | start_message "req ... generate OCSP key and cert" |
659 | 659 | ||
660 | # generate CSR for OCSP | 660 | # generate CSR for OCSP |
661 | 661 | ||
662 | ocsp_csr=$ocsp_dir/ocsp_csr.pem | 662 | ocsp_csr=$ocsp_dir/ocsp_csr.pem |
663 | ocsp_key=$ocsp_dir/private/ocsp_key.pem | 663 | ocsp_key=$ocsp_dir/private/ocsp_key.pem |
@@ -679,7 +679,7 @@ __EOF__ | |||
679 | $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -keyform pem \ | 679 | $openssl_bin ca -batch -cert $ca_cert -keyfile $ca_key -keyform pem \ |
680 | -key $ca_pass -out $ocsp_cert -extensions ocsp_ext \ | 680 | -key $ca_pass -out $ocsp_cert -extensions ocsp_ext \ |
681 | -startdate `date -u '+%y%m%d%H%M%SZ'` -enddate 491223235959Z \ | 681 | -startdate `date -u '+%y%m%d%H%M%SZ'` -enddate 491223235959Z \ |
682 | -subj $subj -infiles $ocsp_csr | 682 | -subj $subj -infiles $ocsp_csr |
683 | check_exit_status $? | 683 | check_exit_status $? |
684 | 684 | ||
685 | #---------#---------#---------#---------#---------#---------#--------- | 685 | #---------#---------#---------#---------#---------#---------#--------- |