Index: sserver.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sserver.c,v
retrieving revision 1.16.2.44.4.2.2.10
diff -c -r1.16.2.44.4.2.2.10 sserver.cpp
*** sserver.cpp	9 Nov 2016 02:15:55 -0000	1.16.2.44.4.2.2.10
--- sserver.cpp	14 Feb 2020 01:49:22 -0000
***************
*** 305,311 ****
  		  send_client_version = true;
  	}
  
! #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
  #else
  	OPENSSL_init_ssl(0, NULL);
--- 305,311 ----
  		  send_client_version = true;
  	}
  
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_library_init();
  #else
  	OPENSSL_init_ssl(0, NULL);
***************
*** 316,322 ****
  	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
--- 316,322 ----
  	else
  		ssl_library_version_str=strdup("ssl library version unknown");
  	SSL_load_error_strings ();
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	ctx = SSL_CTX_new (SSLv3_client_method ()); 
  #else
  	// was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD
***************
*** 392,398 ****
  		}
  	}
  
! #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);
--- 392,398 ----
  		}
  	}
  
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl);
  #else
  	const SSL_CIPHER *client_cipher = SSL_get_current_cipher(ssl);
***************
*** 537,543 ****
  		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);
--- 537,543 ----
  		strncpy(server_ciphers,"HIGH:!EXPORT",sizeof(server_ciphers));
  
  	CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_library_init()");
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_library_init();
  #else
  	OPENSSL_init_ssl(0, NULL);
***************
*** 552,558 ****
  	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
--- 552,558 ----
  	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 < 0x10002000L
  	ctx = SSL_CTX_new (SSLv23_server_method ());
  #else
  	// was SSLv23_server_method - not supported in OpenSSL 1.1
***************
*** 676,682 ****
  	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);
--- 676,682 ----
  	X509 *cert = SSL_get_peer_certificate(ssl);
  
  	CServerIo::trace(99,"SSERVER:auth_protocol_connect() -- SSL_get_current_cipher()");
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl);
  #else
  	const SSL_CIPHER *server_cipher = SSL_get_current_cipher(ssl);
Index: sync.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sync.cpp,v
retrieving revision 1.8.8.7.2.6
diff -c -r1.8.8.7.2.6 sync.cpp
*** sync.cpp	9 Nov 2016 02:15:55 -0000	1.8.8.7.2.6
--- sync.cpp	14 Feb 2020 01:49:22 -0000
***************
*** 191,203 ****
  		cvs::sleep(10);
  	}
  
! #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
  #else
  	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
--- 191,203 ----
  		cvs::sleep(10);
  	}
  
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_library_init();
  #else
  	OPENSSL_init_ssl(0, NULL);
  #endif
  	SSL_load_error_strings ();
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	ctx = SSL_CTX_new (SSLv3_client_method ());
  #else
  	// was SSLv3_client_method - to use that would need to #undef OPENSSL_NO_SSL3_METHOD
***************
*** 319,331 ****
  	if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","CAFile",certs,sizeof(certs)))
  		snprintf(certs,sizeof(certs),"%s/ca.pem",PATCH_NULL(current_server()->config_dir));
  
! #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
  #else
  	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
--- 319,331 ----
  	if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","CAFile",certs,sizeof(certs)))
  		snprintf(certs,sizeof(certs),"%s/ca.pem",PATCH_NULL(current_server()->config_dir));
  
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	SSL_library_init();
  #else
  	OPENSSL_init_ssl(0, NULL);
  #endif
  	SSL_load_error_strings ();
! #if OPENSSL_VERSION_NUMBER < 0x10002000L
  	ctx = SSL_CTX_new (SSLv23_server_method ());
  #else
  	// was SSLv23_server_method - not supported in OpenSSL 1.1