opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1986: do not set CLIENT_SSL flag with libmariadb, which seems to cause a "bad handshake" in mysql_real_connect()

Browse Source
This commit is contained in:
Ansgar Becker
2025-03-16 13:40:52 +01:00
parent 888a021d39
commit 09edb5448a
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/dbconnection.pas
View File

@ -663,7 +663,7 @@ type
FLastRawResults: TMySQLRawResults;
FStatementNum: Cardinal;
procedure SetActive(Value: Boolean); override;
procedure SetOption(Option: Integer; Arg: PAnsiChar);
procedure SetOption(Option: Integer; Arg: Pointer);
procedure DoBeforeConnect; override;
procedure DoAfterConnect; override;
function GetThreadId: Int64; override;
@ -2434,7 +2434,7 @@ procedure TMySQLConnection.SetActive( Value: Boolean );
var
Connected: PMYSQL;
ClientFlags, FinalPort, SSLoption: Integer;
VerifyServerCert: Byte;
VerifyServerCert: Integer;
Error, StatusName: String;
FinalHost, FinalSocket, FinalUsername, FinalPassword: String;
ErrorHint: String;
@ -2473,7 +2473,7 @@ begin
SetOption(FLib.MYSQL_OPT_SSL_CA, PAnsiChar(AnsiString(FParameters.SSLCACertificate)));
if FParameters.SSLCipher <> '' then
SetOption(FLib.MYSQL_OPT_SSL_CIPHER, PAnsiChar(AnsiString(FParameters.SSLCipher)));
if FLib.MYSQL_OPT_SSL_MODE <> TMySQLLib.INVALID_OPT then begin
if not FLib.IsLibMariadb then begin
// MySQL
Log(lcInfo, 'SSL parameters for MySQL');
case FParameters.SSLVerification of
@ -2539,7 +2539,7 @@ begin
or CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA;
if Parameters.Compressed then
ClientFlags := ClientFlags or CLIENT_COMPRESS;
if Parameters.WantSSL then
if Parameters.WantSSL and (not FLib.IsLibMariadb) then
ClientFlags := ClientFlags or CLIENT_SSL;
// Point libmysql to the folder with client plugins
@ -3206,7 +3206,7 @@ begin
end;
procedure TMySQLConnection.SetOption(Option: Integer; Arg: PAnsiChar);
procedure TMySQLConnection.SetOption(Option: Integer; Arg: Pointer);
var
SetOptionResult: Integer;
RttiContext: TRttiContext;
@ -3215,8 +3215,6 @@ var
FieldName: String;
begin
// Set one of the MYSQL_* option and log a warning if that failed
SetOptionResult := FLib.mysql_options(FHandle, Option, Arg);
if SetOptionResult <> 0 then begin
FieldName := Option.ToString;
// Attempt to find readable name of option constant
RttiContext := TRttiContext.Create;
@ -3232,6 +3230,10 @@ begin
end;
end;
RttiContext.Free;
Log(lcDebug, Format('Calling mysql_options(%s, ...)', [FieldName]));
SetOptionResult := FLib.mysql_options(FHandle, Option, Arg);
if SetOptionResult <> 0 then begin
Log(lcError, _(SLogPrefixWarning) + ': mysql_options(' + FieldName + ', ...) failed!');
end;
end;

15
source/dbstructures.mysql.pas
View File

@ -277,7 +277,7 @@ type
mysql_info: function(Handle: PMYSQL): PAnsiChar; stdcall;
mysql_num_fields: function(Result: PMYSQL_RES): Integer; stdcall;
mysql_num_rows: function(Result: PMYSQL_RES): Int64; stdcall;
mysql_options: function(Handle: PMYSQL; Option: Integer; arg: PAnsiChar): Integer; stdcall;
mysql_options: function(Handle: PMYSQL; Option: Integer; arg: Pointer): Integer; stdcall;
mysql_optionsv: function(Handle: PMYSQL; Option: Integer; arg, val: PAnsiChar): Integer; stdcall;
mysql_ping: function(Handle: PMYSQL): Integer; stdcall;
mysql_real_connect: function(Handle: PMYSQL; const Host, User, Passwd, Db: PAnsiChar; Port: Cardinal; const UnixSocket: PAnsiChar; ClientFlag: Cardinal): PMYSQL; stdcall;
@ -292,8 +292,8 @@ type
mysql_warning_count: function(Handle: PMYSQL): Cardinal; stdcall;
const
INVALID_OPT = -1;
MYBOOL_FALSE: Byte = 0;
MYBOOL_TRUE: Byte = 1;
MYBOOL_FALSE: Integer = 0;
MYBOOL_TRUE: Integer = 1;
protected
procedure AssignProcedures; override;
public
@ -316,6 +316,7 @@ type
SSL_MODE_VERIFY_CA,
SSL_MODE_VERIFY_IDENTITY: Integer;
constructor Create(DllFile, DefaultDll: String); override;
function IsLibMariadb: Boolean;
end;
var
MySQLKeywords: TStringList;
@ -3154,7 +3155,7 @@ begin
SSL_MODE_REQUIRED := 3;
SSL_MODE_VERIFY_CA := 4;
SSL_MODE_VERIFY_IDENTITY := 5;
if ExtractFileName(FDllFile).StartsWith('libmariadb', True) then begin
if IsLibMariadb then begin
// Differences in libmariadb
MYSQL_OPT_SSL_VERIFY_SERVER_CERT := 21;
MARIADB_OPT_TLS_VERSION := 7005;
@ -3173,6 +3174,12 @@ begin
end;
end;
function TMySQLLib.IsLibMariadb: Boolean;
begin
// libmariadb used (not libmysql) ?
Result := ExtractFileName(FDllFile).StartsWith('libmariadb', True);
end;
procedure TMySQLLib.AssignProcedures;
begin
AssignProc(@mysql_affected_rows, 'mysql_affected_rows');