X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/4e0c20cbdc94f1e7da2476916c7fe90a2e034806..a43b19ef3a58c547f76f42da0128dd33c7b51a4e:/test/aux-fixed/exim-ca/genall?ds=inline

diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall
index d95dd83d1..8efda889f 100755
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -4,9 +4,9 @@
 set -e
 
 # Debugging.  Set V for clica verbosity.
-#set -x
-V=
-#V='-v'
+set -x
+#V=
+V='-v'
 
 clica --help >/dev/null 2>&1
 
@@ -26,7 +26,15 @@ do
     rm -fr "$idir"
 
     # create CA cert + templates
-    clica $V -D "$idir" -p password -B 1024 -I -N $iname -F -C http://crl.$iname/latest.crl -O http://oscp.$iname/
+    # -D  dir to work in
+    # -p  passwd for cert
+    # -B  keysize in bits
+    # -I  create CA cert
+    # -N  org name
+    # -F  create sub-signing cert
+    # -C CRL
+    # -O create OCSP responder cert
+    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
     # -m <months>
@@ -34,7 +42,9 @@ do
 	-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 103 -S expired1.$iname -m 1
-    clica $V -D $idir -p password -s 201 -S  server2.$iname -m 301
+
+    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 203 -S expired2.$iname -m 1
 
@@ -43,11 +53,14 @@ do
     # openssl seems to generate a file (ca_chain.pam) in an order it
     # cannot then use (the key applies to the first cert in the file?).
     # Generate a shuffled one.
-    cd $idir/server1.$iname
-        openssl pkcs12 -in server1.$iname.p12 -passin file:pwdfile -cacerts -out cacerts.pem -nokeys
-        cat server1.$iname.pem cacerts.pem > fullchain.pem
+    for n in 1 2
+    do
+      cd $idir/server$n.$iname
+        openssl pkcs12 -in server$n.$iname.p12 -passin file:pwdfile -cacerts -out cacerts.pem -nokeys
+        cat server$n.$iname.pem cacerts.pem > fullchain.pem
         rm cacerts.pem
-    cd ../..
+      cd ../..
+    done
 
 ####
 
@@ -62,8 +75,15 @@ do
 
 ####
 
+ # so, for full-chain OCSP we sill want an OCSP resp for the Signer cert and also (?) one for the
+ # CA cert itself.  The existing bits below only create for the leaf certs, next layer down.
+ #
+ # First test will be just adding OCSP for the Signer cert. Presumably we could use the CA cert
+ # to sign that.
+
     # create OCSP reqs & resps
     CADIR=$idir/CA
+
     #give ourselves an OSCP key to work with
     pk12util -o $CADIR/OCSP.p12 -n 'OCSP Signer rsa' -d $CADIR -K password -W password
     openssl pkcs12 -in $CADIR/OCSP.p12 -passin pass:password -passout pass:password -nodes -nocerts -out $CADIR/OCSP.key
@@ -72,12 +92,17 @@ do
     pk12util -o $CADIR/Signer.p12 -n 'Signing Cert rsa' -d $CADIR -K password -W password
     openssl pkcs12 -in $CADIR/Signer.p12 -passin pass:password -passout pass:password -nodes -nocerts -out $CADIR/Signer.key
 
+    # ditto for CA
+    # - the "-n names" here appear to be hardcoded in clica
+    pk12util -o $CADIR/CA.p12 -n 'Certificate Authority rsa' -d $CADIR -K password -W password
+    openssl pkcs12 -in $CADIR/CA.p12 -passin pass:password -passout pass:password -nodes -nocerts -out $CADIR/CA.key
+
     # create some index files for the ocsp responder to work with
-# tab-sep
+# tab-sep, and fields can be empty
 # 0: Revoked/Expired/Valid letter
 # 1: Expiry date (ASN1_UTCTIME)
 # 2: Revocation date
