Author: kkolinko
Date: Fri Apr 18 13:16:37 2014
New Revision: 1588465
URL: http://svn.apache.org/r1588465
Log:
Merged r1588102 from tomcat/trunk:
Correct signature of SSL.fipsModeGet(),
as native code is implemented as throwing an Exception in this method.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1588102
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1588465&r1=1588464&r2=1588465&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Fri Apr 18 13:16:37 2014
@@ -281,7 +281,12 @@ public class AprLifecycleListener
// In order to avoid the argument and check-value from getting out
// of sync for some reason, we are using the class constant
// FIPS_ON here.
- final int fipsModeState = SSL.fipsModeGet();
+ int fipsModeState;
+ try {
+ fipsModeState = SSL.fipsModeGet();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
if(log.isDebugEnabled())
log.debug(sm.getString("aprListener.currentFIPSMode",
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1588465&r1=1588464&r2=1588465&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java Fri Apr 18
13:16:37 2014
@@ -236,7 +236,7 @@ public final class SSL {
* @return 0 If OpenSSL is not in FIPS mode, 1 if OpenSSL is in FIPS Mode.
* @throws Exception If tcnative was not compiled with FIPS Mode available.
*/
- public static native int fipsModeGet();
+ public static native int fipsModeGet() throws Exception;
/**
* Enable/Disable FIPS Mode.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
