Index: osx/cvsnt.xcodeproj/project.pbxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/osx/cvsnt.xcodeproj/project.pbxproj,v retrieving revision 1.1.2.14 diff -c -r1.1.2.14 project.pbxproj *** osx/cvsnt.xcodeproj/project.pbxproj 4 Oct 2012 08:34:46 -0000 1.1.2.14 --- osx/cvsnt.xcodeproj/project.pbxproj 30 Mar 2015 23:26:24 -0000 *************** *** 312,318 **** B43C09DF126E2DE200F08921 /* dns.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07E5126E21F700F08921 /* dns.c */; }; B43C09E0126E2DE200F08921 /* mdnsclient.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07E9126E21F700F08921 /* mdnsclient.c */; }; B43C09E1126E2DE200F08921 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07F1126E21F700F08921 /* util.c */; }; ! B43C09ED126E2E2D00F08921 /* libmdnsclient-2.8.02.4667.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.4667.dylib */; }; B43C0AC0126E2F1D00F08921 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0ABF126E2F1D00F08921 /* libresolv.dylib */; }; B43C0AC5126E2F7C00F08921 /* libltdl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0AC4126E2F7C00F08921 /* libltdl.dylib */; }; B43C0AEB126E326D00F08921 /* Cvsgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC065124A9CA000C200F3 /* Cvsgui.cpp */; }; --- 312,318 ---- B43C09DF126E2DE200F08921 /* dns.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07E5126E21F700F08921 /* dns.c */; }; B43C09E0126E2DE200F08921 /* mdnsclient.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07E9126E21F700F08921 /* mdnsclient.c */; }; B43C09E1126E2DE200F08921 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = B43C07F1126E21F700F08921 /* util.c */; }; ! B43C09ED126E2E2D00F08921 /* libmdnsclient-2.8.02.5561.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.5561.dylib */; }; B43C0AC0126E2F1D00F08921 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0ABF126E2F1D00F08921 /* libresolv.dylib */; }; B43C0AC5126E2F7C00F08921 /* libltdl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0AC4126E2F7C00F08921 /* libltdl.dylib */; }; B43C0AEB126E326D00F08921 /* Cvsgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC065124A9CA000C200F3 /* Cvsgui.cpp */; }; *************** *** 323,329 **** B43C0AF0126E326D00F08921 /* ServerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC079124A9CA000C200F3 /* ServerConnection.cpp */; }; B43C0AF1126E326D00F08921 /* ServerInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC07B124A9CA000C200F3 /* ServerInfo.cpp */; }; B43C0AF2126E326D00F08921 /* TriggerLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC07E124A9CA000C200F3 /* TriggerLibrary.cpp */; }; ! B43C0B00126E32D700F08921 /* libcvsapi-2.8.02.4667.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0894126E27A800F08921 /* libcvsapi-2.8.02.4667.dylib */; }; B43C0B07126E32F800F08921 /* libcvsgui.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C087C126E251800F08921 /* libcvsgui.a */; }; B45BE993141571F400BBA2C7 /* cvsapi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B429E1D41300923E00E974DC /* cvsapi.framework */; }; B45BE9B31415724800BBA2C7 /* MySqlConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC13E124A9DEF00C200F3 /* MySqlConnection.cpp */; }; --- 323,329 ---- B43C0AF0126E326D00F08921 /* ServerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC079124A9CA000C200F3 /* ServerConnection.cpp */; }; B43C0AF1126E326D00F08921 /* ServerInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC07B124A9CA000C200F3 /* ServerInfo.cpp */; }; B43C0AF2126E326D00F08921 /* TriggerLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC07E124A9CA000C200F3 /* TriggerLibrary.cpp */; }; ! B43C0B00126E32D700F08921 /* libcvsapi-2.8.02.5561.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C0894126E27A800F08921 /* libcvsapi-2.8.02.5561.dylib */; }; B43C0B07126E32F800F08921 /* libcvsgui.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B43C087C126E251800F08921 /* libcvsgui.a */; }; B45BE993141571F400BBA2C7 /* cvsapi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B429E1D41300923E00E974DC /* cvsapi.framework */; }; B45BE9B31415724800BBA2C7 /* MySqlConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4FCC13E124A9DEF00C200F3 /* MySqlConnection.cpp */; }; *************** *** 1376,1382 **** B43C0872126E247B00F08921 /* DoDox.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = DoDox.sh; sourceTree = ""; }; B43C0873126E247B00F08921 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Doxyfile; sourceTree = ""; }; B43C087C126E251800F08921 /* libcvsgui.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcvsgui.a; sourceTree = BUILT_PRODUCTS_DIR; }; ! B43C0894126E27A800F08921 /* libcvsapi-2.8.02.4667.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcvsapi-2.8.02.4667.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C4126E288400F08921 /* libexpat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libexpat.dylib; path = ../../../../../../../../usr/lib/libexpat.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C8126E28B800F08921 /* libdl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdl.dylib; path = ../../../../../../../../usr/lib/libdl.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C9126E28B800F08921 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = ../../../../../../../../usr/lib/libiconv.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; --- 1376,1382 ---- B43C0872126E247B00F08921 /* DoDox.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = DoDox.sh; sourceTree = ""; }; B43C0873126E247B00F08921 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Doxyfile; sourceTree = ""; }; B43C087C126E251800F08921 /* libcvsgui.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcvsgui.a; sourceTree = BUILT_PRODUCTS_DIR; }; ! B43C0894126E27A800F08921 /* libcvsapi-2.8.02.5561.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcvsapi-2.8.02.5561.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C4126E288400F08921 /* libexpat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libexpat.dylib; path = ../../../../../../../../usr/lib/libexpat.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C8126E28B800F08921 /* libdl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdl.dylib; path = ../../../../../../../../usr/lib/libdl.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C08C9126E28B800F08921 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = ../../../../../../../../usr/lib/libiconv.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; *************** *** 1400,1410 **** B43C09A7126E294D00F08921 /* missing */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = missing; sourceTree = ""; }; B43C09A8126E294D00F08921 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; B43C09A9126E294D00F08921 /* stamp-h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "stamp-h.in"; sourceTree = ""; }; ! B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.4667.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libmdnsclient-2.8.02.4667.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C09F7126E2ECD00F08921 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; B43C0ABF126E2F1D00F08921 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = ../../../../../../../../usr/lib/libresolv.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C0AC4126E2F7C00F08921 /* libltdl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libltdl.dylib; path = ../../../../../../../../usr/lib/libltdl.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; ! B43C0AE8126E323400F08921 /* libcvstools-2.8.02.4667.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcvstools-2.8.02.4667.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C0BD9127A036100F08921 /* ext_xdiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ext_xdiff.cpp; sourceTree = ""; }; B43C0BDD127A036100F08921 /* xdiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xdiff.h; sourceTree = ""; }; B43C0BDE127A036100F08921 /* xml_xdiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_xdiff.cpp; sourceTree = ""; }; --- 1400,1410 ---- B43C09A7126E294D00F08921 /* missing */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = missing; sourceTree = ""; }; B43C09A8126E294D00F08921 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; B43C09A9126E294D00F08921 /* stamp-h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "stamp-h.in"; sourceTree = ""; }; ! B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.5561.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libmdnsclient-2.8.02.5561.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C09F7126E2ECD00F08921 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; B43C0ABF126E2F1D00F08921 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = ../../../../../../../../usr/lib/libresolv.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; B43C0AC4126E2F7C00F08921 /* libltdl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libltdl.dylib; path = ../../../../../../../../usr/lib/libltdl.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; ! B43C0AE8126E323400F08921 /* libcvstools-2.8.02.5561.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcvstools-2.8.02.5561.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; B43C0BD9127A036100F08921 /* ext_xdiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ext_xdiff.cpp; sourceTree = ""; }; B43C0BDD127A036100F08921 /* xdiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xdiff.h; sourceTree = ""; }; B43C0BDE127A036100F08921 /* xml_xdiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_xdiff.cpp; sourceTree = ""; }; *************** *** 2040,2046 **** isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ! B43C09ED126E2E2D00F08921 /* libmdnsclient-2.8.02.4667.dylib in Frameworks */, B43C08C5126E288400F08921 /* libexpat.dylib in Frameworks */, B43C098B126E28FB00F08921 /* libiconv.dylib in Frameworks */, B43C0AC0126E2F1D00F08921 /* libresolv.dylib in Frameworks */, --- 2040,2046 ---- isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ! B43C09ED126E2E2D00F08921 /* libmdnsclient-2.8.02.5561.dylib in Frameworks */, B43C08C5126E288400F08921 /* libexpat.dylib in Frameworks */, B43C098B126E28FB00F08921 /* libiconv.dylib in Frameworks */, B43C0AC0126E2F1D00F08921 /* libresolv.dylib in Frameworks */, *************** *** 2067,2073 **** buildActionMask = 2147483647; files = ( B43C0B07126E32F800F08921 /* libcvsgui.a in Frameworks */, ! B43C0B00126E32D700F08921 /* libcvsapi-2.8.02.4667.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; --- 2067,2073 ---- buildActionMask = 2147483647; files = ( B43C0B07126E32F800F08921 /* libcvsgui.a in Frameworks */, ! B43C0B00126E32D700F08921 /* libcvsapi-2.8.02.5561.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; *************** *** 2318,2327 **** B43C0794126E1F2000F08921 /* dftables */, B43C082D126E235100F08921 /* libdiff.a */, B43C087C126E251800F08921 /* libcvsgui.a */, ! B43C0894126E27A800F08921 /* libcvsapi-2.8.02.4667.dylib */, B43C0994126E293A00F08921 /* libltdl.a */, ! B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.4667.dylib */, ! B43C0AE8126E323400F08921 /* libcvstools-2.8.02.4667.dylib */, B49756DA127A07B400BD6F4C /* extdiff.so */, B49756F6127A093E00BD6F4C /* sqlite.so */, B497571A127A0A0D00BD6F4C /* odbc.so */, --- 2318,2327 ---- B43C0794126E1F2000F08921 /* dftables */, B43C082D126E235100F08921 /* libdiff.a */, B43C087C126E251800F08921 /* libcvsgui.a */, ! B43C0894126E27A800F08921 /* libcvsapi-2.8.02.5561.dylib */, B43C0994126E293A00F08921 /* libltdl.a */, ! B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.5561.dylib */, ! B43C0AE8126E323400F08921 /* libcvstools-2.8.02.5561.dylib */, B49756DA127A07B400BD6F4C /* extdiff.so */, B49756F6127A093E00BD6F4C /* sqlite.so */, B497571A127A0A0D00BD6F4C /* odbc.so */, *************** *** 3840,3846 **** ); name = "libcvsapi (unused)"; productName = libcvsapi; ! productReference = B43C0894126E27A800F08921 /* libcvsapi-2.8.02.4667.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B43C0993126E293A00F08921 /* libltdl (unused) */ = { --- 3840,3846 ---- ); name = "libcvsapi (unused)"; productName = libcvsapi; ! productReference = B43C0894126E27A800F08921 /* libcvsapi-2.8.02.5561.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B43C0993126E293A00F08921 /* libltdl (unused) */ = { *************** *** 3873,3879 **** ); name = "libmdnsclient (unused)"; productName = mdnsclient; ! productReference = B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.4667.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B43C0AE7126E323400F08921 /* libcvstools (unused) */ = { --- 3873,3879 ---- ); name = "libmdnsclient (unused)"; productName = mdnsclient; ! productReference = B43C09DC126E2DC800F08921 /* libmdnsclient-2.8.02.5561.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B43C0AE7126E323400F08921 /* libcvstools (unused) */ = { *************** *** 3892,3898 **** ); name = "libcvstools (unused)"; productName = cvstools; ! productReference = B43C0AE8126E323400F08921 /* libcvstools-2.8.02.4667.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B45BE989141571F400BBA2C7 /* mysql.so */ = { --- 3892,3898 ---- ); name = "libcvstools (unused)"; productName = cvstools; ! productReference = B43C0AE8126E323400F08921 /* libcvstools-2.8.02.5561.dylib */; productType = "com.apple.product-type.library.dynamic"; }; B45BE989141571F400BBA2C7 /* mysql.so */ = { Index: protocols/sserver.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver.c,v retrieving revision 1.16.2.44.4.16 diff -c -r1.16.2.44.4.16 sserver.cpp *** protocols/sserver.cpp 3 Nov 2016 04:20:25 -0000 1.16.2.44.4.16 --- protocols/sserver.cpp 8 Nov 2016 04:09:37 -0000 *************** *** 323,330 **** --- 323,334 ---- else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + ctx = SSL_CTX_new (SSLv3_client_method ()); + #else // was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD ctx = SSL_CTX_new (TLS_client_method ()); + #endif SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); *************** *** 395,401 **** --- 399,409 ---- } } + #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl); + #else const SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl); + #endif if (client_cipher==NULL) { if (eventlogciphers) *************** *** 553,560 **** --- 561,572 ---- 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()"); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + ctx = SSL_CTX_new (SSLv23_server_method ()); + #else // was SSLv23_server_method - not supported in OpenSSL 1.1 ctx = SSL_CTX_new (TLS_server_method ()); + #endif CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_CTX_set_options()"); SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); *************** *** 673,679 **** --- 685,695 ---- X509 *cert = SSL_get_peer_certificate(ssl); CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher()"); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl); + #else const SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl); + #endif if (server_cipher==NULL) { CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher() is NULL"); *************** *** 1005,1012 **** --- 1021,1032 ---- else ssl_library_version_str=strdup("ssl library version unknown"); SSL_load_error_strings (); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + ctx = SSL_CTX_new (SSLv3_client_method ()); + #else // was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD ctx = SSL_CTX_new (TLS_client_method ()); + #endif SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); Index: protocols/sync.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sync.cpp,v retrieving revision 1.8.8.15 diff -c -r1.8.8.15 sync.cpp *** protocols/sync.cpp 4 Nov 2016 01:14:27 -0000 1.8.8.15 --- protocols/sync.cpp 8 Nov 2016 04:02:25 -0000 *************** *** 197,204 **** --- 197,208 ---- OPENSSL_init_ssl(0, NULL); #endif SSL_load_error_strings (); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + ctx = SSL_CTX_new (SSLv3_client_method ()); + #else // was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD ctx = SSL_CTX_new (TLS_client_method ()); + #endif SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL); *************** *** 321,328 **** --- 325,336 ---- OPENSSL_init_ssl(0, NULL); #endif SSL_load_error_strings (); + #if OPENSSL_VERSION_NUMBER < 0x10100000L + ctx = SSL_CTX_new (SSLv23_server_method ()); + #else // was SSLv23_server_method - not supported in OpenSSL 1.1 ctx = SSL_CTX_new (TLS_server_method ()); + #endif SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2); SSL_CTX_load_verify_locations(ctx,certs,NULL);