Lookups: dsearch subdir with leading "..". Bug 2994

[exim.git] / test / aux-fixed / exim-ca / genall

diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall
index 6998108b0bff135379b520a11613d13c73b73731..25e46c7cf7fc2d6fc731257636b1999a1ed24487 100755 (executable)
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -10,11 +10,19 @@ V='-v'
 
 clica --help >/dev/null 2>&1
 
-echo Ensure time is set to 2012/11/01 12:34
-echo use -  date -u 110112342012
+echo Ensure time is set to 2019/11/01 12:34
+echo use -  date -u 110112342019
 echo hit return when ready
 read junk
 
+# Calc number of months from then to (about) Nov 2037.
+# We're sticking to a 2038 cutoff for now, to maintain support for 32b systems,
+# but will have to give that up in only a few years.
+#
+tgt_secs=`date -d 'Nov 25 2037' +%s`
+now_secs=`date +%s`
+diff_months=$(( ($tgt_secs - $now_secs) / 60 / 60 / 24 / 31 ))
+
 # Main suite: RSA certs
 for tld in com org net
 do
@@ -34,18 +42,21 @@ do
     # -F  create sub-signing cert
     # -C CRL
     # -O create OCSP responder cert
+    # -3 Authority key ID extension
+    # -8 Subject Alternate Names
+
     clica $V -D "$idir" -p password -B 2048 -I -N $iname -F -C http://crl.$iname/latest.crl -O http://oscp.$iname/
 
-    # create server certs
+    # create server leaf certs
     # -m <months>
-    clica $V -D $idir -p password -s 101 -S server1.$iname -m 301 \
+    clica $V -D $idir -p password -s 101 -S server1.$iname -m $diff_months \
        -8 alternatename.server1.example.$tld,alternatename2.server1.example.$tld,*.test.ex
-    clica $V -D $idir -p password -s 102 -S revoked1.$iname -m 301
+    clica $V -D $idir -p password -s 102 -S revoked1.$iname -m $diff_months
     clica $V -D $idir -p password -s 103 -S expired1.$iname -m 1
 
-    clica $V -D $idir -p password -s 201 -S  server2.$iname -m 301 \
-       -3 'CN=clica CA rsa,O=example.com' -8 '*.test.ex'
-    clica $V -D $idir -p password -s 202 -S revoked2.$iname -m 301
+    clica $V -D $idir -p password -s 201 -S  server2.$iname -m $diff_months \
+       -3 "CN=clica CA rsa,O=example.$tld" -8 '*.test.ex'
+    clica $V -D $idir -p password -s 202 -S revoked2.$iname -m $diff_months
     clica $V -D $idir -p password -s 203 -S expired2.$iname -m 1
 
 ####
@@ -130,12 +141,13 @@ EOF
     for server in server1 revoked1 expired1 server2 revoked2 expired2
     do
        SPFX=$idir/$server.$iname/$server.$iname
-       openssl ocsp -issuer $CADIR/Signer.pem -sha256 -cert $SPFX.pem -no_nonce -reqout $SPFX.ocsp.req
+       openssl ocsp -issuer $CADIR/Signer.pem -cert $SPFX.pem -no_nonce -reqout $SPFX.ocsp.req
        REQIN="-reqin $SPFX.ocsp.req"
 
        # These ones get used by the "traditional" testcases. OCSP resp signed by a cert which is
        # signed by the signer of the leaf-cert being attested to.
        OGENCOMMON="-rsigner $CADIR/OCSP.pem -rkey $CADIR/OCSP.key -CA $CADIR/Signer.pem -noverify"
+
        openssl ocsp $IVALID   $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.good.resp
        openssl ocsp $IVALID   $OGENCOMMON -ndays 30   $REQIN -respout $SPFX.ocsp.dated.resp
        openssl ocsp $IREVOKED $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.revoked.resp
@@ -191,7 +203,7 @@ done
 
 # Create one EC leaf cert in the RSA cert tree.  It will have an EC pubkey but be signed using its parent
 # therefore its parent's algo, RSA.
-clica $V -D example.com -p password -k ec -q nistp521 -s 1101 -S server1_ec.example.com -m 301 -8 'server1.example.com,*.test.ex'
+clica $V -D example.com -p password -k ec -q nistp521 -s 1101 -S server1_ec.example.com -m $diff_months -8 'server1.example.com,*.test.ex'
 SDIR=example.com/server1_ec.example.com
 SPFX=$SDIR/server1_ec.example.com
 openssl ec -in $SPFX.key -passin file:$SDIR/pwdfile -out $SPFX.unlocked.key
@@ -221,7 +233,7 @@ do
 
     # create server certs
     # -m <months>
-    clica $V -D $idir -p password -s 2101 -S server1.$iname -m 301 \
+    clica $V -D $idir -p password -s 2101 -S server1.$iname -m $diff_months \
        -k ec -q nistp521 \
        -8 server1.example.$tld,alternatename.server1.example.$tld,alternatename2.server1.example.$tld,*.test.ex