Author: markt Date: Fri Feb 15 22:36:07 2019 New Revision: 1853673 URL: http://svn.apache.org/viewvc?rev=1853673&view=rev Log: Add a dual EC and RSA cert test
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.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=1853673&r1=1853672&r2=1853673&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 22:36:07 2019 @@ -37,6 +37,7 @@ import org.apache.catalina.startup.Teste import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; +import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type; /* * Tests compatibility of JSSE and OpenSSL settings. @@ -87,6 +88,19 @@ public class TestSSLHostConfigCompat ext doTest(); } + + @Test + public void testHostRSAandECPEM() throws Exception { + SSLHostConfigCertificate sslHostConfigCertificateRsa = new SSLHostConfigCertificate(sslHostConfig, Type.RSA); + sslHostConfigCertificateRsa.setCertificateFile(getPath(TesterSupport.LOCALHOST_RSA_CERT_PEM)); + sslHostConfigCertificateRsa.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_RSA_KEY_PEM)); + SSLHostConfigCertificate sslHostConfigCertificateEc = new SSLHostConfigCertificate(sslHostConfig, Type.EC); + sslHostConfigCertificateEc.setCertificateFile(getPath(TesterSupport.LOCALHOST_EC_CERT_PEM)); + sslHostConfigCertificateEc.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_EC_KEY_PEM)); + sslHostConfig.addCertificate(sslHostConfigCertificateEc); + doTest(); + } + @Test @Ignore // Currently the APR/native connector cannot be configured using a Keystore --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org