Author: markt
Date: Fri Feb 15 19:52:10 2019
New Revision: 1853662
URL: http://svn.apache.org/viewvc?rev=1853662&view=rev
Log:
Add a test EC cert and confirm that all connector combinations work with it
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-rsa-cert.pem
- copied unchanged from r1853661,
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-rsa-key.pem
- copied unchanged from r1853661,
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
Removed:
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java?rev=1853662&r1=1853661&r2=1853662&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
Fri Feb 15 19:52:10 2019
@@ -72,9 +72,17 @@ public class TestSSLHostConfigCompat ext
private SSLHostConfig sslHostConfig = new SSLHostConfig();
@Test
- public void testHostPEM() throws Exception {
-
sslHostConfig.setCertificateFile(getPath(TesterSupport.LOCALHOST_CERT_PEM));
-
sslHostConfig.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_KEY_PEM));
+ public void testHostECPEM() throws Exception {
+
sslHostConfig.setCertificateFile(getPath(TesterSupport.LOCALHOST_EC_CERT_PEM));
+
sslHostConfig.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_EC_KEY_PEM));
+ doTest();
+ }
+
+
+ @Test
+ public void testHostRSAPEM() throws Exception {
+
sslHostConfig.setCertificateFile(getPath(TesterSupport.LOCALHOST_RSA_CERT_PEM));
+
sslHostConfig.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_RSA_KEY_PEM));
doTest();
}
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1853662&r1=1853661&r2=1853662&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Fri Feb 15
19:52:10 2019
@@ -70,8 +70,10 @@ public final class TesterSupport {
public static final String JKS_PASS = "changeit";
public static final String JKS_KEY_PASS = "tomcatpass";
public static final String CA_CERT_PEM = SSL_DIR + CA_ALIAS + "-cert.pem";
- public static final String LOCALHOST_CERT_PEM = SSL_DIR +
"localhost-cert.pem";
- public static final String LOCALHOST_KEY_PEM = SSL_DIR +
"localhost-key.pem";
+ public static final String LOCALHOST_EC_CERT_PEM = SSL_DIR +
"localhost-ec-cert.pem";
+ public static final String LOCALHOST_EC_KEY_PEM = SSL_DIR +
"localhost-ec-key.pem";
+ public static final String LOCALHOST_RSA_CERT_PEM = SSL_DIR +
"localhost-rsa-cert.pem";
+ public static final String LOCALHOST_RSA_KEY_PEM = SSL_DIR +
"localhost-rsa-key.pem";
public static final boolean OPENSSL_AVAILABLE;
public static final int OPENSSL_VERSION;
public static final String OPENSSL_ERROR;
@@ -141,11 +143,11 @@ public final class TesterSupport {
}
} else {
File keystoreFile = new File(
- LOCALHOST_CERT_PEM);
+ LOCALHOST_RSA_CERT_PEM);
tomcat.getConnector().setAttribute("SSLCertificateFile",
keystoreFile.getAbsolutePath());
keystoreFile = new File(
- LOCALHOST_KEY_PEM);
+ LOCALHOST_RSA_KEY_PEM);
tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
keystoreFile.getAbsolutePath());
keystoreFile = new File(
Added: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem?rev=1853662&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem Fri Feb
15 19:52:10 2019
@@ -0,0 +1,86 @@
+Certificate:
+ Data:
+ Version: 3 (0x2)
+ Serial Number: 4098 (0x1002)
+ Signature Algorithm: sha256WithRSAEncryption
+ Issuer: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation,
OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
+ Validity
+ Not Before: Feb 15 19:32:18 2019 GMT
+ Not After : Feb 14 19:32:18 2021 GMT
+ Subject: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation,
OU=Apache Tomcat PMC, CN=localhost
+ Subject Public Key Info:
+ Public Key Algorithm: id-ecPublicKey
+ Public-Key: (256 bit)
+ pub:
+ 04:10:cc:24:b7:0c:2a:fe:a6:af:ea:b2:dc:26:f1:
+ 81:06:ae:0b:eb:f0:c0:5f:a3:ee:5a:e3:d3:7c:02:
+ b0:58:6c:47:0e:6e:08:ac:30:e1:76:e5:9c:06:80:
+ af:42:ce:a7:6f:49:b5:ec:95:08:b1:a9:e3:7a:f7:
+ 84:4f:e2:05:60
+ ASN1 OID: prime256v1
+ NIST CURVE: P-256
+ X509v3 extensions:
+ X509v3 Basic Constraints:
+ CA:FALSE
+ Netscape Comment:
+ OpenSSL Generated Certificate
+ X509v3 Subject Key Identifier:
+ F8:98:B3:3A:75:F3:09:EB:FF:CC:6E:26:39:F0:B5:FF:1F:0F:FB:01
+ X509v3 Authority Key Identifier:
+
keyid:00:F2:98:4D:21:2C:00:3C:40:9B:84:F4:DE:2A:F0:26:EE:32:0E:9F
+
+ Signature Algorithm: sha256WithRSAEncryption
+ 66:3f:a4:8e:4b:e0:3c:a2:54:d3:8d:6a:6d:83:fe:02:13:a8:
+ 79:41:55:68:33:7a:13:84:2f:92:db:aa:06:ab:4c:69:a7:fe:
+ 47:2f:31:a0:16:e8:cb:df:a8:d7:b3:21:27:2b:51:e2:77:05:
+ 65:40:17:40:ff:9c:b8:3c:9f:c7:bf:65:8e:00:6f:ce:01:6d:
+ 30:37:84:96:bd:78:11:26:be:27:22:53:67:c8:ac:cb:04:cb:
+ e2:96:a3:9e:a3:16:af:bf:97:be:c6:3d:0a:0f:1d:e9:45:0b:
+ ea:77:47:a7:d5:79:b2:5a:bc:83:4c:8c:2a:ca:b7:4c:0c:d4:
+ 17:d5:24:b1:b1:5b:2c:6e:59:5d:30:40:b5:72:6f:3a:b1:f4:
+ f9:0d:7e:b9:aa:99:26:19:21:b0:07:4d:49:c3:e7:c2:3d:c8:
+ 98:62:cd:b6:d5:9a:21:f8:c7:b0:1a:72:59:02:80:0f:83:af:
+ d7:3b:8a:7e:53:38:8c:0d:e9:03:9d:c8:f9:1d:5c:82:7f:49:
+ 8d:87:d3:89:69:a1:39:d3:fd:04:17:e5:63:af:55:02:ef:60:
+ d7:70:1d:60:6c:aa:53:43:13:f1:82:f6:b6:41:71:7b:38:ff:
+ 82:78:73:73:11:e7:48:2f:f8:e8:77:27:7a:0f:a3:14:b0:33:
+ f9:aa:65:0c:8f:69:3b:2f:ee:b3:51:d6:5d:8a:67:80:47:1e:
+ a3:bd:d2:03:c3:62:45:1a:ac:dd:79:2e:84:a7:3d:8a:27:89:
+ c4:31:cc:1c:0b:37:a6:9d:a4:e4:65:03:8b:a3:5a:63:60:fb:
+ b9:7b:44:7f:8d:6a:74:9f:52:0e:b8:e7:12:52:98:5f:e9:34:
+ 20:5a:f6:b7:15:a1:81:5e:f4:18:6c:18:c7:e8:dc:64:f8:d1:
+ a2:6f:98:a6:fd:36:e8:be:e7:a8:3f:a5:cb:de:1f:8f:ef:4a:
+ 29:ee:69:f3:81:cd:ce:ec:5f:d7:b8:61:c1:41:4b:b0:49:5c:
+ 29:eb:dd:e8:a6:54:4c:61:72:af:9c:50:da:16:1d:da:14:c9:
+ 5f:8a:ae:2a:41:3b:9d:1e:72:7d:c8:eb:28:f2:a5:49:9b:ca:
+ 0c:38:88:09:b3:5f:a9:83:13:6a:93:03:f9:3c:92:22:b8:cb:
+ ad:ba:dc:9b:6d:a6:9e:b0:d5:5a:57:ea:ae:f7:e9:8f:03:c2:
+ 24:80:f8:50:21:94:7c:58:ac:b0:86:58:13:f2:d4:ef:f3:c1:
+ 53:96:88:f9:dd:19:a7:83:fe:a9:d1:0a:1c:d0:10:23:6e:24:
+ 47:41:3b:d4:dd:a1:06:2d:8a:ba:51:ef:34:e7:81:f0:94:51:
+ 28:3a:44:8e:de:25:fa:e3
+-----BEGIN CERTIFICATE-----
+MIIESDCCAjCgAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNQTESMBAGA1UEBxMJV2FrZWZpZWxkMScwJQYDVQQKEx5UaGUg
+QXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xGjAYBgNVBAsTEUFwYWNoZSBUb21j
+YXQgUE1DMR4wHAYDVQQDExVBcGFjaGUgVG9tY2F0IFRlc3QgQ0EwHhcNMTkwMjE1
+MTkzMjE4WhcNMjEwMjE0MTkzMjE4WjCBhzELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
+Ak1BMRIwEAYDVQQHDAlXYWtlZmllbGQxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29m
+dHdhcmUgRm91bmRhdGlvbjEaMBgGA1UECwwRQXBhY2hlIFRvbWNhdCBQTUMxEjAQ
+BgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBDMJLcM
+Kv6mr+qy3CbxgQauC+vwwF+j7lrj03wCsFhsRw5uCKww4XblnAaAr0LOp29JteyV
+CLGp43r3hE/iBWCjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT4mLM6dfMJ6//MbiY5
+8LX/Hw/7ATAfBgNVHSMEGDAWgBQA8phNISwAPECbhPTeKvAm7jIOnzANBgkqhkiG
+9w0BAQsFAAOCAgEAZj+kjkvgPKJU041qbYP+AhOoeUFVaDN6E4QvktuqBqtMaaf+
+Ry8xoBboy9+o17MhJytR4ncFZUAXQP+cuDyfx79ljgBvzgFtMDeElr14ESa+JyJT
+Z8isywTL4pajnqMWr7+XvsY9Cg8d6UUL6ndHp9V5slq8g0yMKsq3TAzUF9UksbFb
+LG5ZXTBAtXJvOrH0+Q1+uaqZJhkhsAdNScPnwj3ImGLNttWaIfjHsBpyWQKAD4Ov
+1zuKflM4jA3pA53I+R1cgn9JjYfTiWmhOdP9BBflY69VAu9g13AdYGyqU0MT8YL2
+tkFxezj/gnhzcxHnSC/46Hcneg+jFLAz+aplDI9pOy/us1HWXYpngEceo73SA8Ni
+RRqs3XkuhKc9iieJxDHMHAs3pp2k5GUDi6NaY2D7uXtEf41qdJ9SDrjnElKYX+k0
+IFr2txWhgV70GGwYx+jcZPjRom+Ypv026L7nqD+ly94fj+9KKe5p84HNzuxf17hh
+wUFLsElcKevd6KZUTGFyr5xQ2hYd2hTJX4quKkE7nR5yfcjrKPKlSZvKDDiICbNf
+qYMTapMD+TySIrjLrbrcm22mnrDVWlfqrvfpjwPCJID4UCGUfFissIZYE/LU7/PB
+U5aI+d0Zp4P+qdEKHNAQI24kR0E71N2hBi2KulHvNOeB8JRRKDpEjt4l+uM=
+-----END CERTIFICATE-----
Added: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem?rev=1853662&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem Fri Feb
15 19:52:10 2019
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINFO2UaXkxM1Q1wgj6CsIFpzdLX+wjGhPXSZiyD6TYJwoAoGCCqGSM49
+AwEHoUQDQgAEEMwktwwq/qav6rLcJvGBBq4L6/DAX6PuWuPTfAKwWGxHDm4IrDDh
+duWcBoCvQs6nb0m17JUIsanjeveET+IFYA==
+-----END EC PRIVATE KEY-----
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
