Index: osx/BuildNo.xcconfig =================================================================== RCS file: /cvs/cvsnt/osx/BuildNo.xcconfig,v retrieving revision 1.1.2.61 diff -c -r1.1.2.61 BuildNo.xcconfig *** osx/BuildNo.xcconfig 27 Oct 2016 01:40:06 -0000 1.1.2.61 --- osx/BuildNo.xcconfig 3 Nov 2016 04:10:05 -0000 *************** *** 2,8 **** // BuildNo.xcconfig // cvsnt // ! // Created by genbuild on 27.09.2016 // CVSNT_Version_Buildnumber = 6145 CVSNT_Version_Major = 2 --- 2,8 ---- // BuildNo.xcconfig // cvsnt // ! // Created by genbuild on 03.10.2016 // CVSNT_Version_Buildnumber = 6145 CVSNT_Version_Major = 2 Index: protocols/common.cpp =================================================================== RCS file: /cvs/cvsnt/protocols/common.c,v retrieving revision 1.37.2.34.6.16 diff -c -r1.37.2.34.6.16 common.cpp *** protocols/common.cpp 31 May 2016 06:09:24 -0000 1.37.2.34.6.16 --- protocols/common.cpp 3 Nov 2016 04:09:22 -0000 *************** *** 1864,1880 **** } #ifdef _WIN32 ! static BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { char value[MAX_PATH]; int nSel; ! struct plugin_interface *ui = (struct plugin_interface*)GetWindowLongPtr(hWnd,GWL_USERDATA); switch(uMsg) { case WM_INITDIALOG: { ! SetWindowLongPtr(hWnd,GWL_USERDATA,lParam); ui = (struct plugin_interface*)lParam; SetWindowText(hWnd,ui->description); SetDlgItemText(hWnd,IDC_ENUMWARN,ui->warning); --- 1864,1880 ---- } #ifdef _WIN32 ! static INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { char value[MAX_PATH]; int nSel; ! struct plugin_interface *ui = (struct plugin_interface*)GetWindowLongPtr(hWnd,GWLP_USERDATA); switch(uMsg) { case WM_INITDIALOG: { ! SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam); ui = (struct plugin_interface*)lParam; SetWindowText(hWnd,ui->description); SetDlgItemText(hWnd,IDC_ENUMWARN,ui->warning); Index: protocols/sserver.cpp =================================================================== RCS file: /cvs/cvsnt/protocols/sserver.c,v retrieving revision 1.16.2.44.4.15 diff -c -r1.16.2.44.4.15 sserver.cpp *** protocols/sserver.cpp 31 May 2016 06:09:24 -0000 1.16.2.44.4.15 --- protocols/sserver.cpp 3 Nov 2016 04:02:14 -0000 *************** *** 28,33 **** --- 28,34 ---- #endif /* Requires openssl installed */ + #undef OPENSSL_NO_SSL3_METHOD #include #include *************** *** 311,324 **** send_client_version = true; } SSL_library_init(); ssl_library_version=SSLeay_version(SSLEAY_VERSION); if (ssl_library_version!=NULL) ssl_library_version_str=strdup(ssl_library_version); else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); ! ctx = SSL_CTX_new (SSLv3_client_method ()); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); --- 312,330 ---- send_client_version = true; } + #if OPENSSL_VERSION_NUMBER < 0x10100000L SSL_library_init(); + #else + OPENSSL_init_ssl(0, NULL); + #endif ssl_library_version=SSLeay_version(SSLEAY_VERSION); if (ssl_library_version!=NULL) ssl_library_version_str=strdup(ssl_library_version); else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); ! // was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD ! ctx = SSL_CTX_new (TLS_client_method ()); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); *************** *** 389,395 **** } } ! SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl); if (client_cipher==NULL) { if (eventlogciphers) --- 395,401 ---- } } ! const SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl); if (client_cipher==NULL) { if (eventlogciphers) *************** *** 532,538 **** --- 538,548 ---- strncpy(server_ciphers,"HIGH:!EXPORT",sizeof(server_ciphers)); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_library_init()"); + #if OPENSSL_VERSION_NUMBER < 0x10100000L SSL_library_init(); + #else + OPENSSL_init_ssl(0, NULL); + #endif CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSLeay_version()"); ssl_library_version=SSLeay_version(SSLEAY_VERSION); if (ssl_library_version!=NULL) *************** *** 543,549 **** CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_load_error_strings()"); SSL_load_error_strings (); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_CTX_new()"); ! ctx = SSL_CTX_new (SSLv23_server_method ()); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_CTX_set_options()"); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); --- 553,560 ---- CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_load_error_strings()"); SSL_load_error_strings (); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_CTX_new()"); ! // was SSLv23_server_method - not supported in OpenSSL 1.1 ! ctx = SSL_CTX_new (TLS_server_method ()); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_CTX_set_options()"); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); *************** *** 662,668 **** X509 *cert = SSL_get_peer_certificate(ssl); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher()"); ! SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl); if (server_cipher==NULL) { CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher() is NULL"); --- 673,679 ---- X509 *cert = SSL_get_peer_certificate(ssl); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher()"); ! const SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl); if (server_cipher==NULL) { CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher() is NULL"); *************** *** 880,886 **** va_end(va); ! return sserver_write_data(NULL,temp,strlen(temp)); } int sserver_validate_keyword(const struct protocol_interface *protocol, cvsroot *root, const char *keyword, const char *value) --- 891,897 ---- va_end(va); ! return sserver_write_data(NULL,temp,(int)strlen(temp)); } int sserver_validate_keyword(const struct protocol_interface *protocol, cvsroot *root, const char *keyword, const char *value) *************** *** 983,996 **** SendDlgItemMessage(hWnd,IDC_CIPHER,CB_ADDSTRING,0,(LPARAM)"HIGH:!EXPORT"); SendDlgItemMessage(hWnd,IDC_CIPHER,CB_ADDSTRING,0,(LPARAM)"HIGH:!EXPORT:!aNULL"); SSL_library_init(); ssl_library_version=SSLeay_version(SSLEAY_VERSION); if (ssl_library_version!=NULL) ssl_library_version_str=strdup(ssl_library_version); else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); ! ctx = SSL_CTX_new (SSLv3_client_method ()); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); --- 994,1012 ---- SendDlgItemMessage(hWnd,IDC_CIPHER,CB_ADDSTRING,0,(LPARAM)"HIGH:!EXPORT"); SendDlgItemMessage(hWnd,IDC_CIPHER,CB_ADDSTRING,0,(LPARAM)"HIGH:!EXPORT:!aNULL"); + #if OPENSSL_VERSION_NUMBER < 0x10100000L SSL_library_init(); + #else + OPENSSL_init_ssl(0, NULL); + #endif ssl_library_version=SSLeay_version(SSLEAY_VERSION); if (ssl_library_version!=NULL) ssl_library_version_str=strdup(ssl_library_version); else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); ! // was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD ! ctx = SSL_CTX_new (TLS_client_method ()); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); Index: protocols/sserver_protocol.vcproj =================================================================== RCS file: /cvs/cvsnt/protocols/sserver_protocol.vcproj,v retrieving revision 1.1.2.17.6.9 diff -c -r1.1.2.17.6.9 sserver_protocol.vcproj *** protocols/sserver_protocol.vcproj 30 Mar 2015 07:44:49 -0000 1.1.2.17.6.9 --- protocols/sserver_protocol.vcproj 3 Nov 2016 04:12:06 -0000 *************** *** 134,140 **** &1 >release_builder.log pause exit /b Index: tonys scripts/vs2003 x32.bat =================================================================== RCS file: /cvs/cvsnt/tonys scripts/vs2003 x32.bat,v retrieving revision 1.1.4.1 diff -c -r1.1.4.1 vs2003 x32.bat *** tonys scripts/vs2003 x32.bat 17 Mar 2015 21:16:32 -0000 1.1.4.1 --- tonys scripts/vs2003 x32.bat 3 Nov 2016 03:37:25 -0000 *************** *** 25,30 **** --- 25,31 ---- :done10g set PATH=%ORACLE_HOME%\bin;%PATH% + set SHELLOPTS=igncr bash -x "vs2003 x32.sh" %1 %2 %3 REM pause Index: tonys scripts/vs2003 x32.sh =================================================================== RCS file: /cvs/cvsnt/tonys scripts/vs2003 x32.sh,v retrieving revision 1.1.4.1 diff -c -r1.1.4.1 vs2003 x32.sh *** tonys scripts/vs2003 x32.sh 17 Mar 2015 21:16:32 -0000 1.1.4.1 --- tonys scripts/vs2003 x32.sh 2 Nov 2016 06:44:13 -0000 *************** *** 1,4 **** --- 1,5 ---- #!/bin/bash + echo "*** vs2003 x32.sh" PROGFILES="Program Files" if [ "x$PROCESSOR_ARCHITEW6432" == "xAMD64" -o "x$PROGRAMFILES" == "xC:\Program Files (x86)" ]; then Index: tonys scripts/vs2003 x64.bat =================================================================== RCS file: /cvs/cvsnt/tonys scripts/vs2003 x64.bat,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 vs2003 x64.bat *** tonys scripts/vs2003 x64.bat 17 Mar 2015 21:16:32 -0000 1.1.2.1 --- tonys scripts/vs2003 x64.bat 3 Nov 2016 03:38:14 -0000 *************** *** 26,31 **** --- 26,32 ---- :done10g set PATH=%ORACLE_HOME%\bin;%PATH% + set SHELLOPTS=igncr bash -x "vs2003 x64.sh" %1 %2 %3 rem pause