merge from HEAD:

reduce verbosity during build.
fix dn error cert names and revoked certs validity times

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index 40be21b..1306d5d 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -127,7 +127,7 @@ function create_cert_proxy {
                     -out ${X509_PROX_CERT} \
                     -outdir . \
                     -config ${CA_PROXY_CONF} -md md5 -days ${validity} -batch \
-                    -verbose -passin pass:${PASSWORD} -notext \
+                    -passin pass:${PASSWORD} -notext \
                     -extensions proxy_none "
     echo $CMD; $CMD
 
@@ -210,7 +210,6 @@ function create_cert_proxy_proxy {
                     -out ${X509_PROX_CERT} \
                     -outdir . \
                     -config ${CA_PROXY_CONF} -md md5 -days ${validity} -batch \
-                    -verbose \
                     -passin pass:${PASSWORD} -notext \
                     -extensions proxy_none "
     echo $CMD; $CMD
@@ -445,7 +444,7 @@ function create_all {
     CTYPE="client revoked"
     TYPE2="client"
 
-    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} -1
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} $DAYS
     create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     openssl ca -revoke $CERT_DIR/${catype}_${TYPE}.cert -config $CA_CONF
@@ -454,7 +453,7 @@ function create_all {
     CTYPE="flag client revoked"
     TYPE2="fclient"
 
-    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} -1
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} $DAYS
     create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     openssl ca -revoke $CERT_DIR/${catype}_${TYPE}.cert -config $CA_CONF
@@ -463,7 +462,7 @@ function create_all {
     CTYPE="server revoked"
     TYPE2="server"
 
-    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} -1
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} $DAYS
     create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     openssl ca -revoke $CERT_DIR/${catype}_${TYPE}.cert -config $CA_CONF
@@ -472,7 +471,7 @@ function create_all {
     CTYPE="clientserver revoked"
     TYPE2="clientserver"
 
-    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} -1
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} $DAYS
     create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     openssl ca -revoke $CERT_DIR/${catype}_${TYPE}.cert -config $CA_CONF
@@ -481,7 +480,7 @@ function create_all {
     CTYPE="none revoked"
     TYPE2="none"
 
-    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} -1
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE2} $DAYS
     create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     openssl ca -revoke $CERT_DIR/${catype}_${TYPE}.cert -config $CA_CONF
@@ -490,7 +489,7 @@ function create_all {
     
     TYPE="client"
     CTYPE="client dnerror"
-    TYPE2="_proxy_dnerror"
+    TYPE2="proxy_dnerror"
     create_cert_proxy $CERT_DIR/${catype}_client "$catype client dnerror" ${TYPE2} "proxy" $DAYS
 
     # generating CRL