sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Unused code obsoleted by 64050d10

Browse Source 
Source commit: 92ea806f97f6683c5e5158c7236b49ce04aa620c
This commit is contained in:
Martin Prikryl
2026-10-02 16:26:07 +00:00
parent 86413f4712
commit a6916d4101
6 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/core/FtpFileSystem.cpp
View File

@@ -4311,7 +4311,7 @@ bool __fastcall TFTPFileSystem::HandleAsynchRequestVerifyCertificate(
if (RequestResult == 0)
{
if (FTerminal->ConfirmCertificate(FSessionInfo, Data.VerificationResult, FtpsCertificateStorageKey, true))
if (FTerminal->ConfirmCertificate(FSessionInfo, Data.VerificationResult, FtpsCertificateStorageKey))
{
// FZ's VerifyCertDlg.cpp returns 2 for "cached", what we do nto distinguish here,
// however FZAPI takes all non-zero values equally.

2
source/core/S3FileSystem.cpp
View File

@@ -680,7 +680,7 @@ bool TS3FileSystem::VerifyCertificate(TNeonCertificateData Data)
{
bool Result =
FTerminal->VerifyOrConfirmHttpCertificate(
FTerminal->SessionData->HostNameExpanded, FTerminal->SessionData->PortNumber, Data, true, FSessionInfo);
FTerminal->SessionData->HostNameExpanded, FTerminal->SessionData->PortNumber, Data, FSessionInfo);
if (Result)
{

9
source/core/Terminal.cpp
View File

@@ -8776,8 +8776,7 @@ bool __fastcall TTerminal::VerifyCertificate(
return Result;
}
//---------------------------------------------------------------------------
bool __fastcall TTerminal::ConfirmCertificate(
TSessionInfo & SessionInfo, int Failures, const UnicodeString & CertificateStorageKey, bool CanRemember)
bool TTerminal::ConfirmCertificate(TSessionInfo & SessionInfo, int Failures, const UnicodeString & CertificateStorageKey)
{
TClipboardHandler ClipboardHandler;
ClipboardHandler.Text =
@@ -8825,7 +8824,7 @@ bool __fastcall TTerminal::ConfirmCertificate(
}
// Cache only if the certificate was accepted manually
if (Result && CanRemember)
if (Result)
{
Configuration->RememberLastFingerprint(
SessionData->SiteKey, TlsFingerprintType, SessionInfo.CertificateFingerprintSHA256);
@@ -8850,7 +8849,7 @@ void __fastcall TTerminal::CacheCertificate(
//---------------------------------------------------------------------------
// Shared implementation for WebDAV and S3
bool TTerminal::VerifyOrConfirmHttpCertificate(
const UnicodeString & AHostName, int APortNumber, const TNeonCertificateData & AData, bool CanRemember,
const UnicodeString & AHostName, int APortNumber, const TNeonCertificateData & AData,
TSessionInfo & SessionInfo)
{
TNeonCertificateData Data = AData;
@@ -8902,7 +8901,7 @@ bool TTerminal::VerifyOrConfirmHttpCertificate(
if (!Result)
{
if (ConfirmCertificate(SessionInfo, Data.Failures, HttpsCertificateStorageKey, CanRemember))
if (ConfirmCertificate(SessionInfo, Data.Failures, HttpsCertificateStorageKey))
{
Result = true;
SessionInfo.CertificateVerifiedManually = true;

6
source/core/Terminal.h
View File

@@ -472,11 +472,9 @@ protected:
void __fastcall CacheCertificate(const UnicodeString & CertificateStorageKey,
const UnicodeString & SiteKey, const UnicodeString & FingerprintSHA1, const UnicodeString & FingerprintSHA256,
int Failures);
bool __fastcall ConfirmCertificate(
TSessionInfo & SessionInfo, int Failures, const UnicodeString & CertificateStorageKey, bool CanRemember);
bool ConfirmCertificate(TSessionInfo & SessionInfo, int Failures, const UnicodeString & CertificateStorageKey);
bool VerifyOrConfirmHttpCertificate(
const UnicodeString & AHostName, int APortNumber, const TNeonCertificateData & Data, bool CanRemember,
TSessionInfo & SessionInfo);
const UnicodeString & AHostName, int APortNumber, const TNeonCertificateData & Data, TSessionInfo & SessionInfo);
void __fastcall CollectTlsUsage(const UnicodeString & TlsVersionStr);
bool __fastcall LoadTlsCertificate(X509 *& Certificate, EVP_PKEY *& PrivateKey);
bool __fastcall TryStartOperationWithFile(

28
source/core/WebDAVFileSystem.cpp
View File

@@ -283,12 +283,6 @@ void TWebDAVFileSystem::NeonClientOpenSessionInternal(UnicodeString & CorrectedU
CorrectedUrl = Url;
}
//---------------------------------------------------------------------------
void __fastcall TWebDAVFileSystem::SetSessionTls(TSessionContext * SessionContext, ne_session_s * Session, bool Aux)
{
ne_ssl_verify_fn Callback = Aux ? NeonServerSSLCallbackAux : NeonServerSSLCallbackMain;
InitNeonTls(Session, InitSslSession, Callback, SessionContext, FTerminal);
}
//---------------------------------------------------------------------------
void __fastcall TWebDAVFileSystem::InitSession(TSessionContext * SessionContext, ne_session_s * Session)
{
TSessionData * Data = FTerminal->SessionData;
@@ -331,7 +325,7 @@ TWebDAVFileSystem::TSessionContext * TWebDAVFileSystem::NeonOpen(const UnicodeSt
if (Ssl)
{
SetSessionTls(Result.get(), Result->NeonSession, false);
InitNeonTls(Result->NeonSession, InitSslSession, NeonServerSSLCallback, Result.get(), FTerminal);
ne_ssl_provide_clicert(Result->NeonSession, NeonProvideClientCert, Result.get());
}
@@ -1831,13 +1825,13 @@ void __fastcall TWebDAVFileSystem::Sink(
FTerminal->UpdateTargetAttrs(DestFullName, File, CopyParam, Attrs);
}
//---------------------------------------------------------------------------
bool TWebDAVFileSystem::VerifyCertificate(TSessionContext * SessionContext, TNeonCertificateData Data, bool Aux)
bool TWebDAVFileSystem::VerifyCertificate(TSessionContext * SessionContext, TNeonCertificateData Data)
{
bool Result =
FTerminal->VerifyOrConfirmHttpCertificate(
SessionContext->HostName, SessionContext->PortNumber, Data, !Aux, FSessionInfo);
SessionContext->HostName, SessionContext->PortNumber, Data, FSessionInfo);
if (Result && !Aux && (SessionContext == FSessionContext))
if (Result && (SessionContext == FSessionContext))
{
CollectTLSSessionInfo();
}
@@ -1857,23 +1851,13 @@ void __fastcall TWebDAVFileSystem::CollectTLSSessionInfo()
// A neon-session callback to validate the SSL certificate when the CA
// is unknown (e.g. a self-signed cert), or there are other SSL
// certificate problems.
int TWebDAVFileSystem::DoNeonServerSSLCallback(void * UserData, int Failures, const ne_ssl_certificate * Certificate, bool Aux)
int TWebDAVFileSystem::NeonServerSSLCallback(void * UserData, int Failures, const ne_ssl_certificate * Certificate)
{
TNeonCertificateData Data;
RetrieveNeonCertificateData(Failures, Certificate, Data);
TSessionContext * SessionContext = static_cast<TSessionContext *>(UserData);
TWebDAVFileSystem * FileSystem = SessionContext->FileSystem;
return FileSystem->VerifyCertificate(SessionContext, Data, Aux) ? NE_OK : NE_ERROR;
}
//------------------------------------------------------------------------------
int TWebDAVFileSystem::NeonServerSSLCallbackMain(void * UserData, int Failures, const ne_ssl_certificate * Certificate)
{
return DoNeonServerSSLCallback(UserData, Failures, Certificate, false);
}
//------------------------------------------------------------------------------
int TWebDAVFileSystem::NeonServerSSLCallbackAux(void * UserData, int Failures, const ne_ssl_certificate * Certificate)
{
return DoNeonServerSSLCallback(UserData, Failures, Certificate, true);
return FileSystem->VerifyCertificate(SessionContext, Data) ? NE_OK : NE_ERROR;
}
//------------------------------------------------------------------------------
void TWebDAVFileSystem::NeonProvideClientCert(void * UserData, ne_session * Sess,

7
source/core/WebDAVFileSystem.h
View File

@@ -136,9 +136,7 @@ protected:
static int NeonPostSend(ne_request * Req, void * UserData, const ne_status * Status);
static void NeonPostHeaders(ne_request * Req, void * UserData, const ne_status * Status);
void ExchangeCapabilities(const char * Path, UnicodeString & CorrectedUrl);
static int DoNeonServerSSLCallback(void * UserData, int Failures, const struct ne_ssl_certificate_s * Certificate, bool Aux);
static int NeonServerSSLCallbackMain(void * UserData, int Failures, const struct ne_ssl_certificate_s * Certificate);
static int NeonServerSSLCallbackAux(void * UserData, int Failures, const struct ne_ssl_certificate_s * Certificate);
static int NeonServerSSLCallback(void * UserData, int Failures, const struct ne_ssl_certificate_s * Certificate);
static void NeonProvideClientCert(void * UserData, ne_session * Sess, const ne_ssl_dname * const * DNames, int DNCount);
void __fastcall CloseNeonSession();
bool __fastcall CancelTransfer();
@@ -185,7 +183,7 @@ private:
TRemoteFile *& File, TRemoteFile * ALinkedByFile);
int __fastcall CustomReadFileInternal(const UnicodeString FileName,
TRemoteFile *& File, TRemoteFile * ALinkedByFile);
bool VerifyCertificate(TSessionContext * SessionContext, TNeonCertificateData Data, bool Aux);
bool VerifyCertificate(TSessionContext * SessionContext, TNeonCertificateData Data);
void OpenUrl(const UnicodeString & Url);
void __fastcall CollectTLSSessionInfo();
UnicodeString __fastcall GetRedirectUrl();
@@ -201,7 +199,6 @@ private:
void __fastcall DiscardLock(const RawByteString & Path);
bool __fastcall IsNtlmAuthentication(TSessionContext * SessionContext);
static void NeonAuxRequestInit(ne_session_s * Session, ne_request * Request, void * UserData);
void __fastcall SetSessionTls(TSessionContext * SessionContext, ne_session_s * Session, bool Aux);
void __fastcall InitSession(TSessionContext * SessionContext, ne_session_s * Session);
bool IsTlsSession(ne_session * Session);
};