Author: billbarker
Date: Sun Jan 4 01:06:53 2015
New Revision: 1649278
URL: http://svn.apache.org/r1649278
Log:
Fix compilation error for Gump. There is no change if compiling against any
currently released version of openssl.
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
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=1649278&r1=1649277&r2=1649278&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Sun Jan 4 01:06:53 2015
@@ -229,6 +229,7 @@ static const jint supported_ssl_opts = 0
static int ssl_tmp_key_init_rsa(int bits, int idx)
{
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_USE_DEPRECATED)
if (!(SSL_temp_keys[idx] =
RSA_generate_key(bits, RSA_F4, NULL, NULL))) {
#ifdef OPENSSL_FIPS
@@ -245,6 +246,9 @@ static int ssl_tmp_key_init_rsa(int bits
else {
return 0;
}
+#else
+ return 0;
+#endif
}
static int ssl_tmp_key_init_dh(int bits, int idx)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
