Update keys scripts

-nodes doesnt exist for "genrsa"
import own certificate in truststore

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644 (file)
index 0000000..bd4647f
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,3 @@
+jetty.crt
+jetty.csr
+jetty.key

diff --git a/doc/generateKeys.sh b/doc/generateKeys.sh
index 5ab404285b15abd5ea18abe6c4812ae416627f24..e0cdff9fb44b5f1aaa952bed05a3f3af477cd42c 100755 (executable)
--- a/doc/generateKeys.sh
+++ b/doc/generateKeys.sh
@@ -1,6 +1,6 @@
 # this script generates a simple self-signed keypair
 
-openssl genrsa -nodes -out jetty.key 4096
+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

diff --git a/doc/generateTruststore.sh b/doc/generateTruststore.sh
index 8092e9244b33f5893a77a6a44f8bc8aa75b9e4dc..aa8532d5d9d3f22c04abd89d68e948415ec043f9 100644 (file)
--- a/doc/generateTruststore.sh
+++ b/doc/generateTruststore.sh
@@ -1,11 +1,10 @@
 # this script generates a simple self-signed keypair
 
-wget http://www.cacert.org/certs/root.crt
-wget http://www.cacert.org/certs/class3.crt
+wget -N http://www.cacert.org/certs/root.crt
+wget -N http://www.cacert.org/certs/class3.crt
 
 keytool -importcert -keystore ../config/cacerts.jks -file root.crt -alias root -storepass "changeit"
 keytool -importcert -keystore ../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit"
-rm root.crt
-rm class3.crt
+keytool -importcert -keystore ../config/cacerts.jks -file jetty.crt -alias own -storepass "changeit"
 
 keytool -list -keystore ../config/cacerts.jks -storepass "changeit"