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

Ensure we pass nil/null for empty SSL parameters, where I thought PAnsiChar('') returns nil which is not the case obviously. Tries to fix issue #2336.

Browse Source
This commit is contained in:
Ansgar Becker
2011-04-10 11:42:42 +00:00
parent 41bff877ce
commit af2df77704
1 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/dbconnection.pas
View File

@ -947,6 +947,8 @@ var
CurCharset: String;
StartupInfo: TStartupInfo;
ExitCode: LongWord;
sslca, sslkey, sslcert: PAnsiChar;
DoSSL, SSLsettingsComplete: Boolean;
begin
// Init library
if libmysql_handle = 0 then begin
@ -995,36 +997,28 @@ begin
FinalPort := FParameters.Port;
case FParameters.NetType of
ntMySQL_TCPIP: begin
if (
IsNotEmpty(FParameters.SSLCACertificate)
and IsEmpty(FParameters.SSLPrivateKey)
and IsEmpty(FParameters.SSLCertificate)
)
or
(
IsNotEmpty(FParameters.SSLCACertificate)
and IsNotEmpty(FParameters.SSLPrivateKey)
and IsNotEmpty(FParameters.SSLCertificate)
)
then
begin
sslca := nil;
sslkey := nil;
sslcert := nil;
if FParameters.SSLCACertificate <> '' then
sslca := PAnsiChar(AnsiString(FParameters.SSLCACertificate));
if FParameters.SSLPrivateKey <> '' then
sslkey := PAnsiChar(AnsiString(FParameters.SSLPrivateKey));
if FParameters.SSLCertificate <> '' then
sslcert := PAnsiChar(AnsiString(FParameters.SSLCertificate));
DoSSL := (sslca<>nil) or (sslkey<>nil) or (sslcert<>nil);
SSLsettingsComplete := ((sslca<>nil) and (sslkey<>nil) and (sslcert<>nil))
or ((sslca<>nil) and (sslkey=nil) and (sslcert=nil));
if DoSSL then begin
if not SSLsettingsComplete then
raise EDatabaseError.Create('SSL settings incomplete. Please set either CA certificate or all three SSL parameters.')
else if SSLsettingsComplete then begin
FParameters.Options := FParameters.Options + [opSSL];
{ TODO : Use Cipher and CAPath parameters }
mysql_ssl_set(
FHandle,
PansiChar(AnsiString(FParameters.SSLPrivateKey)),
PansiChar(AnsiString(FParameters.SSLCertificate)),
PansiChar(AnsiString(FParameters.SSLCACertificate)),
{PansiChar(AnsiString(FParameters.CApath))}nil,
{PansiChar(AnsiString(FParameters.Cipher))}nil);
Log(lcInfo, 'SSL parameters successfully set.')
end
else if IsNotEmpty(FParameters.SSLPrivateKey)
or IsNotEmpty(FParameters.SSLCertificate)
or IsNotEmpty(FParameters.SSLCACertificate)
then
begin
raise EDatabaseError.Create('SSL settings incomplete. Please set either CA certificate or all three SSL parameters.');
showmessage(inttostr(integer(sslkey=nil)));
mysql_ssl_set(FHandle, sslkey, sslcert, sslca, nil, nil);
Log(lcInfo, 'SSL parameters successfully set.');
end;
end;
end;