From 170cb017ecd2ec030025c2214c840144623410f2 Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Thu, 6 Jun 2013 18:18:11 -0600 Subject: [PATCH] SourceFormat Enforcement --- src/ssl/cert_validate_message.cc | 2 +- src/ssl/support.cc | 6 +++--- src/ssl/support.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ssl/cert_validate_message.cc b/src/ssl/cert_validate_message.cc index 4559b0a0ea..15e5213354 100644 --- a/src/ssl/cert_validate_message.cc +++ b/src/ssl/cert_validate_message.cc @@ -32,7 +32,7 @@ Ssl::CertValidationMsg::composeRequest(CertValidationRequest const &vcert) body +="\n"; body = body + param_error_name + xitoa(i) + "=" + GetErrorName(err->element.code) + "\n"; int errorCertPos = -1; - if (err->element.cert.get()) + if (err->element.cert.get()) errorCertPos = sk_X509_find(peerCerts, err->element.cert.get()); if (errorCertPos < 0) { // assert this error ? diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 105d1e322e..ebdbc634a8 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -1601,7 +1601,7 @@ bool Ssl::generateUntrustedCert(X509_Pointer &untrustedCert, EVP_PKEY_Pointer &u } Ssl::CertError::CertError(ssl_error_t anErr, X509 *aCert): code(anErr) -{ +{ cert.resetAndLock(aCert); } @@ -1611,9 +1611,9 @@ Ssl::CertError::CertError(CertError const &err): code(err.code) } Ssl::CertError & -Ssl::CertError::operator = (const CertError &old) +Ssl::CertError::operator = (const CertError &old) { - code = old.code; + code = old.code; cert.resetAndLock(old.cert.get()); return *this; } diff --git a/src/ssl/support.h b/src/ssl/support.h index e2ea797c4b..0a183b606d 100644 --- a/src/ssl/support.h +++ b/src/ssl/support.h @@ -76,7 +76,8 @@ typedef CbDataList Errors; /// An SSL certificate-related error. /// Pairs an error code with the certificate experiencing the error. -class CertError { +class CertError +{ public: ssl_error_t code; ///< certificate error code X509_Pointer cert; ///< certificate with the above error code -- 2.47.3