Author: jfclere
Date: Thu May 20 13:14:20 2010
New Revision: 946620
URL: http://svn.apache.org/viewvc?rev=946620&view=rev
Log:
Add the certificate and key for the APR tests.
Added:
tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem
tomcat/trunk/test/org/apache/catalina/startup/test-key.pem
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=946620&r1=946619&r2=946620&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Thu May 20
13:14:20 2010
@@ -63,18 +63,28 @@ public class TestTomcatSSL extends Tomca
connector.setPort(getPort());
tomcat.getService().addConnector(connector);
tomcat.setConnector(connector);
- tomcat.getConnector().setSecure(true);
+ tomcat.getConnector().setProperty("sslProtocol", "tls");
+ }
+ String protocol = tomcat.getConnector().getProtocolHandlerClassName();
+ if (protocol.indexOf("Apr") == -1) {
+ tomcat.getConnector().setProperty("sslProtocol", "tls");
+ File keystoreFile = new File(
+ "test/org/apache/catalina/startup/test.keystore");
+ tomcat.getConnector().setAttribute("keystoreFile",
+ keystoreFile.getAbsolutePath());
} else {
- tomcat.getConnector().setSecure(true);
+ File keystoreFile = new File(
+ "test/org/apache/catalina/startup/test-cert.pem");
+ tomcat.getConnector().setAttribute("SSLCertificateFile",
+ keystoreFile.getAbsolutePath());
+ keystoreFile = new File(
+ "test/org/apache/catalina/startup/test-key.pem");
+ tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
+ keystoreFile.getAbsolutePath());
}
+ tomcat.getConnector().setSecure(true);
tomcat.getConnector().setProperty("SSLEnabled", "true");
- tomcat.getConnector().setProperty("sslProtocol",
- "tls");
- File keystoreFile = new File(
- "test/org/apache/catalina/startup/test.keystore");
- tomcat.getConnector().setAttribute("keystoreFile",
- keystoreFile.getAbsolutePath());
}
public void testSimpleSsl() throws Exception {
Added: tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem?rev=946620&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem (added)
+++ tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem Thu May 20
13:14:20 2010
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICUzCCAbygAwIBAgIESviASzANBgkqhkiG9w0BAQUFADBuMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD
+VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2NhbGhv
+c3QwHhcNMDkxMTA5MjA0OTE1WhcNMTAwMjA3MjA0OTE1WjBuMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD
+VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRIwEAYDVQQDEwlsb2NhbGhv
+c3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALGOFqjC4Fefz0oOcfJeS8eL
+V8jYzA3sHUnTKmASfgfhG8prWUgSEq7O/849MrBysiKpIvTN8R+ykV4QCAxauGUR
+DsNI2ZtAv23YX2MbcfYfYqD0tgHEn355HKey0ICgmRuq3norlUWAH3hRv5qiQMc0
+UIhNrmdTs0jyvQ8E8AlZAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAPHUr1BDENlV2
+8yIQvJOWKYbcNWLd6Cp8xCltSI897xhPpKQ5tDvs+l0gVfdBv5+jou0F5gbCkqgc
+lBuUnUUWsU7r4HYBLVB8FiGSy9v5yuFJWyMMLJkWAfBgzxV1nHsCPhOnrspSB+i6
+bwag0i3ENXstD/Fg1lN/7l9dRpurneI=
+-----END CERTIFICATE-----
Added: tomcat/trunk/test/org/apache/catalina/startup/test-key.pem
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/test-key.pem?rev=946620&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/test-key.pem (added)
+++ tomcat/trunk/test/org/apache/catalina/startup/test-key.pem Thu May 20
13:14:20 2010
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALGOFqjC4Fefz0oO
+cfJeS8eLV8jYzA3sHUnTKmASfgfhG8prWUgSEq7O/849MrBysiKpIvTN8R+ykV4Q
+CAxauGURDsNI2ZtAv23YX2MbcfYfYqD0tgHEn355HKey0ICgmRuq3norlUWAH3hR
+v5qiQMc0UIhNrmdTs0jyvQ8E8AlZAgMBAAECgYBybr8P2Tk5gBfbBOBPcpKocpgL
+LB6nQmvF7sC61nA/p8d/eBw8pNlBrMuVIkAPFHzWdee/mxMyeKXT18U4ISgBdIKL
+F9LwILhIgR8CwElLucmF2OdXqFe7baBIFI6OaqLvDgOwdHSIS6uZhAWOWIAZ38Dh
+JbHMzPpfeBv1bAIhAQJBAPwhjzWqSWZjAfcED4htKa/ZSbdqMa1iYtveoHdXIcLu
+j4Ck1DKQEFpzLnUe2gwul/TDcoW3ZVp85jn7jwnrNDECQQC0R5LgkGdGNMBih4kP
+U87tHFHUnggSMyIOBnCEXuQEN6i68VOwbdm2F7Rg1XGHD8IIJmVeiTSgLtS/mJRh
+t6WpAkEAqs9VhQbTaTDkEOPIXiWOW1q6rS6dbxg7XzdowNDfx3706zM/qu2clpp3
+u9Ll5+DdA24xtNM1L+Nz2Y5KLm8Q0QJAQqpxEx/zQNADEKyEL6nTTHV7gT+LRoeo
+IT2aYCji8vhOKgtR4l1M8/xiFKj5mXNnUjI4rDPaxR1sSQm4XUZXOQJBAJaCD0Ah
+acU+KaOtk65tBJ7N2dKTbc5gs/CAz1uGgJtoD/jPjELMQwrxdp6AZP6+L6osqy6z
+DI3WzNHXS+wWAd0=
+-----END PRIVATE KEY-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
