summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-06-19 16:06:27 +0200
committerJose <jose@zeroc.com>2015-06-19 16:06:27 +0200
commita136b88bd892e01b2d6691ffbd93c47664bed291 (patch)
treeee394b01cb1f284bc264695b0b07c4d644ce6e46
parentAdded entry for Glacier::SessionFactoryHelper::destroy addition (diff)
downloadice-a136b88bd892e01b2d6691ffbd93c47664bed291.tar.bz2
ice-a136b88bd892e01b2d6691ffbd93c47664bed291.tar.xz
ice-a136b88bd892e01b2d6691ffbd93c47664bed291.zip
Put back server.pem
-rwxr-xr-xcerts/makecerts.py4
-rw-r--r--certs/server.pem27
2 files changed, 30 insertions, 1 deletions
diff --git a/certs/makecerts.py b/certs/makecerts.py
index d16ef8e80fe..342e36ba24c 100755
--- a/certs/makecerts.py
+++ b/certs/makecerts.py
@@ -99,8 +99,10 @@ client.save("client.p12").save("client.jks", caalias="cacert")
#
# Server certificate
#
+# NOTE: server.pem is used by scripts/TestController.py
+#
server = factory.create("server", cn = (dns if usedns else ip), ip=ip, dns=dns)
-server.save("server.p12").save("server.jks", caalias="cacert")
+server.save("server.p12").save("server.jks", caalias="cacert").save("server.pem")
try:
server.save("server.bks", caalias="cacert")
diff --git a/certs/server.pem b/certs/server.pem
new file mode 100644
index 00000000000..fd7d8d5179f
--- /dev/null
+++ b/certs/server.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIJAOlGWrMa0JBJMA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
+VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
+IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
+BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xNTA1MTIx
+MDIwMTRaFw0yMDA1MTAxMDIwMTRaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjExDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ0KFgNmVlEHCiLEQMrv++pifDbZO6xSWyZX3VpSBkFIIQ3hrFaSrlKXNRadAo9P
+OmprXJDadTFlfVgWIppEYQbg86z/s1EnXP0XOJeYjpiEnUdo6zcW2wFgbVpGsiw5
+T/aewxrzMe5NazOSmAzE24NtM5JFd3re2XXkKzuGjimKh0ESVrBPqvWUi63wvA3Z
+76dEe0AwtxxSxL1LB/gj8QCtDQsgn3VX2I8ynz/TrGGPAzCrWWC+TtR4PwjOK30P
+kRfpMYpFhoP+f/E3RgGBfUL+FjAD1tZT2M5ziBy6n0RPIEcrciCAoj2AsOvkxvVk
+9ksaXyhceOX5iSQ312881NMCAwEAAaOCAQ4wggEKMB0GA1UdDgQWBBT2+MKPoVoo
+whiGu4jLg//xWXgMMTCBvwYDVR0jBIG3MIG0gBQXkollAHEk+ZB/A0fFIDsDNT5/
+pqGBkaSBjjCBizEVMBMGA1UEAwwMSWNlIFRlc3RzIENBMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb22CCDA5XXsWNHo1MAsGA1UdDwQEAwIF4DAaBgNVHREEEzARhwR/AAABggkx
+MjcuMC4wLjEwDQYJKoZIhvcNAQELBQADggEBAGXKvOOOIr63Y9BsrmaqkmO9MfBi
+IRikSBTRgMvhJL0qULoVnN35gs2dAiZZ7RS1c6xRZ99bOhOsLDi0e9Vsq4s835le
+DgjQsDUcK+KjrQSckJUsqwIf7XIfqqsRI4G+yUY8BGaqoeuqJvtntCk1CX9R3pVx
+4tmb0rDLnlmdrBpZgtdHRT/4skLcrFSr79ZIZHmR9d8OZKvXDWSYm4LWJD7NPFRp
+SaSQB+Mj04xx7/+5Jk9fNgWHMsFCNIzgLnxqiyHz9D00lYjbt7yjdFx/7GcU0AUJ
+slngygvcg2NttEoDx71bgq5Mpl0IvESkB4RR6MVEjdNvskLXz+PARrtRRGc=
+-----END CERTIFICATE-----