Improve SSL generation
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 25 Feb 2015 17:24:22 +0000 (17:24 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 25 Feb 2015 17:24:22 +0000 (17:24 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@7953 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

17 files changed:
demo/ssl/ca.crt [deleted file]
demo/ssl/ca.key [deleted file]
demo/ssl/demo@demo.crt [deleted file]
demo/ssl/demo@demo.csr [deleted file]
demo/ssl/demo@demo.key [deleted file]
demo/ssl/demo@demo.p12 [deleted file]
demo/ssl/openssl.cnf [new file with mode: 0644]
demo/ssl/root@demo.crt [deleted file]
demo/ssl/root@demo.csr [deleted file]
demo/ssl/root@demo.key [deleted file]
demo/ssl/root@demo.p12 [deleted file]
demo/ssl/server.ks [deleted file]
demo/ssl/server.ts [deleted file]
demo/ssl/ssl.sh [new file with mode: 0644]
demo/ssl/ssl.txt [deleted file]
demo/ssl/tomcat.crt [deleted file]
demo/ssl/tomcat.csr [deleted file]

diff --git a/demo/ssl/ca.crt b/demo/ssl/ca.crt
deleted file mode 100644 (file)
index 1aef418..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-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
-gZlju4Nu4PKD2RWyBihI4YF1AA==
------END CERTIFICATE-----
diff --git a/demo/ssl/ca.key b/demo/ssl/ca.key
deleted file mode 100644 (file)
index 2effee0..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,1E365E4A0FD2EC89
-
-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
------END RSA PRIVATE KEY-----
diff --git a/demo/ssl/demo@demo.crt b/demo/ssl/demo@demo.crt
deleted file mode 100644 (file)
index d9f0104..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFfzCCA2cCAQQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
-bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
-CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMzAwNFoXDTIzMDUyNjExMzAw
-NFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
-BAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5vcmcwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWReizNWl6J+WgV
-pqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382n7ri/eS4mijk
-kw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnUctnDx5Ymrzq/
-KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/ZHfKyOGq4NTl
-21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74SS36ScXpQixDS
-Z4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9dxjxunyj+HjT
-Dj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1UlQhccdnJCgM3o
-bYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVTwxzXMD8Uy7fo
-CRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82hUDEae9X4ao6m
-ti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY43qGEwd/oWtd
-I1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lqW+CAFjWz7c8J
-NtCr+RBVS6bYjwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAO6FbFXoYrM1OvUHdF
-mul7cP7jVys3dRNfIdTcKF9tYf5sWS7/2PbFeQ+bjLGxQJcZhQ8BvK2J00/+kExo
-JMEFqQ5BZRorwdnrQxJNJcHrvrQ6ZTaiBhuyktbWGblCAWkuhqw6NLYxhcE1Wq6s
-6w978F/qHCvqGSi1QkVX+9WjVx48K2JqBRKR04THWlgf+llOJsuMv4Rk75iH385L
-FNsQAXIquQHqgBDqKjcSAR0VAQSXV0gnMadaUrHv7H+QqsYo0zp19cX/WF0HNti6
-GHk+mCnDeZh6Z2z7xii+9fQGIMgQ8YhAJwzOhbk72y8WMqfHtFqcY1KnZq52c7wz
-3+kMx+XJ6t6YiJnWAWs4M/mk7RVPOvNqOAh8y+pnd6tZEzdRcvuDiv+U/HwNS6TS
-nEsUHK0rwWD3Sjfwe9LO9TMxdSZkWePlY2v5oAL4YxJnJGfbeBo/OynUkIa0fRXf
-FtKdAENfpijpuNiN3O92q8FwXpLjr38aTHy0o5n2Zrlly7ydGwRXJ8P7FdbGRXj5
-UPaN6b808kysE9zS6BA0XMslLPqQrFgqZFK2fnv/QW87jyXQkTAAgTVrHODJXVsr
-YLIpWTmykOxyNFGYiT9BCxHXTO7LvlGdK3OqRwbzTcD+CHKZsUxALg/q7FbSBS6i
-OZrgJYlxzdsI061+rLsaW02FOA==
------END CERTIFICATE-----
diff --git a/demo/ssl/demo@demo.csr b/demo/ssl/demo@demo.csr
deleted file mode 100644 (file)
index 4ace678..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEyjCCArICAQAwgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzAN
-BgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANS
-JkQxDTALBgNVBAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5v
-cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWR
-eizNWl6J+WgVpqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382
-n7ri/eS4mijkkw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnU
-ctnDx5Ymrzq/KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/
-ZHfKyOGq4NTl21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74S
-S36ScXpQixDSZ4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9
-dxjxunyj+HjTDj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1Ul
-QhccdnJCgM3obYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVT
-wxzXMD8Uy7foCRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82h
-UDEae9X4ao6mti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY
-43qGEwd/oWtdI1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lq
-W+CAFjWz7c8JNtCr+RBVS6bYjwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggIBAKYk
-c1LiB2iNqjJMPEjzJ0wpKizHoqv7Tt55Slz4Q9bTgTYmevt8SIpQCKK+ZtMxCPIy
-9tfqjsdYqBxahfXnhXUDQQOYEAKcffEZd/c3LX16kOupximycFOj0iqJDe5VZ/NJ
-7fRXlJqqkufoQQ3OqPYzS/G5mP61gadvReAkTh78StlWMNxwg6wYgQ3p4ZD1GKNI
-M7A1Z99HyJeRZcT+yx1wuyvX2MJY15Kg6m9xaM1N+q4BJ82+u76pNX+pTw6A12mB
-XhmIKqRh+KN7YGSVMtU4dBwHMlZD3CRiGUE9RFg/5aqJeXZgCVnLgzTzJUFQqRqZ
-OehYdizkI6TgTLl3xIJWHFqYc5GhY9NwghYn0BjiC/8xpOmj+soAG4hDkydejtf1
-8lFeTxW8Ga560zjvaUOqntQTLHiAnZai7lVFxE+o3/b284OYu5wWyAFh9j+eE7qP
-pnObCpeFanlsuTnQIXZD4KcojI33dmBXIVhCfe0cvtDEPLl2MYJNguO40tJwPCzL
-JBpdwqh+rBKQjX+pn56js3BgB4qrcQnWGEHWOb/Z+ooRkaIIliRLBTS5DbbnsQWp
-jyVKVhTVLNdp4L2oy94hGi9wJSCujXyBFXH4+e3HpYrZwGSJKrpnRPChm9XW520A
-EFgLzv2Oh0zXJiBJ+EtVwWfkDCImakD1u5QAHW7h
------END CERTIFICATE REQUEST-----
diff --git a/demo/ssl/demo@demo.key b/demo/ssl/demo@demo.key
deleted file mode 100644 (file)
index b1066d8..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,955EFD4E985DC326
-
-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
------END RSA PRIVATE KEY-----
diff --git a/demo/ssl/demo@demo.p12 b/demo/ssl/demo@demo.p12
deleted file mode 100644 (file)
index 9f60819..0000000
Binary files a/demo/ssl/demo@demo.p12 and /dev/null differ
diff --git a/demo/ssl/openssl.cnf b/demo/ssl/openssl.cnf
new file mode 100644 (file)
index 0000000..45cfea0
--- /dev/null
@@ -0,0 +1,115 @@
+dir            = ./CA          # Where everything is kept
+
+[ ca ]
+default_ca     = CA_default            # The default ca section
+
+[ CA_default ]
+certs          = $dir/certs            # Where the issued certs are kept
+crl_dir                = $dir/crl              # Where the issued crl are kept
+database       = $dir/index.txt        # database index file.
+new_certs_dir  = $dir/newcerts         # default place for new certs.
+certificate    = $dir/cacert.pem       # The CA certificate
+serial         = $dir/serial           # The current serial number
+crlnumber      = $dir/crlnumber        # the current crl number
+crl            = $dir/crl.pem          # The current CRL
+private_key    = $dir/private/cakey.pem # The private key
+x509_extensions        = usr_cert              # The extentions to add to the cert
+name_opt       = ca_default            # Subject Name options
+cert_opt       = ca_default            # Certificate field options
+crl_extensions = crl_ext
+default_days   = 3650                  # how long to certify for
+default_crl_days= 30                   # how long before next CRL
+default_md     = default               # use public key default MD
+preserve       = no                    # keep passed DN ordering
+policy         = policy_match
+
+[ policy_match ]
+countryName            = match
+stateOrProvinceName    = match
+organizationName       = match
+organizationalUnitName = optional
+commonName             = supplied
+emailAddress           = optional
+
+[ policy_anything ]
+countryName            = optional
+stateOrProvinceName    = optional
+localityName           = optional
+organizationName       = optional
+organizationalUnitName = optional
+commonName             = supplied
+emailAddress           = optional
+
+[ req ]
+default_bits           = 1024
+default_md             = sha1
+default_keyfile        = privkey.pem
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+x509_extensions        = v3_ca # The extensions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+string_mask = utf8only
+req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName                    = Country Name (2 letter code)
+countryName_min                        = 2
+countryName_max                        = 2
+stateOrProvinceName            = State or Province Name (full name)
+#localityName                  = Locality Name (eg, city)
+0.organizationName             = Organization Name (eg, company)
+organizationalUnitName         = Organizational Unit Name (eg, section)
+commonName                     = Common Name (eg, your name or your server\'s hostname)
+commonName_max                 = 64
+emailAddress                   = Email Address
+emailAddress_max               = 64
+# SET-ex3                      = SET extension number 3
+
+##
+## DEFAULT VALUES
+##
+countryName_default            = DE
+stateOrProvinceName_default    = Berlin
+#localityName_default  = Berlin
+0.organizationName_default     = Example
+organizationalUnitName_default = People
+
+[ req_attributes ]
+#challengePassword             = A challenge password
+#challengePassword_min         = 4
+#challengePassword_max         = 20
+#unstructuredName              = An optional company name
+
+[ usr_cert ]
+basicConstraints=CA:FALSE
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+subjectAltName=email:move
+issuerAltName=issuer:copy
+
+[ v3_req ]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer
+basicConstraints = critical,CA:true
+# keyUsage = cRLSign, keyCertSign
+
+subjectAltName=email:copy
+issuerAltName=issuer:copy
+
+[ crl_ext ]
+issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ server_ext ]
+extendedKeyUsage=serverAuth
+
+[ user_ext ]
+extendedKeyUsage=clientAuth,emailProtection
diff --git a/demo/ssl/root@demo.crt b/demo/ssl/root@demo.crt
deleted file mode 100644 (file)
index b79404b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFfzCCA2cCAQMwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
-bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
-CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjgyNVoXDTIzMDUyNjExMjgy
-NVowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
-BAMMBHJvb3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5vcmcwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDjfJpz+c2ompElZtBWC5HUJ6NevhMm
-I7VCAZjMEa8l64cCXlULOyKYbEZ2oQupg5iqHVbEK1d4UJ7b2EWTFc8bZT+cQODL
-7x3hPJ2856PNSg2Rcsna40Vy/1jieRE1gpLVZBi/myFuCBU5uQkhja+VikgIltfX
-uvYilMEkcEVSQniFJCB91xaNPWPJwuyy5JEMoRXprCjHmChaE+MGnWOXyU5+nSp7
-FuLAOZDXbNi+I8J01q2W+iWVlqvIKAa5ogq5TYayo9foVX6ftnNlkoG14gJUGn8C
-CNSAx8ZGNR16952H1UGQycDXM7T3T1MMYT8gB9qDK90ko1EgvITy2UPyWGhTxh9U
-dKkwpenVgn+hDER5ObTlDmSucCooVKZCAITimb4TjJm1pRfupaJlZfKboFmnmx2Y
-4JvZdbM7sTcCmFRv6P0UEJ3MSptzl/GBqSYFyTKmsVWq1NaRzytUKkTQP3TDpf9c
-vtJKu/CPUWKVtamf2d4U+34MLKIQ2zDRkUWDmEypjHitW9y4PlBYVtZ2ks1rdLCl
-ei7cDgwG6uwLZ9FSjHQgy0BF0lVHKnefrR+c1HZ8/vg12pDtmLvP9tL3rxWQ+fGj
-PluaIgPh/moMEKAWDHH+EeAlJ5mmutIU6HS8cL9G/doV7wfqx7TNGhbCbRIawF+x
-jBYCwiRDmNocGwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCm+WvHykMS7opbbfDu
-reOEt+2i/jyWuPPJB51HheyCQtV5MXyuCRflZpJJdI8iWb3DtayKCI18oK7SakcN
-hVGY+3GJyr5yYVsoeRbyFUgz4apBLb2CeEC7rHbbC39hYVc+FxIUbGiP70dm1TJW
-dZEWeyINScR/YVLitx99g6AVByRjaTDpSDr+Rbw0HWZiuJ2Sb7DqCdwaH5nJqLqN
-N8Vx4+vCCDyOD7kH7cqF3eJ6qepBIYPHib8IAqyLFDcd1OXLMQHv3rrYcQ0WM34P
-NkF7wTO1I8gzpcFyrtOBLOyx/wkoxWhqVcWzYXQrgLbgwp8Z/bJz9MyBnqX2NWq0
-qrGoRBqyLkT4W6acJ2SkgCqMLXhMXfne6wziG+nFiYexeKL+cLEB/CkarxRMEta7
-Hyb/zfWLrXATznjeeXanbgBC9f32Xo2IttLw7hPTAkOqulm7/k/U72/n21g9dLdR
-EtmfzYuDZEOH2QdBqPkrwuqY20t4qvqJITomE8GDFqguJFF5T0h0BS04oSA24J/m
-pwuaccHKuo2j7wapWhqQWZj+3CwYqZDKxIsmWCXAsreUj0GmZEKCgdOI3zzNpAI3
-F6puzfejkHze2rE9Obu71c4q0ibmo8MPx7ovoD9yIZPAvHK8HLiQaRNYP9xvv3FL
-g2zA6bTCQMYERNb1YTBv5xeuOQ==
------END CERTIFICATE-----
diff --git a/demo/ssl/root@demo.csr b/demo/ssl/root@demo.csr
deleted file mode 100644 (file)
index 34c6ced..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEyjCCArICAQAwgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzAN
-BgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANS
-JkQxDTALBgNVBAMMBHJvb3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5v
-cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDjfJpz+c2ompElZtBW
-C5HUJ6NevhMmI7VCAZjMEa8l64cCXlULOyKYbEZ2oQupg5iqHVbEK1d4UJ7b2EWT
-Fc8bZT+cQODL7x3hPJ2856PNSg2Rcsna40Vy/1jieRE1gpLVZBi/myFuCBU5uQkh
-ja+VikgIltfXuvYilMEkcEVSQniFJCB91xaNPWPJwuyy5JEMoRXprCjHmChaE+MG
-nWOXyU5+nSp7FuLAOZDXbNi+I8J01q2W+iWVlqvIKAa5ogq5TYayo9foVX6ftnNl
-koG14gJUGn8CCNSAx8ZGNR16952H1UGQycDXM7T3T1MMYT8gB9qDK90ko1EgvITy
-2UPyWGhTxh9UdKkwpenVgn+hDER5ObTlDmSucCooVKZCAITimb4TjJm1pRfupaJl
-ZfKboFmnmx2Y4JvZdbM7sTcCmFRv6P0UEJ3MSptzl/GBqSYFyTKmsVWq1NaRzytU
-KkTQP3TDpf9cvtJKu/CPUWKVtamf2d4U+34MLKIQ2zDRkUWDmEypjHitW9y4PlBY
-VtZ2ks1rdLClei7cDgwG6uwLZ9FSjHQgy0BF0lVHKnefrR+c1HZ8/vg12pDtmLvP
-9tL3rxWQ+fGjPluaIgPh/moMEKAWDHH+EeAlJ5mmutIU6HS8cL9G/doV7wfqx7TN
-GhbCbRIawF+xjBYCwiRDmNocGwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggIBALIn
-S0EvEuPFs6Ap7Pvi4ahwlzNFyRYryeAn2qkqwUyMqM2tHywxPd03jlnCTbMbSANj
-YPXIviamosY3LScyL4BrZTsayuvs0I5VKIZq612cPrpn0+hw3gK/tmiHqjEv/XhZ
-JzSAiJMQqurANhbdwEpBICnY5LjjoKcvdG+Pcto9JmXadmSfLpM25t5ldQ/azPjs
-IctBeXkHExRvT0UV5iCAxLu+kr0jxUFX9fTzewWli/TV50uCJtn7zKvQ/9WbdpZW
-mDKQSFLd2j9bDxhfmDD4A1f9/2qC/ymw9jZAdLgbs9Aan436fzZG0/pYEBxNrl5g
-LJZT+E5oXmLxlJLdPNAHSUccNzpajAaKvrwwksppE2Fqw7x0WNzNiXrsfI5xAORG
-0HIACy2K/+2wmS4Jz/FuA0llunWRhoOV9BpYlvrRL7b0IAbD0iirtakAJ/LOY1RV
-6skID/icIuP68TOy97P154Q58sXp2ic9UegjTAD04+M8+iysfA2p9/z2yWFHqEed
-tOKSe9ZfGhxaDZPmKMWTmQbReP72HLsPp/LRakN0EmxkAaRF3GscurVF90a9fbmm
-R1hKg+F8KOELcp9sgMNNhN/DA6Qwjsg6SOCf7B6nvEGBW0MSTdttZtmuQw686+gU
-2ZFgKlcmTP7epZ38lPhwiSOcObqxLwVrvbvfoxhR
------END CERTIFICATE REQUEST-----
diff --git a/demo/ssl/root@demo.key b/demo/ssl/root@demo.key
deleted file mode 100644 (file)
index 65923d7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,4A5FB12597A1CBF1
-
-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
------END RSA PRIVATE KEY-----
diff --git a/demo/ssl/root@demo.p12 b/demo/ssl/root@demo.p12
deleted file mode 100644 (file)
index d9a8603..0000000
Binary files a/demo/ssl/root@demo.p12 and /dev/null differ
diff --git a/demo/ssl/server.ks b/demo/ssl/server.ks
deleted file mode 100644 (file)
index a28ade3..0000000
Binary files a/demo/ssl/server.ks and /dev/null differ
diff --git a/demo/ssl/server.ts b/demo/ssl/server.ts
deleted file mode 100644 (file)
index 25f7936..0000000
Binary files a/demo/ssl/server.ts and /dev/null differ
diff --git a/demo/ssl/ssl.sh b/demo/ssl/ssl.sh
new file mode 100644 (file)
index 0000000..95bb232
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+export OPENSSL_CONF=./openssl.cnf
+export CATOP=./CA
+
+/etc/pki/tls/misc/CA -newca
+
+openssl req -x509 -new -newkey rsa:1024 -extensions server_ext -days 3650 \
+ -subj /C=DE/ST=Berlin/O=Example/OU=Systems/CN=localhost/ \
+ -keyout server.key -passout pass:demo -out server.crt
+openssl pkcs12 -export -passin pass:demo -passout pass:changeit \
+ -name "jetty" -inkey server.key -in server.crt \
+ -out server.p12
+ # Convert PKCS12 keystore into a JKS keystore
+keytool -importkeystore \
+ -srckeystore server.p12 -srcstoretype pkcs12 -srcstorepass changeit \
+ -alias jetty  -destkeystore server.jks -deststorepass changeit
+
+# Import People CA
+keytool -importcert -keystore server.jks -storepass changeit \
+ -alias CA -file CA/cacert.pem
+
+openssl req -new -newkey rsa:1024 -extensions server_ext -days 3650 \
+ -subj /C=DE/ST=Berlin/O=Example/OU=People/CN=root/ \
+ -keyout root.key -passout pass:demo -out root.csr
+openssl ca -batch -passin pass:demo -in root.csr -out root.crt
+openssl pkcs12 -export -passin pass:demo -passout pass:demo \
+ -name "root" -inkey root.key -in root.crt \
+ -out root.p12
+
+# Clean
+rm -vf new*.pem
+rm -vf root.csr root.key root.crt
+rm -vf server.p12 server.crt server.key
diff --git a/demo/ssl/ssl.txt b/demo/ssl/ssl.txt
deleted file mode 100644 (file)
index 788ab49..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Password for all users and teh CA is 'demo'
-# Password for all key- and truststores is 'changeit'
-
-# Clean
-# rm server.*
-
-# Create CA
-openssl genrsa -des3 -out ca.key 4096
-openssl req -new -x509 -days 3650 -key ca.key -out ca.crt
-
-# Create Keystore and Truststore and add CA to them
-keytool -import -keystore server.ts -file ca.crt -alias ArgeoDemoCA
-keytool -import -keystore server.ks -file ca.crt -alias ArgeoDemoCA
-
-# Tomcat Server
-# (we must use keytool)
-keytool -genkey -alias tomcat -keyalg RSA -keysize 4096 -keystore server.ks
-keytool -certreq -alias tomcat -keystore server.ks -file tomcat.csr
-openssl x509 -req -set_serial 02 -days 3650 -in tomcat.csr -CA ca.crt -CAkey ca.key -out tomcat.crt
-keytool -importcert -alias tomcat -keystore server.ks -file tomcat.crt
-
-# Root User
-openssl genrsa -des3 -out root@demo.key 4096 
-openssl req -new -key root@demo.key -out root@demo.csr
-openssl x509 -req -set_serial 03 -days 3650 -in root@demo.csr -CA ca.crt -CAkey ca.key -out root@demo.crt
-openssl pkcs12 -export -out root@demo.p12 -inkey root@demo.key -in root@demo.crt -certfile ca.crt
-
-# Demo User
-openssl genrsa -des3 -out demo@demo.key 4096 
-openssl req -new -key demo@demo.key -out demo@demo.csr
-openssl x509 -req -set_serial 04 -days 3650 -in demo@demo.csr -CA ca.crt -CAkey ca.key -out demo@demo.crt
-openssl pkcs12 -export -out demo@demo.p12 -inkey demo@demo.key -in demo@demo.crt -certfile ca.crt
diff --git a/demo/ssl/tomcat.crt b/demo/ssl/tomcat.crt
deleted file mode 100644 (file)
index 0ce674b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYjCCA0oCAQIwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
-bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
-CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjYwM1oXDTIzMDUyNjExMjYw
-M1owaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
-bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UE
-AxMJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1
-BD4zndTvh5i+ZI+/PJWNhRQYVh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtA
-JLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL4MNSZNysCPFTOnaPmkHTqnfrNDq2
-yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQSeQlRLm7i2H8FfXK
-zJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsCjRX7
-XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+
-wG116OXX+yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrF
-f/4XX55Hx2uw7mzkmpyyUVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+a
-o4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8
-TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdcBw1upi+cvPuvNTgu1CUz
-uNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5SckuqD7vIz
-mFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAgEAQQJm0wDgnsU4caIYt6LGIvPZtuIUfeCy3ZkM0LJsv3JYj8ppb4ULVknM
-8LNPk3W3BAbnuIZR5E9dkByfu2PF/fNpqJRLpCR5zSN3oQsQjHrf9XAr5VeZ0E/w
-YR/udjTJoXQVm2YhtOhDGJ52TW1TZtNGXrn5kmnkWgqm6WSXIZSQ1viW6a6nklZC
-8Tt0o0l+KiiMapgvC9eNonx3CpM+EzSAASmqUz+uPUG0SIQQfuP0Fs5oYaI/I2F3
-j5WxLBdqjTaatwkrhBV22ZoXigWpTNTHcpc469djr23ie+iHlIO/YkL41DDOI5r9
-EsIKxQBKzO9addeys5gReAiEMhDTYGwflliWhdFMAM1mLB4YJjN1iSJEkWkDGg4G
-N+i/Ydx5fgExAws6tE2nUxTBt/F/6Qe+oWCURLE2YDID+t5z7/JQEFJgnboLsUoe
-epKbITPtzNCnnWRwsqsanlx/RbgtI6Flb6/CWGmzlg1y6XhQDO0D6/4amvjeeqVV
-a3vSVpL06K7/PxDFK8vnJmVcC8SqN5RBwsngMnMpPOjD6TNdXo6R45m7UMjQiFO+
-XLi7SSvngmNsaVOlX3adb77ql6DS4dNLZ0UNi6/fr3ADkdkk6yewNJBgVpFoyNPn
-yZdafIUvaRcrH6QXhRyrDLRhF6j9AJNIqUwDBQ1IhexYz/23r6o=
------END CERTIFICATE-----
diff --git a/demo/ssl/tomcat.csr b/demo/ssl/tomcat.csr
deleted file mode 100644 (file)
index df66bea..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIErTCCApUCAQAwaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
-bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UEAxMJbG9jYWxo
-b3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1BD4zndTvh5i+ZI+/PJWNhRQY
-Vh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtAJLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL
-4MNSZNysCPFTOnaPmkHTqnfrNDq2yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQ
-SeQlRLm7i2H8FfXKzJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsC
-jRX7XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+wG116OXX
-+yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrFf/4XX55Hx2uw7mzkmpyy
-UVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+ao4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3
-Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdc
-Bw1upi+cvPuvNTgu1CUzuNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5Sc
-kuqD7vIzmFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAAaAAMA0GCSqGSIb3DQEBBQUA
-A4ICAQCORSPE6s/ogDnCwX4KDkk8srvdkuERiC3Hb6vTP0bVkLRwHdj77xGNwkXI7UasE52ykOze
-khMuk94onH8yyeDg57EXO4267AsqowV6Od94AGKTndx4Zosx2N+JOGGA0ZwCHvmoX1Wwe1KJ6QoI
-uMdpO+i9uo4ZYth76VV+Yn3mtyJAH0sdHeFkgevKLDURtC+m70XF77NKl+L7VuoNKxXaVCab3d/x
-aksTJpwLGt8QECR1Wq5FPNG/EQiFqQCd3WyzgsebGLDHYQgPEKkKKhMU3G/kIofutz/hNvxp8MRK
-EEEnyfZWiSpYxxmEPmelyinOkoOH5tqbkHzcPawSPFWDBR4pWAg9efdl7zdVAxzNkS5PqWtXrWvm
-jfMAPkTJoeQ6YWZZjHxpYrbBZfIgCr9VehGdzvhDVGbe8NeTDzwk/AItr5shIbFZpA0vIHB4+wEA
-QVl7d1ZM/0qEKGLeHG8TvF4TUIBE1C6RVpnP5jMB9pLQ4FEbgHaadGxQfGxh18GfyxlWmQy8RgDW
-BDJRPClofXm57665hD+py7Jw5F4ZgD5IKwU96kDe7mZRLkF66ZinoubZeyXZBX4N0p7lrWzd/mJj
-r3Yf69L/Ptct7Cr3c4z7Y1xqrBb88bKhVRCfJVtlvE9mSvMh6UUY1QlAGQaDmSQEB+eCO+8diaTa
-gEOeNw==
------END NEW CERTIFICATE REQUEST-----