Merge branch 'libs/jetty/sni_clean'

diff --git a/doc/scripts/.gitignore b/doc/scripts/.gitignore
index 3574a98acc77837ca270f5615e6ad2b0af6d3131..a90e325f70f6069231b446ea742f630cfdec9bc6 100644 (file)
--- a/doc/scripts/.gitignore
+++ b/doc/scripts/.gitignore
@@ -1,3 +1,5 @@
 *.crt
-jetty.csr
-jetty.key
+*.csr
+*.key
+*.pkcs12
+testca

diff --git a/doc/scripts/generateKeys.sh b/doc/scripts/generateKeys.sh
index 26a01ce30aac7df9e610f4e2e0f3fb650ca57283..545b12a42adbf3a375be2c986063951897a50920 100755 (executable)
--- a/doc/scripts/generateKeys.sh
+++ b/doc/scripts/generateKeys.sh
@@ -1,7 +1,33 @@
 #!/bin/sh
-# this script generates a simple self-signed keypair
+# this script generates a set of sample keys
 
-openssl genrsa -out jetty.key 4096
-openssl req -new -key jetty.key -out jetty.csr -subj "/CN=localhost" -config selfsign.config
-openssl x509 -req -days 365 -in jetty.csr -signkey jetty.key -out jetty.crt
-openssl pkcs12 -inkey jetty.key -in jetty.crt -export -passout pass: -out ../../config/keystore.pkcs12
+rm -Rf *.csr *.crt *.key *.pkcs12 testca
+
+openssl genrsa -out testca.key 4096
+openssl req -new -key testca.key -out testca.csr -subj "/CN=local cacert-gigi testCA" -config selfsign.config
+openssl x509 -req -days 365 -in testca.csr -signkey testca.key -out testca.crt
+
+mkdir testca
+mkdir testca/newcerts
+echo 01 > testca/serial
+touch testca/db
+echo unique_subject = no >testca/db.attr
+
+genserver(){
+
+openssl genrsa -out $1.key 4096
+openssl req -new -key $1.key -out $1.csr -subj "/CN=$1.cacert.local" -config selfsign.config
+openssl ca -cert testca.crt -keyfile testca.key -in $1.csr -out $1.crt -days 356 -batch -config selfsign.config
+
+openssl pkcs12 -inkey $1.key -in $1.crt -name $1 -export -passout pass: -out $1.pkcs12
+
+keytool -importkeystore -noprompt -srckeystore $1.pkcs12 -destkeystore ../../config/keystore.pkcs12 -srcstoretype pkcs12 -deststoretype pkcs12 -srcstorepass "" -deststorepass ""
+
+}
+
+genserver www
+genserver secure
+genserver static
+genserver api
+
+keytool -list -keystore ../../config/keystore.pkcs12 -storetype pkcs12 -storepass ""

diff --git a/doc/scripts/selfsign.config b/doc/scripts/selfsign.config
index 4962f7241a7209adb9f6765d751ca40ee4c106dc..1b98363a30c5f2c644c81c8dffb0e6f918abe3cf 100644 (file)
--- a/doc/scripts/selfsign.config
+++ b/doc/scripts/selfsign.config
@@ -7,3 +7,29 @@ commonName = cn
 
 [ext]
 subjectAltName=
+
+[ca]
+default_ca=ca1
+
+[ca1]
+new_certs_dir=testca/newcerts
+database=testca/db
+serial=testca/serial
+default_md=sha256
+email_in_dn=salat
+policy=ca1_pol
+#default_days=365
+x509_extensions = v3_ca 
+
+
+
+[ v3_ca ]
+
+basicConstraints        = critical, CA:FALSE
+keyUsage                = critical, digitalSignature, keyEncipherment, keyAgreement
+extendedKeyUsage        = clientAuth, serverAuth, nsSGC, msSGC
+
+
+[ca1_pol]
+commonName              = optional
+subjectAltName          = optional