Author: rjung Date: Mon Sep 4 15:15:26 2017 New Revision: 1807242 URL: http://svn.apache.org/viewvc?rev=1807242&view=rev Log: Remove obsolete try/catch for UnsatisfiedLinkError now that we require tcnative 1.2.14.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1807242&r1=1807241&r2=1807242&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties Mon Sep 4 15:15:26 2017 @@ -18,7 +18,6 @@ openssl.errorSSLCtxInit=Error initializi openssl.doubleInit=SSL context already initialized, ignoring openssl.certificateVerificationFailed=Certificate verification failed openssl.keyManagerMissing=No key manager found -openssl.incompleteClientCASupport=Incomplete support for client CAs, please update your tcnative version openssl.trustManagerMissing=No trust manager found openssl.addedClientCaCert=Added client CA cert: [{0}] openssl.makeConf=Creating OpenSSLConf context Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1807242&r1=1807241&r2=1807242&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java Mon Sep 4 15:15:26 2017 @@ -350,15 +350,9 @@ public class OpenSSLContext implements o // by the server during the handshake to allow the client choosing // an acceptable certificate for (X509Certificate caCert : manager.getAcceptedIssuers()) { - // try/catch can be removed once tcnative 1.2.13 was released - // and the required version was updated to it. - try { - SSLContext.addClientCACertificateRaw(ctx, caCert.getEncoded()); - if (log.isDebugEnabled()) - log.debug(sm.getString("openssl.addedClientCaCert", caCert.toString())); - } catch (UnsatisfiedLinkError e) { - log.warn(sm.getString("openssl.incompleteClientCASupport"), e); - } + SSLContext.addClientCACertificateRaw(ctx, caCert.getEncoded()); + if (log.isDebugEnabled()) + log.debug(sm.getString("openssl.addedClientCaCert", caCert.toString())); } } else { // Client certificate verification based on trusted CA files and dirs --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org