-# 3: Serial no. (unique)
+# 3: Serial no. (unique, in hex)
 # 4: file
 # 5: DN, index
 
@@ -88,6 +113,8 @@ V	130110200751Z		67	unknown	CN=expired1.$iname
 V	130110200751Z		c9	unknown	CN=server2.$iname
 V	130110200751Z		ca	unknown	CN=revoked2.$iname
 V	130110200751Z		cb	unknown	CN=expired2.$iname
+V	130110200751Z		42	unknown	CN=clica Signing Cert rsa
+V	130110200751Z		41	unknown	CN=clica CA rsa
 EOF
     cat >$CADIR/index.revoked.txt <<EOF
 R	130110200751Z	100201142709Z,superseded	65	unknown	CN=server1.$iname
@@ -96,9 +123,10 @@ R	130110200751Z	100201142709Z,superseded	67	unknown	CN=expired1.$iname
 R	130110200751Z	100201142709Z,superseded	c9	unknown	CN=server2.$iname
 R	130110200751Z	100201142709Z,superseded	ca	unknown	CN=revoked2.$iname
 R	130110200751Z	100201142709Z,superseded	cb	unknown	CN=expired2.$iname
+R	130110200751Z	100201142709Z,superseded	42	unknown	CN=clica Signing Cert rsa
 EOF
 
-    # Now create all the ocsp requests and responses
+    # Now create all the ocsp requests and responses for the leaf certs
     IVALID="-index $CADIR/index.valid.txt"
     IREVOKED="-index $CADIR/index.revoked.txt"
 
@@ -111,6 +139,8 @@ EOF
 	openssl ocsp -issuer $CADIR/Signer.pem -sha256 -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
@@ -121,11 +151,40 @@ EOF
 	openssl ocsp $IVALID   $OGENCOMMON -ndays 30   $REQIN -respout $SPFX.ocsp.signer.dated.resp
 	openssl ocsp $IREVOKED $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.signer.revoked.resp
 
+	# These ones get used by the "LetsEncrypt mode" testcases. OCSP resp is signed directly by the
+	# signer of the leaf-cert being attested to.
 	OGENCOMMON="-rsigner $CADIR/Signer.pem -rkey $CADIR/Signer.key -CA $CADIR/Signer.pem -resp_no_certs -noverify"
 	openssl ocsp $IVALID   $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.signernocert.good.resp
 	openssl ocsp $IVALID   $OGENCOMMON -ndays 30   $REQIN -respout $SPFX.ocsp.signernocert.dated.resp
 	openssl ocsp $IREVOKED $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.signernocert.revoked.resp
     done
+
+    # convert one good leaf-resp to PEM
+    $server=server1
+    RESP=$idir/$server.$iname/$server.$iname.ocsp.signernocert.good.resp
+    ocsptool -S $RESP -j > $RESP.pem
+
+    # Then, ocsp request and responses for the signer cert
+    REQ=$CADIR/Signer.ocsp.req
+    RESP=$CADIR/Signer.ocsp.signernocert.good.resp
+    openssl ocsp -issuer $CADIR/CA.pem -sha256 -cert $CADIR/Signer.pem -no_nonce -reqout $REQ
+    openssl ocsp $IVALID -rsigner $CADIR/CA.pem -rkey $CADIR/CA.key -CA $CADIR/CA.pem -resp_no_certs -noverify \
+	-ndays 3652 -reqin $REQ -respout $RESP
+    ocsptool -S $RESP -j > $RESP.pem
+
+    RESP=$CADIR/Signer.ocsp.signernocert.revoked.resp
+    openssl ocsp $IREVOKED -rsigner $CADIR/CA.pem -rkey $CADIR/CA.key -CA $CADIR/CA.pem -resp_no_certs -noverify \
+	-ndays 3652 -reqin $REQ -respout $RESP
+    ocsptool -S $RESP -j > $RESP.pem
+
+    # Then, ocsp request and response for the CA cert
+    REQ=$CADIR/CA.ocsp.req
+    RESP=$CADIR/CA.ocsp.signernocert.good.resp
+    openssl ocsp -issuer $CADIR/CA.pem -sha256 -cert $CADIR/CA.pem -no_nonce -reqout $REQ
+    openssl ocsp $IVALID -rsigner $CADIR/CA.pem -rkey $CADIR/CA.key -CA $CADIR/CA.pem -resp_no_certs -noverify \
+	-ndays 3652 -reqin $REQ -respout $RESP
+    ocsptool -S $RESP -j > $RESP.pem
+
 ####
 done
 
