summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket_openssl.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2019-02-11 16:07:04 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2019-02-18 16:03:56 +0000
commit28a87f1f213a84781ef6a4ddfdd3ef1362d03743 (patch)
treead091a0180f02d920b50c6a6d1a682d6a320ed82 /src/network/ssl/qsslsocket_openssl.cpp
parent94a4f06fb88ec6c7fa5e31dfd28af4e9b3cdbdd8 (diff)
OCSP response - fix API
as proposed in the API review. Change-Id: I607a38d24d533da59fc0d33dac886fa7693ed6c8 Fixes: QTBUG-73739 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 9f5a11294d..c48cd42360 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -258,29 +258,29 @@ QSslError qt_OCSP_response_status_to_QSslError(long code)
Q_UNREACHABLE();
}
-OcspRevocationReason qt_OCSP_revocation_reason(int reason)
+QOcspRevocationReason qt_OCSP_revocation_reason(int reason)
{
switch (reason) {
case OCSP_REVOKED_STATUS_NOSTATUS:
- return OcspRevocationReason::None;
+ return QOcspRevocationReason::None;
case OCSP_REVOKED_STATUS_UNSPECIFIED:
- return OcspRevocationReason::Unspecified;
+ return QOcspRevocationReason::Unspecified;
case OCSP_REVOKED_STATUS_KEYCOMPROMISE:
- return OcspRevocationReason::KeyCompromise;
+ return QOcspRevocationReason::KeyCompromise;
case OCSP_REVOKED_STATUS_CACOMPROMISE:
- return OcspRevocationReason::CACompromise;
+ return QOcspRevocationReason::CACompromise;
case OCSP_REVOKED_STATUS_AFFILIATIONCHANGED:
- return OcspRevocationReason::AffiliationChanged;
+ return QOcspRevocationReason::AffiliationChanged;
case OCSP_REVOKED_STATUS_SUPERSEDED:
- return OcspRevocationReason::Superseded;
+ return QOcspRevocationReason::Superseded;
case OCSP_REVOKED_STATUS_CESSATIONOFOPERATION:
- return OcspRevocationReason::CessationOfOperation;
+ return QOcspRevocationReason::CessationOfOperation;
case OCSP_REVOKED_STATUS_CERTIFICATEHOLD:
- return OcspRevocationReason::CertificateHold;
+ return QOcspRevocationReason::CertificateHold;
case OCSP_REVOKED_STATUS_REMOVEFROMCRL:
- return OcspRevocationReason::RemoveFromCRL;
+ return QOcspRevocationReason::RemoveFromCRL;
default:
- return OcspRevocationReason::None;
+ return QOcspRevocationReason::None;
}
Q_UNREACHABLE();
@@ -1624,15 +1624,15 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
switch (certStatus) {
case V_OCSP_CERTSTATUS_GOOD:
// This certificate was not found among the revoked ones.
- dResponse->certificateStatus = OcspCertificateStatus::Good;
+ dResponse->certificateStatus = QOcspCertificateStatus::Good;
break;
case V_OCSP_CERTSTATUS_REVOKED:
- dResponse->certificateStatus = OcspCertificateStatus::Revoked;
+ dResponse->certificateStatus = QOcspCertificateStatus::Revoked;
dResponse->revocationReason = qt_OCSP_revocation_reason(reason);
ocspErrors.push_back({QSslError::CertificateRevoked, configuration.peerCertificate});
break;
case V_OCSP_CERTSTATUS_UNKNOWN:
- dResponse->certificateStatus = OcspCertificateStatus::Unknown;
+ dResponse->certificateStatus = QOcspCertificateStatus::Unknown;
ocspErrors.push_back({QSslError::OcspStatusUnknown, configuration.peerCertificate});
}