Author: kkolinko
Date: Wed Jul 2 07:38:22 2014
New Revision: 1607264
URL: http://svn.apache.org/r1607264
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.
Not tested.
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:r1607262
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=1607264&r1=1607263&r2=1607264&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul 2 07:38:22 2014
@@ -1165,11 +1165,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;
}
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=1607264&r1=1607263&r2=1607264&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Jul 2
07:38:22 2014
@@ -41,7 +41,11 @@
<fix>
<bug>56396</bug>: Do not create RSA keys shorter the 1024 bits
if inside FIPS mode. (mturk)
- </fix>
+ </fix>
+ <fix>
+ <bug>56423</bug>: Implement stubs for methods fipsModeGet, fipsModeSet
+ when library is compiled without OpenSSL. (kkolinko)
+ </fix>
</changelog>
</section>
<section name="Changes between 1.1.29 and 1.1.30">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
