Index: control-panel/cvscontrol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/control-panel/cvscontrol.vc170.vcxproj,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 cvscontrol.vc170.vcxproj *** control-panel/cvscontrol.vc170.vcxproj 26 Aug 2024 10:29:57 -0000 1.1.2.3 --- control-panel/cvscontrol.vc170.vcxproj 6 Sep 2024 00:25:37 -0000 *************** *** 156,168 **** - - - {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false --- 156,168 ---- {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false + + + Index: cvsntcpl/cvsntcpl.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsntcpl/cvsntcpl.vc170.vcxproj,v retrieving revision 1.1.2.4 diff -c -r1.1.2.4 cvsntcpl.vc170.vcxproj *** cvsntcpl/cvsntcpl.vc170.vcxproj 28 Sep 2024 08:22:39 -0000 1.1.2.4 --- cvsntcpl/cvsntcpl.vc170.vcxproj 28 Sep 2024 09:37:54 -0000 *************** *** 110,116 **** true .\cvsnt.def true ! $(TargetDir)/$(TargetName).pdb false ..\WinRel\cvsntcpl.map NotSet --- 110,116 ---- true .\cvsnt.def true ! $(TargetDir)/$(ProjectName).pdb false ..\WinRel\cvsntcpl.map NotSet *************** *** 172,178 **** true .\cvsnt.def true ! $(TargetDir)/$(TargetName).pdb false ..\WinDebug\cvsntcpl.map Windows --- 172,178 ---- true .\cvsnt.def true ! $(TargetDir)/$(ProjectName).pdb false ..\WinDebug\cvsntcpl.map Windows Index: lockservice/res2/lockservice-w10.rc2 =================================================================== RCS file: lockservice/res2/lockservice-w10.rc2 diff -N lockservice/res2/lockservice-w10.rc2 *** /dev/null 1 Jan 1970 00:00:00 -0000 --- lockservice/res2/lockservice-w10.rc2 5 Sep 2024 20:52:54 -0000 *************** *** 0 **** --- 1,18 ---- + #ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ + #endif //APSTUDIO_INVOKED + + + ///////////////////////////////////////////////////////////////////////////// + // Add manually edited resources here... + + ///////////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////////// + + #define PROJECTNAME "lockservice" + #define PROJECTDESCRIPTION "cvsnt lock service" + #define PROJECTFILENAME "cvslock.exe" + #include "..\windows-NT\VersionInfoCommon.rc2" + + 1 RT_MANIFEST "res2\lockservice-w10.manifest" Index: protocols/enum_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/enum_protocol.vc170.vcxproj,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 enum_protocol.vc170.vcxproj *** protocols/enum_protocol.vc170.vcxproj 26 Aug 2024 10:29:57 -0000 1.1.2.3 --- protocols/enum_protocol.vc170.vcxproj 5 Sep 2024 20:40:55 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug-Enum\ true true .\Release\ ! .\Release-Enum\ false true Index: protocols/sserver.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver.c,v retrieving revision 1.16.2.44.4.2.2.18 diff -c -r1.16.2.44.4.2.2.18 sserver.cpp *** protocols/sserver.cpp 19 Aug 2024 01:12:26 -0000 1.16.2.44.4.2.2.18 --- protocols/sserver.cpp 29 Sep 2024 04:09:49 -0000 *************** *** 40,45 **** --- 40,46 ---- #include "resource.h" #endif + const char* ssl_version(const char* infmt, const char* instr); static int sserver_connect(const struct protocol_interface *protocol, int verify_only, bool isclient, bool isorig); static int sserver_disconnect(const struct protocol_interface *protocol); static int sserver_login(const struct protocol_interface *protocol, char *password); *************** *** 78,84 **** { { PLUGIN_INTERFACE_VERSION, ! "protocol: :sserver: (client/server)",CVSNT_PRODUCTVERSION_STRING,"SserverProtocol", "", init, destroy, --- 79,86 ---- { { PLUGIN_INTERFACE_VERSION, ! //"protocol: :sserver: (client/server)",CVSNT_PRODUCTVERSION_STRING,"SserverProtocol", ! "protocol: :sserver: (client/server)",ssl_version("%0.14s [%s]",CVSNT_PRODUCTVERSION_STRING),"SserverProtocol", "", init, destroy, *************** *** 90,96 **** #endif }, "sserver", ! "sserver " CVSNT_PRODUCTVERSION_STRING, ":sserver[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ --- 92,99 ---- #endif }, "sserver", ! //"sserver " CVSNT_PRODUCTVERSION_STRING, ! ssl_version("%0.14s [%s]","sserver " CVSNT_PRODUCTVERSION_STRING), // OpenSSL 3.0.15 3 Sep 2024 ":sserver[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ *************** *** 158,163 **** --- 161,175 ---- return &sserver_protocol_interface.plugin; } + const char* ssl_version(const char* infmt, const char* instr) + { + char sslver_result[500]; + sprintf(sslver_result, infmt, OPENSSL_VERSION_TEXT, instr); + + // a small memory leak + return strdup(sslver_result); + } + int sserver_connect(const struct protocol_interface *protocol, int verify_only, bool isclient, bool isorig) { char crypt_password[64]; *************** *** 173,180 **** int sserver_version = 0; int ssl_version_no = SSL3_VERSION; int ssl_version_set = 0; ! const char *ssl_library_version; ! char *ssl_library_version_str; char certs[4096]; int strict = 0; int eventlogciphers = 0; --- 185,192 ---- int sserver_version = 0; int ssl_version_no = SSL3_VERSION; int ssl_version_set = 0; ! const char* ssl_library_version; ! char* ssl_library_version_str; char certs[4096]; int strict = 0; int eventlogciphers = 0; Index: protocols/sserver.rc =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver.rc,v retrieving revision 1.1.2.3.10.1 diff -c -r1.1.2.3.10.1 sserver.rc *** protocols/sserver.rc 31 May 2024 12:00:47 -0000 1.1.2.3.10.1 --- protocols/sserver.rc 5 Sep 2024 20:58:28 -0000 *************** *** 8,13 **** --- 8,14 ---- // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" + #include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS *************** *** 38,49 **** "\0" END ! 3 TEXTINCLUDE BEGIN ! "\r\n" ! "\0" END #endif // APSTUDIO_INVOKED #endif // English (U.S.) resources --- 39,58 ---- "\0" END ! 3 TEXTINCLUDE BEGIN ! "#ifdef _WIN32\r\n" ! "LANGUAGE 9, 1\r\n" ! "#pragma code_page(1252)\r\n" ! "#endif\r\n" ! "#include \r\n" ! "#include ""..\\version_no.h"" // master version number defs\r\n" ! "#include ""..\\version_fu.h"" // version number macros\r\n" ! "#include ""res\\sserver.rc2"" // non-Microsoft Visual C++ edited resources\r\n" ! "\0" END + #endif // APSTUDIO_INVOKED #endif // English (U.S.) resources *************** *** 89,95 **** WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,107,140,50,14 PUSHBUTTON "Cancel",IDCANCEL,159,140,50,14 ! CTEXT "OpenSSL Version 3.0", IDC_SSLVER,7,165,300,8,SS_NOPREFIX | SS_NOTIFY CTEXT "Copyright (C) 1999-2024 March Hare Software UG", IDC_NOTICE,7,186,300,8,SS_NOPREFIX | SS_NOTIFY --- 98,104 ---- WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,107,140,50,14 PUSHBUTTON "Cancel",IDCANCEL,159,140,50,14 ! CTEXT OPENSSL_VERSION_TEXT, IDC_SSLVER,7,165,300,8,SS_NOPREFIX | SS_NOTIFY CTEXT "Copyright (C) 1999-2024 March Hare Software UG", IDC_NOTICE,7,186,300,8,SS_NOPREFIX | SS_NOTIFY *************** *** 143,148 **** --- 152,165 ---- // Generated from the TEXTINCLUDE 3 resource. // + #ifdef _WIN32 + LANGUAGE 9, 1 + #pragma code_page(1252) + #endif + #include + #include "..\version_no.h" // master version number defs + #include "..\version_fu.h" // version number macros + #include "res\sserver.rc2" // non-Microsoft Visual C++ edited resources ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Index: protocols/sserver_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver_protocol.vc170.vcxproj,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 sserver_protocol.vc170.vcxproj *** protocols/sserver_protocol.vc170.vcxproj 26 Aug 2024 10:29:57 -0000 1.1.2.3 --- protocols/sserver_protocol.vc170.vcxproj 29 Sep 2024 05:13:34 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug-Sserver\ true true .\Release\ ! .\Release-Sserver\ false true *************** *** 94,100 **** /MACHINE:I386 %(AdditionalOptions) ! odbc32.lib;odbccp32.lib;Ws2_32.lib;libcrypto_vc71.lib;libssl_vc71.lib;%(AdditionalDependencies) ../WinDebug/protocols/sserver.dll true ..\..\cvsdeps\openSSL\lib;%(AdditionalLibraryDirectories) --- 94,100 ---- /MACHINE:I386 %(AdditionalOptions) ! odbc32.lib;odbccp32.lib;Ws2_32.lib;libcrypto_vc143.lib;libssl_vc143.lib;%(AdditionalDependencies) ../WinDebug/protocols/sserver.dll true ..\..\cvsdeps\openSSL\lib;%(AdditionalLibraryDirectories) *************** *** 107,112 **** --- 107,114 ---- .\Debug/sserver_protocol.lib MachineX86 + + *************** *** 148,154 **** /MACHINE:I386 %(AdditionalOptions) ! odbc32.lib;odbccp32.lib;wsock32.lib;libcrypto_vc71.lib;libssl_vc71.lib;%(AdditionalDependencies) ../WinRel/protocols/sserver.dll true ..\..\cvsdeps\openSSL\lib;%(AdditionalLibraryDirectories) --- 150,156 ---- /MACHINE:I386 %(AdditionalOptions) ! odbc32.lib;odbccp32.lib;wsock32.lib;libcrypto_vc143.lib;libssl_vc143.lib;%(AdditionalDependencies) ../WinRel/protocols/sserver.dll true ..\..\cvsdeps\openSSL\lib;%(AdditionalLibraryDirectories) *************** *** 166,171 **** --- 168,174 ---- .\Release/sserver_protocol.lib MachineX86 + libcrypto-3_0_vc143.dll;libssl-3_0_vc143.dll *************** *** 192,197 **** --- 195,203 ---- {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false + + + Index: protocols/res/sserver.rc2 =================================================================== RCS file: protocols/res/sserver.rc2 diff -N protocols/res/sserver.rc2 *** /dev/null 1 Jan 1970 00:00:00 -0000 --- protocols/res/sserver.rc2 5 Sep 2024 20:42:26 -0000 *************** *** 0 **** --- 1,21 ---- + // + // CVSDIAG.RC2 - resources Microsoft Visual C++ does not edit directly + // + + #ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ + #endif //APSTUDIO_INVOKED + + + ///////////////////////////////////////////////////////////////////////////// + // Add manually edited resources here... + + ///////////////////////////////////////////////////////////////////////////// + + //#include "..\..\cvsservice\ServiceMsg.rc" + + #define PROJECTNAME "sserver" + #define PROJECTDESCRIPTION "CVS Suite CVSNT SSERVER Protocol [" OPENSSL_VERSION_TEXT "]" + #define PROJECTFILENAME "sserver.dll" + #include "..\windows-NT\VersionInfoCommon.rc2" +