Author: schultz
Date: Fri Jan 17 16:54:20 2014
New Revision: 1559182
URL: http://svn.apache.org/r1559182
Log:
Back-port r1559180 for partial fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027
- Added fipsModeGet, a JNI wrapper around OpenSSL's FIPS_mode() function.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
Merged /tomcat/native/trunk:r1559180
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1559182&r1=1559181&r2=1559182&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Fri Jan 17 16:54:20 2014
@@ -747,6 +747,19 @@ TCN_IMPLEMENT_CALL(void, SSL, randSet)(T
TCN_FREE_CSTRING(file);
}
+TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
+{
+ UNREFERENCED(o);
+#ifdef OPENSSL_FIPS
+ return FIPS_mode();
+#else
+ /* FIPS is unavailable */
+ 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;
+#endif
+}
+
TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, jint mode)
{
int r = 0;
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1559182&r1=1559181&r2=1559182&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Jan 17
16:54:20 2014
@@ -44,6 +44,10 @@
href="http://www.apache.org/legal/src-headers.html#notice";>requirements
for NOTICE files</a>. (kkolinko)
</fix>
+ <fix>
+ <bug>56027</bug>: Partial fix includes new <code>fipsModeGet</code>
+ function to get the current state of OpenSSL FIPS mode.
+ </fix>
</changelog>
</section>
<section name="Changes between 1.1.28 and 1.1.29">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
