svn commit: r996829 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: wrowe
Date: Tue Sep 14 10:44:35 2010
New Revision: 996829
URL: http://svn.apache.org/viewvc?rev=996829&view=rev
Log:
s_addr is actually a macro in some levels of the win32 sdk, so improve
this logic with simple var names rsaddr/lsaddr elts and generically, salen.
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=996829&r1=996828&r2=996829&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 14 10:44:35 2010
@@ -939,18 +939,18 @@ char *jk_dump_hinfo(struct sockaddr_in *
char *jk_dump_sinfo(jk_sock_t sd, char *buf)
{
-struct sockaddr_in s_addr;
-struct sockaddr_in r_addr;
-socklen_t s_alen;
-
-s_alen = sizeof(struct sockaddr);
-if (getsockname(sd, (struct sockaddr *)&s_addr, &s_alen) == 0) {
-s_alen = sizeof(struct sockaddr);
-if (getpeername(sd, (struct sockaddr *)&r_addr, &s_alen) == 0) {
-unsigned long laddr = (unsigned
long)htonl(s_addr.sin_addr.s_addr);
-unsigned short lport = (unsigned short)htons(s_addr.sin_port);
-unsigned long raddr = (unsigned
long)htonl(r_addr.sin_addr.s_addr);
-unsigned short rport = (unsigned short)htons(r_addr.sin_port);
+struct sockaddr_in rsaddr;
+struct sockaddr_in lsaddr;
+socklen_t salen;
+
+salen = sizeof(struct sockaddr);
+if (getsockname(sd, (struct sockaddr *)&lsaddr, &salen) == 0) {
+salen = sizeof(struct sockaddr);
+if (getpeername(sd, (struct sockaddr *)&rsaddr, &salen) == 0) {
+unsigned long laddr = (unsigned
long)htonl(lsaddr.sin_addr.s_addr);
+unsigned short lport = (unsigned short)htons(lsaddr.sin_port);
+unsigned long raddr = (unsigned
long)htonl(rsaddr.sin_addr.s_addr);
+unsigned short rport = (unsigned short)htons(rsaddr.sin_port);
sprintf(buf, "%d.%d.%d.%d:%d -> %d.%d.%d.%d:%d",
(int)(laddr >> 24), (int)((laddr >> 16) & 0xff),
(int)((laddr >> 8) & 0xff), (int)(laddr & 0xff),
(int)lport,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r996830 - in /tomcat/jk/trunk/native/common: jk.rc jk_version.h
Author: wrowe Date: Tue Sep 14 10:46:00 2010 New Revision: 996830 URL: http://svn.apache.org/viewvc?rev=996830&view=rev Log: This change requires JK_ISAPI, JK_NSAPI to be defined, drops JK_DLL_BASENAME Modified: tomcat/jk/trunk/native/common/jk.rc tomcat/jk/trunk/native/common/jk_version.h Modified: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=996830&r1=996829&r2=996830&view=diff == --- tomcat/jk/trunk/native/common/jk.rc (original) +++ tomcat/jk/trunk/native/common/jk.rc Tue Sep 14 10:46:00 2010 @@ -1,76 +1,76 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include "jk_version.h" - -#define ASF_COPYRIGHT "Licensed to the Apache Software Foundation " \ - "(ASF) under one or more contributor license " \ - "agreements. See the NOTICE file distributed " \ - "with this work for additional information " \ - "regarding copyright ownership." - -#define ASF_LICENSE "The ASF licenses this file to You under the " \ -"Apache License, Version 2.0 (the ""License""); " \ -"you may not use this file except in compliance " \ -"with the License. You may obtain a copy of " \ -"the License at\r\n\r\n" \ -"http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n"; \ -"Unless required by applicable law or agreed to in " \ -"writing, software distributed under the License is " \ -"distributed on an ""AS IS"" BASIS, WITHOUT " \ -"WARRANTIES OR CONDITIONS OF ANY KIND, either " \ -"express or implied. See the License for the " \ -"specific language governing permissions and " \ -"limitations under the License." - -#define JK_DLL_BASENAME JK_STRINGIFY(BASENAME) "-" JK_VERSTRING - - -1 VERSIONINFO - FILEVERSION JK_VERSIONCSV - PRODUCTVERSION JK_VERSIONCSV - FILEFLAGSMASK 0x3fL -#if defined(_DEBUG) - FILEFLAGS 0x01L -#else - FILEFLAGS 0x00L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN -BLOCK "040904b0" -BEGIN -VALUE "Comments", ASF_LICENSE "\0" - VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Tomcat Connector\0" - VALUE "FileVersion", JK_VERSTRING "\0" - VALUE "InternalName", JK_DLL_BASENAME "\0" - VALUE "LegalCopyright", ASF_COPYRIGHT "\0" - VALUE "OriginalFilename", JK_DLL_BASENAME ".dll\0" - VALUE "ProductName", "Apache Tomcat Connectors project\0" - VALUE "ProductVersion", JK_VERSTRING "\0" -END - END - BLOCK "VarFileInfo" - BEGIN -VALUE "Translation", 0x409, 1200 - END -END - +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language
svn commit: r996835 - /tomcat/jk/trunk/native/common/jk.rc
Author: wrowe Date: Tue Sep 14 10:57:09 2010 New Revision: 996835 URL: http://svn.apache.org/viewvc?rev=996835&view=rev Log: Remove stray JK_DLL_BASENAME declaration Modified: tomcat/jk/trunk/native/common/jk.rc Modified: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=996835&r1=996834&r2=996835&view=diff == --- tomcat/jk/trunk/native/common/jk.rc (original) +++ tomcat/jk/trunk/native/common/jk.rc Tue Sep 14 10:57:09 2010 @@ -37,8 +37,6 @@ "specific language governing permissions and " \ "limitations under the License." -#define JK_DLL_BASENAME JK_STRINGIFY(BASENAME) "-" JK_VERSTRING - 1 VERSIONINFO FILEVERSION JK_VERSIONCSV - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r996836 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c apache-2.0/mod_jk.dsp iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/isapi.dsp
Author: wrowe
Date: Tue Sep 14 11:00:40 2010
New Revision: 996836
URL: http://svn.apache.org/viewvc?rev=996836&view=rev
Log:
Identify JK_ISAPI for jk_version.h PACKAGE definition
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/isapi.dsp
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=996836&r1=996835&r2=996836&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Sep 14 11:00:40 2010
@@ -3549,7 +3549,6 @@ static int jk_translate(request_rec * r)
return DECLINED;
}
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
/* bypass the directory_walk and file_walk for non-file requests */
static int jk_map_to_storage(request_rec * r)
{
@@ -3665,7 +3664,6 @@ static int jk_map_to_storage(request_rec
}
return DECLINED;
}
-#endif
static void jk_register_hooks(apr_pool_t * p)
{
@@ -3673,9 +3671,7 @@ static void jk_register_hooks(apr_pool_t
ap_hook_post_config(jk_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(jk_child_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(jk_translate, NULL, NULL, APR_HOOK_MIDDLE);
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
-#endif
}
module AP_MODULE_DECLARE_DATA jk_module = {
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp?rev=996836&r1=996835&r2=996836&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp Tue Sep 14 11:00:40 2010
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="apache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_jk" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=apache - Win32 Debug
+CFG=mod_jk - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@ CFG=apache - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "mod_jk.mak" CFG="apache - Win32 Debug"
+!MESSAGE NMAKE /f "mod_jk.mak" CFG="mod_jk - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "apache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.0" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.0" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.2" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.2" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE
# Begin Project
@@ -29,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "apache - Win32 Release"
+!IF "$(CFG)" == "mod_jk - Win32 Release httpd 2.0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -47,7 +49,7 @@ RSC=rc.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/mod_jk.res" /I "..\common" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -55,7 +57,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B"
/subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_jk.so"
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib&
svn propchange: r996836 - svn:log
Author: wrowe Revision: 996836 Modified property: svn:log Modified: svn:log at Tue Sep 14 11:04:21 2010 -- --- svn:log (original) +++ svn:log Tue Sep 14 11:04:21 2010 @@ -1 +1,6 @@ -Identify JK_ISAPI for jk_version.h PACKAGE definition +Split .dsp projects into httpd 2.0 and 2.2 for the apache2.0/ connector +and rename the internal project name to mod_jk + +Remove legacy (pre-beta) revision check within mod_jk.c + +And identify JK_ISAPI for jk_version.h PACKAGE definition - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r996841 - /tomcat/jk/trunk/native/iis/isapi.dsp
Author: wrowe Date: Tue Sep 14 11:14:09 2010 New Revision: 996841 URL: http://svn.apache.org/viewvc?rev=996841&view=rev Log: With the proper .rc name, this seems to build, too Modified: tomcat/jk/trunk/native/iis/isapi.dsp Modified: tomcat/jk/trunk/native/iis/isapi.dsp URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi.dsp?rev=996841&r1=996840&r2=996841&view=diff == --- tomcat/jk/trunk/native/iis/isapi.dsp (original) +++ tomcat/jk/trunk/native/iis/isapi.dsp Tue Sep 14 11:14:09 2010 @@ -92,7 +92,7 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\isapi_redirect.rc +SOURCE=..\common\jk.rc # End Source File # Begin Source File - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1438342 - in /tomcat/native/trunk/native: include/ssl_private.h src/sslcontext.c src/sslnetwork.c src/sslutils.c
Author: wrowe
Date: Fri Jan 25 06:28:32 2013
New Revision: 1438342
URL: http://svn.apache.org/viewvc?rev=1438342&view=rev
Log:
Replace the direct use of MD5 with the EVP API's SHA1 representation of
the host:port combination for the SSL session key context of each listener.
This restores FIPS functionality when combined with OpenSSL 1.0.1c which has
dropped support for direct hash functions when operating under FIPS mode.
This also anticipates some users dropping MD5 altogether from their OpenSSL.
Also eliminates the unused MD5 accessor function SSL_vhost_algo_id().
Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/native/src/sslnetwork.c
tomcat/native/trunk/native/src/sslutils.c
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1438342&r1=1438341&r2=1438342&view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Fri Jan 25 06:28:32 2013
@@ -48,7 +48,6 @@
#include
#include
#include
-#include
/* Avoid tripping over an engine build installed globally and detected
* when the user points at an explicit non-engine flavor of OpenSSL
*/
@@ -230,7 +229,7 @@ struct tcn_ssl_ctxt_t {
BIO *bio_os;
BIO *bio_is;
-unsigned char context_id[MD5_DIGEST_LENGTH];
+unsigned char context_id[SHA_DIGEST_LENGTH];
int protocol;
/* we are one or the other */
@@ -318,7 +317,6 @@ DH *SSL_dh_get_param_from_file(c
RSA*SSL_callback_tmp_RSA(SSL *, int, int);
DH *SSL_callback_tmp_DH(SSL *, int, int);
voidSSL_callback_handshake(const SSL *, int, int);
-voidSSL_vhost_algo_id(const unsigned char *, unsigned char *, int);
int SSL_CTX_use_certificate_chain(SSL_CTX *, const char *, int);
int SSL_callback_SSL_verify(int, X509_STORE_CTX *);
int SSL_rand_seed(const char *file);
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1438342&r1=1438341&r2=1438342&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Fri Jan 25 06:28:32 2013
@@ -150,9 +150,9 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
#endif
/* Default session context id and cache size */
SSL_CTX_sess_set_cache_size(c->ctx, SSL_DEFAULT_CACHE_SIZE);
-MD5((const unsigned char *)SSL_DEFAULT_VHOST_NAME,
-(unsigned long)(sizeof(SSL_DEFAULT_VHOST_NAME) - 1),
-&(c->context_id[0]));
+EVP_Digest((const unsigned char *)SSL_DEFAULT_VHOST_NAME,
+ (unsigned long)((sizeof SSL_DEFAULT_VHOST_NAME) - 1),
+ &(c->context_id[0]), NULL, EVP_sha1(), NULL);
if (mode) {
SSL_CTX_set_tmp_rsa_callback(c->ctx, SSL_callback_tmp_RSA);
SSL_CTX_set_tmp_dh_callback(c->ctx, SSL_callback_tmp_DH);
@@ -198,9 +198,9 @@ TCN_IMPLEMENT_CALL(void, SSLContext, set
TCN_ASSERT(ctx != 0);
UNREFERENCED(o);
if (J2S(id)) {
-MD5((const unsigned char *)J2S(id),
-(unsigned long)strlen(J2S(id)),
-&(c->context_id[0]));
+EVP_Digest((const unsigned char *)J2S(id),
+ (unsigned long)strlen(J2S(id)),
+ &(c->context_id[0]), NULL, EVP_sha1(), NULL);
}
TCN_FREE_CSTRING(id);
}
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1438342&r1=1438341&r2=1438342&view=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Fri Jan 25 06:28:32 2013
@@ -151,7 +151,7 @@ static tcn_ssl_conn_t *ssl_create(JNIEnv
SSL_set_tmp_rsa_callback(ssl, SSL_callback_tmp_RSA);
SSL_set_tmp_dh_callback(ssl, SSL_callback_tmp_DH);
SSL_set_session_id_context(ssl, &(ctx->context_id[0]),
- MD5_DIGEST_LENGTH);
+ sizeof ctx->context_id);
}
SSL_set_verify_result(ssl, X509_V_OK);
SSL_rand_seed(ctx->rand_file);
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1438342&r1=1438341&r2=1438342&view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/ss
svn commit: r1438346 - in /tomcat/native/branches/1.1.x: ./ native/src/sslcontext.c native/src/sslnetwork.c xdocs/miscellaneous/changelog.xml
Author: wrowe
Date: Fri Jan 25 06:39:18 2013
New Revision: 1438346
URL: http://svn.apache.org/viewvc?rev=1438346&view=rev
Log:
Mladen and I seem to have been of the same mind, but we should pick up the
change that Chuck suggested in the bug report as I had in r1438342, and also
note a user facing change
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1438342
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1438346&r1=1438345&r2=1438346&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Fri Jan 25 06:39:18
2013
@@ -148,7 +148,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
/* Default session context id and cache size */
SSL_CTX_sess_set_cache_size(c->ctx, SSL_DEFAULT_CACHE_SIZE);
EVP_Digest((const unsigned char *)SSL_DEFAULT_VHOST_NAME,
- (unsigned long)(sizeof(SSL_DEFAULT_VHOST_NAME) - 1),
+ (unsigned long)((sizeof SSL_DEFAULT_VHOST_NAME) - 1),
&(c->context_id[0]), NULL, EVP_sha1(), NULL);
if (mode) {
SSL_CTX_set_tmp_rsa_callback(c->ctx, SSL_callback_tmp_RSA);
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1438346&r1=1438345&r2=1438346&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Fri Jan 25 06:39:18
2013
@@ -151,7 +151,7 @@ static tcn_ssl_conn_t *ssl_create(JNIEnv
SSL_set_tmp_rsa_callback(ssl, SSL_callback_tmp_RSA);
SSL_set_tmp_dh_callback(ssl, SSL_callback_tmp_DH);
SSL_set_session_id_context(ssl, &(ctx->context_id[0]),
- sizeof(ctx->context_id));
+ sizeof ctx->context_id);
}
SSL_set_verify_result(ssl, X509_V_OK);
SSL_rand_seed(ctx->rand_file);
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=1438346&r1=1438345&r2=1438346&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 25
06:39:18 2013
@@ -38,6 +38,11 @@
+
+ 54468: Fix FIPS mode for listeners when using OpenSSL 1.0.1c
+ and later; resolves 'Low level API call to digest MD5 forbidden in FIPS
+ mode!' errors. (wrowe)
+
add clearOptions function to allow access to OpenSSL's
SSL_CTX_clear_options function. (schultz)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803817 - in /tomcat/native/trunk/native: libtcnative.dsp tcnative.dsp
Author: wrowe Date: Wed Aug 2 13:18:11 2017 New Revision: 1803817 URL: http://svn.apache.org/viewvc?rev=1803817&view=rev Log: The addition of bb.c, os.c was missed from the .dsp project files Modified: tomcat/native/trunk/native/libtcnative.dsp tomcat/native/trunk/native/tcnative.dsp Modified: tomcat/native/trunk/native/libtcnative.dsp URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=1803817&r1=1803816&r2=1803817&view=diff == --- tomcat/native/trunk/native/libtcnative.dsp (original) +++ tomcat/native/trunk/native/libtcnative.dsp Wed Aug 2 13:18:11 2017 @@ -96,6 +96,10 @@ SOURCE=.\src\address.c # End Source File # Begin Source File +SOURCE=.\src\bb.c +# End Source File +# Begin Source File + SOURCE=.\src\dir.c # End Source File # Begin Source File @@ -136,6 +140,10 @@ SOURCE=.\src\network.c # End Source File # Begin Source File +SOURCE=.\src\os.c +# End Source File +# Begin Source File + SOURCE=.\src\poll.c # End Source File # Begin Source File Modified: tomcat/native/trunk/native/tcnative.dsp URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=1803817&r1=1803816&r2=1803817&view=diff == --- tomcat/native/trunk/native/tcnative.dsp (original) +++ tomcat/native/trunk/native/tcnative.dsp Wed Aug 2 13:18:11 2017 @@ -96,6 +96,10 @@ SOURCE=.\src\address.c # End Source File # Begin Source File +SOURCE=.\src\bb.c +# End Source File +# Begin Source File + SOURCE=.\src\dir.c # End Source File # Begin Source File @@ -136,6 +140,10 @@ SOURCE=.\src\network.c # End Source File # Begin Source File +SOURCE=.\src\os.c +# End Source File +# Begin Source File + SOURCE=.\src\poll.c # End Source File # Begin Source File - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803908 - /tomcat/native/trunk/native/configure.in
Author: wrowe Date: Wed Aug 2 19:27:58 2017 New Revision: 1803908 URL: http://svn.apache.org/viewvc?rev=1803908&view=rev Log: The tcn include files do not live in builddir, they are not generated. These live in the srcdir (other aliases would be forward references.) Modified: tomcat/native/trunk/native/configure.in Modified: tomcat/native/trunk/native/configure.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1803908&r1=1803907&r2=1803908&view=diff == --- tomcat/native/trunk/native/configure.in (original) +++ tomcat/native/trunk/native/configure.in Wed Aug 2 19:27:58 2017 @@ -85,7 +85,7 @@ dnl set up the compilation flags and stu dnl TCNATIVE_INCLUDES="" -TCNATIVE_PRIV_INCLUDES="-I$top_builddir/include" +TCNATIVE_PRIV_INCLUDES="-I$srcdir/include" dnl dnl Find the APR includes directory and (possibly) the source (base) dir. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