@@ -155,7 +214,7 @@ do
     rm -fr "$idir"
 
     # create CA cert + templates
-    clica $V -D "$idir" -p password -B 1024 -I -N $iname -F \
+    clica $V -D "$idir" -p password -B 2048 -I -N $iname -F \
 	-k ec -q nistp521 \
 	-C http://crl.example.$tld/latest.crl -O http://oscp.example.$tld/
 
@@ -184,7 +243,7 @@ do
 	SDIR=$idir/$server.$iname
 	SPFX=$SDIR/$server.$iname
 	openssl ec -in $SPFX.key -passin file:$SDIR/pwdfile -out $SPFX.unlocked.key
-	cat $SPFX.pem example.$tld/CA/Signer.pem >$SPFX.chain.pem
+	cat $SPFX.pem $idir/CA/Signer.pem >$SPFX.chain.pem
     done
 
 ####
@@ -204,7 +263,7 @@ do
 # 5: DN, index
 
     cat >$CADIR/index.valid.txt <<EOF
-V	130110200751Z		65	unknown	CN=server1.$iname
+V	130110200751Z		835	unknown	CN=server1.$iname
 EOF
 
     # Now create all the ocsp requests and responses
@@ -233,28 +292,36 @@ read junk
 
 # Create CRL files in .der and .pem
 # empty versions, and ones with the revoked servers
+DATENOW=`date -u +%Y%m%d%H%M%SZ`
 for tld in com org net
 do
     CADIR=example.$tld/CA
     CRLIN=$CADIR/crl.empty.in.txt
-    DATENOW=`date -u +%Y%m%d%H%M%SZ`
     echo "update=$DATENOW " >$CRLIN
     crlutil -G -d $CADIR -f $CADIR/pwdfile \
 	-n 'Signing Cert rsa' -c $CRLIN -o $CADIR/crl.empty
     openssl crl -in $CADIR/crl.empty -inform der -out $CADIR/crl.empty.pem
 done
 sleep 2
+DATENOW=`date -u +%Y%m%d%H%M%SZ`
 for tld in com org net
 do
     CADIR=example.$tld/CA
     CRLIN=$CADIR/crl.v2.in.txt
-    DATENOW=`date -u +%Y%m%d%H%M%SZ`
     echo "update=$DATENOW " >$CRLIN
     echo "addcert 102 $DATENOW" >>$CRLIN
     echo "addcert 202 $DATENOW" >>$CRLIN
     crlutil -G -d $CADIR -f $CADIR/pwdfile \
 	-n 'Signing Cert rsa' -c $CRLIN -o $CADIR/crl.v2
     openssl crl -in $CADIR/crl.v2 -inform der -out $CADIR/crl.v2.pem
+
+    CRLIN=$CADIR/crl.Signer.in.txt
+    echo "update=$DATENOW " >$CRLIN
+    crlutil -G -d $CADIR -f $CADIR/pwdfile \
+	-n 'Certificate Authority rsa' -c $CRLIN -o $CADIR/crl.Signer
+    openssl crl -in $CADIR/crl.Signer -inform der -out $CADIR/crl.Signer.pem
+
+    cat $CADIR/crl.Signer.pem $CADIR/crl.v2.pem > $CADIR/crl.chain.pem
 done
 
 # Finally, a single certificate-directory