Index: osx/BuildNo.xcconfig
===================================================================
RCS file: /cvs/cvsnt/osx/BuildNo.xcconfig,v
retrieving revision 1.1.2.62
diff -c -r1.1.2.62 BuildNo.xcconfig
*** osx/BuildNo.xcconfig	3 Nov 2016 04:20:25 -0000	1.1.2.62
--- osx/BuildNo.xcconfig	4 Nov 2016 01:11:53 -0000
***************
*** 2,8 ****
  //  BuildNo.xcconfig
  //  cvsnt
  //
! //  Created by genbuild on 03.10.2016
  //
  CVSNT_Version_Buildnumber = 6145
  CVSNT_Version_Major = 2
--- 2,8 ----
  //  BuildNo.xcconfig
  //  cvsnt
  //
! //  Created by genbuild on 04.10.2016
  //
  CVSNT_Version_Buildnumber = 6145
  CVSNT_Version_Major = 2
Index: protocols/sync.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sync.cpp,v
retrieving revision 1.8.8.14
diff -c -r1.8.8.14 sync.cpp
*** protocols/sync.cpp	31 May 2016 06:09:24 -0000	1.8.8.14
--- protocols/sync.cpp	3 Nov 2016 21:46:45 -0000
***************
*** 191,199 ****
  		cvs::sleep(10);
  	}
  
  	SSL_library_init();
  	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);
  
--- 191,204 ----
  		cvs::sleep(10);
  	}
  
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
+ #else
+ 	OPENSSL_init_ssl(0, NULL);
+ #endif
  	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);
  
***************
*** 310,318 ****
  	if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","CAFile",certs,sizeof(certs)))
  		snprintf(certs,sizeof(certs),"%s/ca.pem",PATCH_NULL(current_server()->config_dir));
  
  	SSL_library_init();
  	SSL_load_error_strings ();
! 	ctx = SSL_CTX_new (SSLv23_server_method ());
  	SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2);
  
  	SSL_CTX_load_verify_locations(ctx,certs,NULL);
--- 315,328 ----
  	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 ();
! 	// was SSLv23_server_method - not supported in OpenSSL 1.1
! 	ctx = SSL_CTX_new (TLS_server_method ());
  	SSL_CTX_set_options(ctx,SSL_OP_ALL|SSL_OP_NO_SSLv2);
  
  	SSL_CTX_load_verify_locations(ctx,certs,NULL);
***************
*** 516,522 ****
  
  	va_end(va);
  
! 	return sync_write_data(NULL,temp,strlen(temp));
  }
  
  void sync_error(const char *txt, int err)
--- 526,532 ----
  
  	va_end(va);
  
! 	return sync_write_data(NULL,temp,(int)strlen(temp));
  }
  
  void sync_error(const char *txt, int err)
Index: protocols/sync_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/sync_protocol.vcproj,v
retrieving revision 1.1.2.5
diff -c -r1.1.2.5 sync_protocol.vcproj
*** protocols/sync_protocol.vcproj	13 Mar 2015 06:36:35 -0000	1.1.2.5
--- protocols/sync_protocol.vcproj	4 Nov 2016 01:11:51 -0000
***************
*** 134,140 ****
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32_vc71.lib ssleay32_vc71.lib"
  				OutputFile="../WinRel/protocols/sync.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
--- 134,140 ----
  			<Tool
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libcrypto_vc71.lib libssl_vc71.lib"
  				OutputFile="../WinRel/protocols/sync.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
***************
*** 222,229 ****
  				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32_vc71.lib ssleay32_vc71.lib bufferoverflowU.lib"
  				OutputFile="$(OutDir)/protocols/sync.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
--- 222,228 ----
  				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libcrypto_vc71-x64.lib libssl_vc71-x64.lib bufferoverflowU.lib"
  				OutputFile="$(OutDir)/protocols/sync.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
Index: tonys scripts/release_builder.bat
===================================================================
RCS file: /cvs/cvsnt/tonys scripts/release_builder.bat,v
retrieving revision 1.1.2.5.8.6
diff -c -r1.1.2.5.8.6 release_builder.bat
*** tonys scripts/release_builder.bat	3 Nov 2016 04:20:25 -0000	1.1.2.5.8.6
--- tonys scripts/release_builder.bat	4 Nov 2016 01:09:03 -0000
***************
*** 19,24 ****
--- 19,25 ----
  
  set SHELLOPTS=igncr
  bash -x release_builder.sh %1 %2 %3 2>&1 >release_builder.log
+ unix2dos -f release_builder.log
  pause
  exit /b
  :none