add also certs with userid in the DN

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index 81555c7..4bc202b 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -61,6 +61,12 @@ function create_cert {
            CMD="openssl req -out $filebase.req -newkey rsa:$bits -new -keyout $filebase.priv -config $REQ_CONFIG_FILE_EMAIL"
            echo $CMD; $CMD;
             ;;
+        clientuid)
+           echo UID cert $flags
+           flags="client"
+           CMD="openssl req -out $filebase.req -newkey rsa:$bits -new -keyout $filebase.priv -config $REQ_CONFIG_FILE_UID"
+           echo $CMD; $CMD;
+            ;;
         *)
            echo normal cert $flags
            CMD="openssl req -out $filebase.req -newkey rsa:$bits -new -keyout $filebase.priv -config $REQ_CONFIG_FILE"
@@ -477,6 +483,15 @@ function create_all {
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
     create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy_exp "expired proxy" -1 proxy_exp
 
+    TYPE="clientuid"
+    CTYPE="client UID"
+
+    create_cert $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" ${TYPE} $DAYS
+    create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy "proxy" 1
+    create_cert_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_exp "expired proxy" -1
+    create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy "proxy" 1 proxy
+    create_cert_proxy_proxy $CERT_DIR/${catype}_${TYPE} "$catype ${CTYPE}" proxy_proxy_exp "expired proxy" -1 proxy_exp
+
     TYPE="fclient"
     CTYPE="flag client"
 
@@ -742,6 +757,7 @@ for catype in $CATYPES; do
     export REQ_CONFIG_FILE=$CA_DIR/req_conf.cnf
     export REQ_CONFIG_FILE_SERIAL=$CA_DIR/req_conf_sn.cnf
     export REQ_CONFIG_FILE_EMAIL=$CA_DIR/req_conf_email.cnf
+    export REQ_CONFIG_FILE_UID=$CA_DIR/req_conf_uid.cnf
     export REQ_PROXY_CONFIG_FILE=$CA_DIR/req_proxy_conf.cnf
     export REQ_PROXY_PROXY_CONFIG_FILE=$CA_DIR/req_proxy_proxy_conf.cnf
     export PROXY_BITS=512

diff --git a/test/big-ca/ca_conf.cnf b/test/big-ca/ca_conf.cnf
index 42d548d..cc85df0 100644 (file)
--- a/test/big-ca/ca_conf.cnf
+++ b/test/big-ca/ca_conf.cnf
@@ -20,6 +20,8 @@ organizationName       = optional
 organizationalUnitName = optional\r
 commonName             = supplied\r
 emailAddress           = optional\r
+serialNumber           = optional\r
+userId                 = optional\r
 \r
 [ ca_cert ]\r
 basicConstraints=CA:TRUE\r

diff --git a/test/big-ca/req_conf_uid.cnf b/test/big-ca/req_conf_uid.cnf
new file mode 100644 (file)
index 0000000..8b2092e
--- /dev/null
+++ b/test/big-ca/req_conf_uid.cnf
@@ -0,0 +1,35 @@
+[ req ]\r
+default_bits           = $ENV::BITS\r
+default_keyfile        = keyfile.pem\r
+distinguished_name     = req_distinguished_name\r
+attributes             = req_attributes\r
+prompt                 = no\r
+output_password        = $ENV::PASSWORD\r
+ca_cert                           = CA_cert\r
+\r
+[ req_distinguished_name ]\r
+countryName                    = UG\r
+\r
+#stateOrProvinceName          = South area\r
+\r
+localityName                   = Tropic\r
+\r
+organizationName                      = Utopia\r
+\r
+organizationalUnitName         = Relaxation\r
+\r
+commonName                     = $ENV::CN\r
+\r
+userId                         = testuserid\r
+\r
+#emailAddress                   = Email Address\r
+\r
+[ req_attributes ]\r
+#challengePassword              = $ENV::PASSWORD\r
+\r
+[ CA_cert ]\r
+basicConstraints = CA:true\r
+subjectKeyIdentifier=hash\r
+authorityKeyIdentifier=keyid:always,issuer:always\r
+\r
+[ proxy_none ]\r

diff --git a/test/expired-ca/ca_conf.cnf b/test/expired-ca/ca_conf.cnf
index 42d548d..a36254e 100644 (file)
--- a/test/expired-ca/ca_conf.cnf
+++ b/test/expired-ca/ca_conf.cnf
@@ -19,6 +19,8 @@ localityName           = optional
 organizationName       = optional\r
 organizationalUnitName = optional\r
 commonName             = supplied\r
+serialNumber           = optional\r
+userId                 = optional\r
 emailAddress           = optional\r
 \r
 [ ca_cert ]\r

diff --git a/test/expired-ca/req_conf_uid.cnf b/test/expired-ca/req_conf_uid.cnf
new file mode 100644 (file)
index 0000000..8b2092e
--- /dev/null
+++ b/test/expired-ca/req_conf_uid.cnf
@@ -0,0 +1,35 @@
+[ req ]\r
+default_bits           = $ENV::BITS\r
+default_keyfile        = keyfile.pem\r
+distinguished_name     = req_distinguished_name\r
+attributes             = req_attributes\r
+prompt                 = no\r
+output_password        = $ENV::PASSWORD\r
+ca_cert                           = CA_cert\r
+\r
+[ req_distinguished_name ]\r
+countryName                    = UG\r
+\r
+#stateOrProvinceName          = South area\r
+\r
+localityName                   = Tropic\r
+\r
+organizationName                      = Utopia\r
+\r
+organizationalUnitName         = Relaxation\r
+\r
+commonName                     = $ENV::CN\r
+\r
+userId                         = testuserid\r
+\r
+#emailAddress                   = Email Address\r
+\r
+[ req_attributes ]\r
+#challengePassword              = $ENV::PASSWORD\r
+\r
+[ CA_cert ]\r
+basicConstraints = CA:true\r
+subjectKeyIdentifier=hash\r
+authorityKeyIdentifier=keyid:always,issuer:always\r
+\r
+[ proxy_none ]\r

diff --git a/test/fake-ca/ca_conf.cnf b/test/fake-ca/ca_conf.cnf
index 42d548d..cc85df0 100644 (file)
--- a/test/fake-ca/ca_conf.cnf
+++ b/test/fake-ca/ca_conf.cnf
@@ -20,6 +20,8 @@ organizationName       = optional
 organizationalUnitName = optional\r
 commonName             = supplied\r
 emailAddress           = optional\r
+serialNumber           = optional\r
+userId                 = optional\r
 \r
 [ ca_cert ]\r
 basicConstraints=CA:TRUE\r

diff --git a/test/fake-ca/req_conf_uid.cnf b/test/fake-ca/req_conf_uid.cnf
new file mode 100644 (file)
index 0000000..8b2092e
--- /dev/null
+++ b/test/fake-ca/req_conf_uid.cnf
@@ -0,0 +1,35 @@
+[ req ]\r
+default_bits           = $ENV::BITS\r
+default_keyfile        = keyfile.pem\r
+distinguished_name     = req_distinguished_name\r
+attributes             = req_attributes\r
+prompt                 = no\r
+output_password        = $ENV::PASSWORD\r
+ca_cert                           = CA_cert\r
+\r
+[ req_distinguished_name ]\r
+countryName                    = UG\r
+\r
+#stateOrProvinceName          = South area\r
+\r
+localityName                   = Tropic\r
+\r
+organizationName                      = Utopia\r
+\r
+organizationalUnitName         = Relaxation\r
+\r
+commonName                     = $ENV::CN\r
+\r
+userId                         = testuserid\r
+\r
+#emailAddress                   = Email Address\r
+\r
+[ req_attributes ]\r
+#challengePassword              = $ENV::PASSWORD\r
+\r
+[ CA_cert ]\r
+basicConstraints = CA:true\r
+subjectKeyIdentifier=hash\r
+authorityKeyIdentifier=keyid:always,issuer:always\r
+\r
+[ proxy_none ]\r

diff --git a/test/trusted-ca/ca_conf.cnf b/test/trusted-ca/ca_conf.cnf
index 7ae8401..cc85df0 100644 (file)
--- a/test/trusted-ca/ca_conf.cnf
+++ b/test/trusted-ca/ca_conf.cnf
@@ -21,6 +21,7 @@ organizationalUnitName = optional
 commonName             = supplied\r
 emailAddress           = optional\r
 serialNumber           = optional\r
+userId                 = optional\r
 \r
 [ ca_cert ]\r
 basicConstraints=CA:TRUE\r

diff --git a/test/trusted-ca/req_conf_uid.cnf b/test/trusted-ca/req_conf_uid.cnf
new file mode 100644 (file)
index 0000000..8b2092e
--- /dev/null
+++ b/test/trusted-ca/req_conf_uid.cnf
@@ -0,0 +1,35 @@
+[ req ]\r
+default_bits           = $ENV::BITS\r
+default_keyfile        = keyfile.pem\r
+distinguished_name     = req_distinguished_name\r
+attributes             = req_attributes\r
+prompt                 = no\r
+output_password        = $ENV::PASSWORD\r
+ca_cert                           = CA_cert\r
+\r
+[ req_distinguished_name ]\r
+countryName                    = UG\r
+\r
+#stateOrProvinceName          = South area\r
+\r
+localityName                   = Tropic\r
+\r
+organizationName                      = Utopia\r
+\r
+organizationalUnitName         = Relaxation\r
+\r
+commonName                     = $ENV::CN\r
+\r
+userId                         = testuserid\r
+\r
+#emailAddress                   = Email Address\r
+\r
+[ req_attributes ]\r
+#challengePassword              = $ENV::PASSWORD\r
+\r
+[ CA_cert ]\r
+basicConstraints = CA:true\r
+subjectKeyIdentifier=hash\r
+authorityKeyIdentifier=keyid:always,issuer:always\r
+\r
+[ proxy_none ]\r