DSN: fix null deref when bounce is due to conn-timeout. Bug 1630

[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 63a3618eef71af6b7eecfe892a1584c6323600cb..64e5a85b44b0af72a4774bfeff6bac183d8546b1 100755 (executable)
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -7,13 +7,26 @@ echo hit return when ready
 read junk
 for tld in com org net
 do
-    clica -D example.$tld -p password -B 512 -I -N example.$tld -F -C http://crl.example.$tld/latest.crl -O http://oscp/example.$tld/
-    clica -D example.$tld -p password -s 101 -S server1.example.$tld
+    clica -D example.$tld -p password -B 1024 -I -N example.$tld -F \
+       -C http://crl.example.$tld/latest.crl -O http://oscp/example.$tld/
+
+    clica -D example.$tld -p password -s 101 -S server1.example.$tld \
+       -8 alternatename.server1.example.$tld,alternatename2.server1.example.$tld
     clica -D example.$tld -p password -s 102 -S revoked1.example.$tld
     clica -D example.$tld -p password -s 103 -S expired1.example.$tld -m 1
     clica -D example.$tld -p password -s 201 -S server2.example.$tld
     clica -D example.$tld -p password -s 202 -S revoked2.example.$tld
     clica -D example.$tld -p password -s 203 -S expired2.example.$tld -m 1
+
+
+    # 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 example.$tld/server1.example.$tld
+    openssl pkcs12 -in server1.example.com.p12 -passin file:pwdfile -cacerts -out cacerts.pem -nokeys
+    cat server1.example.com.pem cacerts.pem > fullchain.pem
+    rm cacerts.pem
+    cd ../..
 done
 
 # and loop again
@@ -49,16 +62,17 @@ EOF
     do
        SPFX=example.$tld/$server.example.$tld/$server.example.$tld
        openssl ocsp -issuer $CADIR/Signer.pem -cert $SPFX.pem -reqout $SPFX.ocsp.req
-       openssl ocsp -index $CADIR/index.valid.txt $OGENCOMMON -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.good.resp
-       openssl ocsp -index $CADIR/index.valid.txt $OGENCOMMON -ndays 30 -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.dated.resp
-       openssl ocsp -index $CADIR/index.revoked.txt $OGENCOMMON -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.revoked.resp
+       openssl ocsp -index $CADIR/index.valid.txt $OGENCOMMON   -ndays 3652 -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.good.resp
+       openssl ocsp -index $CADIR/index.valid.txt $OGENCOMMON   -ndays 30   -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.dated.resp
+       openssl ocsp -index $CADIR/index.revoked.txt $OGENCOMMON -ndays 3652 -reqin $SPFX.ocsp.req -respout $SPFX.ocsp.revoked.resp
     done
 done
 
 # and loop again to generate unlocked keys and client cert bundles
 for tld in com org net
 do
-    for server in server1 revoked1 expired1 server2 revoked2 expired2 do
+    for server in server1 revoked1 expired1 server2 revoked2 expired2
+    do
        SDIR=example.$tld/$server.example.$tld
        SPFX=$SDIR/$server.example.$tld
        openssl rsa -in $SPFX.key -passin file:$SDIR/pwdfile -out $SPFX.unlocked.key
@@ -98,4 +112,19 @@ do
     openssl crl -in $CADIR/crl.v2 -inform der -out $CADIR/crl.v2.pem
 done
 
+# Finally, a single certificate-directory
+cd example.com/server1.example.com
+mkdir -f certdir
+cd certdir
+f=../../CA/CA.pem
+h=`openssl x509 -hash -noout -in $f`
+ln -s $f $h.0
+f=../../CA/Signer.pem
+h=`openssl x509 -hash -noout -in $f`
+ln -s $f $h.0
+cd ../..
+
+find example.* -type d -print0 | xargs -0 chmod 755
+find example.* -type f -print0 | xargs -0 chmod 644
+
 echo "CA, Certificate, CRL and OSCP Response generation complete"