Fix "-bP smtp_receive_timeout". Bug 2384

[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 d95dd83d15b6b57ee98a53f04759e41eeb148e40..a5e51e3e5e21b4b161e109e5b40effe5666db422 100755 (executable)
--- 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 -e
 
 # Debugging.  Set V for clica verbosity.

-#set -x
-V=
-#V='-v'
+set -x
+#V=
+V='-v'

 
 clica --help >/dev/null 2>&1
 
 
 clica --help >/dev/null 2>&1
 


@@ -26,7 +26,7 @@ do
     rm -fr "$idir"
 
     # create CA cert + templates
     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/
+    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>
 
     # create server certs
     # -m <months>


@@ -34,7 +34,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
        -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
 
     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 +45,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.
     # 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
         rm cacerts.pem

-    cd ../..
+      cd ../..
+    done

 
 ####
 
 
 ####
 


@@ -155,7 +160,7 @@ do
     rm -fr "$idir"
 
     # create CA cert + templates
     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/
 
        -k ec -q nistp521 \
        -C http://crl.example.$tld/latest.crl -O http://oscp.example.$tld/
 


@@ -184,7 +189,7 @@ do
        SDIR=$idir/$server.$iname
        SPFX=$SDIR/$server.$iname
        openssl ec -in $SPFX.key -passin file:$SDIR/pwdfile -out $SPFX.unlocked.key
        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
 
 ####
     done
 
 ####


@@ -233,28 +238,36 @@ read junk
 
 # Create CRL files in .der and .pem
 # empty versions, and ones with the revoked servers
 
 # 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
 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
     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
 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
     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
 done
 
 # Finally, a single certificate-directory