Author: rjung
Date: Mon Sep 4 18:49:35 2017
New Revision: 1807282
URL: http://svn.apache.org/viewvc?rev=1807282&view=rev
Log:
Remove checks for UnsatisfiedLinkError, now
that we require tcnative 1.2.14.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1807282&r1=1807281&r2=1807282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Sep 4
18:49:35 2017
@@ -561,9 +561,6 @@ public class AprEndpoint extends Abstrac
SSL.SSL_CONF_FLAG_SERVER |
SSL.SSL_CONF_FLAG_CERTIFICATE |
SSL.SSL_CONF_FLAG_SHOW_ERRORS);
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("endpoint.apr.missingOpenSSLConfSupport"), e);
- throw new Exception(sm.getString("endpoint.apr.errMakeConf"),
e);
} catch (Exception e) {
throw new Exception(sm.getString("endpoint.apr.errMakeConf"),
e);
}
@@ -634,11 +631,7 @@ public class AprEndpoint extends Abstrac
}
Long cctx = sslHostConfig.getOpenSslConfContext();
if (cctx != null) {
- try {
- SSLConf.free(cctx.longValue());
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("endpoint.apr.missingOpenSSLConfSupport"), e);
- }
+ SSLConf.free(cctx.longValue());
sslHostConfig.setOpenSslConfContext(null);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1807282&r1=1807281&r2=1807282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Sep 4 18:49:35 2017
@@ -81,7 +81,6 @@ endpoint.apr.errCheckConf=Error during O
endpoint.apr.assignConf=Assigning SSL context to OpenSSLConfCmd context
endpoint.apr.applyConf=Applying OpenSSLConfCmd to SSL context
endpoint.apr.errApplyConf=Could not apply OpenSSLConf to SSL context
-endpoint.apr.missingOpenSSLConfSupport=Your tcnative library has no support
for OpenSSLConf, version 1.2.13 or higher is required.
endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
endpoint.nio.registerFail=Failed to register socket with selector from poller
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
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=1807282&r1=1807281&r2=1807282&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 18:49:35 2017
@@ -27,7 +27,6 @@ openssl.errCheckConf=Error during OpenSS
openssl.assignConf=Assigning SSL context to OpenSSLConfCmd context
openssl.applyConf=Applying OpenSSLConfCmd to SSL context
openssl.errApplyConf=Could not apply OpenSSLConf to SSL context
-openssl.missingOpenSSLConfSupport=Your tcnative library has no support for
OpenSSLConf, version 1.2.13 or higher is required.
opensslconf.checkCommand=OpenSSLConf checking command (name [{0}], value [{1}])
opensslconf.checkFailed=Failure while checking OpenSSLConf
@@ -37,7 +36,6 @@ opensslconf.failedCommand=OpenSSLConf fa
opensslconf.failedFinish=OpenSSLConf finish failed with result [{2}]
opensslconf.noCommandName=OpenSSLConf no command name - will be ignored
(command value [{0}])
opensslconf.resultCommand=OpenSSLConf command (name [{0}], value [{1}])
returned [{2}]
-opensslconf.missingOpenSSLConfSupport=Your tcnative library has no support for
OpenSSLConf, version 1.2.13 or higher is required.
engine.engineClosed=Engine is closed
engine.renegotiationUnsupported=Renegotiation is not supported
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java?rev=1807282&r1=1807281&r2=1807282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java Mon
Sep 4 18:49:35 2017
@@ -59,8 +59,7 @@ public class OpenSSLConf {
}
try {
rc = SSLConf.check(cctx, name, value);
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("opensslconf.missingOpenSSLConfSupport"), e);
+ } catch (Exception e) {
log.error(sm.getString("opensslconf.checkFailed"));
return false;
}
@@ -81,13 +80,7 @@ public class OpenSSLConf {
public boolean apply(long cctx, long ctx) throws Exception {
boolean result = true;
- try {
- SSLConf.assign(cctx, ctx);
- } catch (UnsatisfiedLinkError e) {
- log.warn(sm.getString("opensslconf.missingOpenSSLConfSupport"), e);
- log.error(sm.getString("opensslconf.applyFailed"));
- return false;
- }
+ SSLConf.assign(cctx, ctx);
OpenSSLConfCmd cmd;
String name;
String value;
@@ -106,8 +99,7 @@ public class OpenSSLConf {
}
try {
rc = SSLConf.apply(cctx, name, value);
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("opensslconf.missingOpenSSLConfSupport"), e);
+ } catch (Exception e) {
log.error(sm.getString("opensslconf.applyFailed"));
return false;
}
@@ -120,13 +112,7 @@ public class OpenSSLConf {
Integer.toString(rc)));
}
}
- try {
- rc = SSLConf.finish(cctx);
- } catch (UnsatisfiedLinkError e) {
- log.warn(sm.getString("opensslconf.missingOpenSSLConfSupport"), e);
- log.error(sm.getString("opensslconf.applyFailed"));
- return false;
- }
+ rc = SSLConf.finish(cctx);
if (rc <= 0) {
log.error(sm.getString("opensslconf.finishFailed",
Integer.toString(rc)));
result = false;
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=1807282&r1=1807281&r2=1807282&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 18:49:35 2017
@@ -127,9 +127,6 @@ public class OpenSSLContext implements o
SSL.SSL_CONF_FLAG_SERVER |
SSL.SSL_CONF_FLAG_CERTIFICATE |
SSL.SSL_CONF_FLAG_SHOW_ERRORS);
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("openssl.missingOpenSSLConfSupport"), e);
- throw new Exception(sm.getString("openssl.errMakeConf"),
e);
} catch (Exception e) {
throw new
SSLException(sm.getString("openssl.errMakeConf"), e);
}
@@ -195,11 +192,7 @@ public class OpenSSLContext implements o
SSLContext.free(ctx);
}
if (cctx != 0) {
- try {
- SSLConf.free(cctx);
- } catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("openssl.missingOpenSSLConfSupport"), e);
- }
+ SSLConf.free(cctx);
}
if (aprPool != 0) {
Pool.destroy(aprPool);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
