code cleanup and SSLVerifierResponse enum clarification as per @falbrechtskirchinger comment

This commit is contained in:
UrosG 2025-02-17 09:51:14 +01:00
parent c27d1fdbb5
commit 1be86c8328

View File

@ -436,9 +436,9 @@ private:
} // namespace detail } // namespace detail
enum SSLVerifierResponse { enum SSLVerifierResponse {
Verified, // connection certificate is verified and accepted NoDecisionMade, // no decision has been made, use the built-in certificate verifier
CheckAgain, // use the built-in certificate checker again CertificateAccepted, // connection certificate is verified and accepted
Declined // connection certificate was process but is declined CertificateRejected // connection certificate was processed but is rejected
}; };
enum StatusCode { enum StatusCode {
@ -9630,18 +9630,20 @@ inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
if (server_certificate_verification_) { if (server_certificate_verification_) {
// set default status to CheckAgain // set default status to CheckAgain
SSLVerifierResponse verificationStatus = SSLVerifierResponse::CheckAgain; SSLVerifierResponse verification_status_ = SSLVerifierResponse::NoDecisionMade;
if (server_certificate_verifier_) if (server_certificate_verifier_)
verificationStatus = server_certificate_verifier_(ssl2); {
verification_status_ = server_certificate_verifier_(ssl2);
}
if (verificationStatus == SSLVerifierResponse::Declined) if (verification_status_ == SSLVerifierResponse::CertificateRejected)
{ {
error = Error::SSLServerVerification; error = Error::SSLServerVerification;
return false; return false;
} }
if (verificationStatus == SSLVerifierResponse::CheckAgain) if (verification_status_ == SSLVerifierResponse::NoDecisionMade)
{ {
verify_result_ = SSL_get_verify_result(ssl2); verify_result_ = SSL_get_verify_result(ssl2);