Author: kkolinko
Date: Wed Jul  2 07:32:51 2014
New Revision: 1607262

URL: http://svn.apache.org/r1607262
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56423
Provide stubs for methods fipsModeGet, fipsModeSet for the case if TCNative is 
compiled without OpenSSL.
The methods throw an exception like their non-stub implementations do in case 
FIPS mode is not available.

Modified:
    tomcat/native/trunk/native/src/ssl.c

Modified: tomcat/native/trunk/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1607262&r1=1607261&r2=1607262&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Jul  2 07:32:51 2014
@@ -1152,11 +1152,18 @@ TCN_IMPLEMENT_CALL(void, SSL, randSet)(T
     UNREFERENCED(file);
 }
 
+TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
+{
+    UNREFERENCED(o);
+    tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
+    return 0;
+}
+
 TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, jint mode)
 {
-    UNREFERENCED_STDARGS;
+    UNREFERENCED(o);
     UNREFERENCED(mode);
-
+    tcn_ThrowException(e, "FIPS was not available to tcnative at build time. 
You will need to re-build tcnative against an OpenSSL with FIPS.");
     return 0;
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to