From: Automatic source maintenance Date: Wed, 9 Nov 2011 01:35:19 +0000 (-0700) Subject: SourceFormat Enforcement X-Git-Tag: BumpSslServerFirst.take01~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef5fbcfffaee57a133ad0cbd56a7bc7dea88ee52;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/forward.cc b/src/forward.cc index e647de2287..f076604e58 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -626,8 +626,7 @@ FwdState::negotiateSSL(int fd) // and will be released when ssl object destroyed. // Copy errFromFailure to a new Ssl::ErrorDetail object anErr->detail = new Ssl::ErrorDetail(*errFromFailure); - } - else { + } else { // clientCert can be be NULL X509 *client_cert = SSL_get_peer_certificate(ssl); anErr->detail = new Ssl::ErrorDetail(SQUID_ERR_SSL_HANDSHAKE, client_cert); diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc index 09612fdbbc..8c2c2f8430 100644 --- a/src/ssl/ErrorDetail.cc +++ b/src/ssl/ErrorDetail.cc @@ -17,9 +17,9 @@ SslErrors TheSslErrors; static SslErrorEntry TheSslErrorArray[] = { {SQUID_ERR_SSL_HANDSHAKE, - "SQUID_ERR_SSL_HANDSHAKE"}, + "SQUID_ERR_SSL_HANDSHAKE"}, {SQUID_X509_V_ERR_DOMAIN_MISMATCH, - "SQUID_X509_V_ERR_DOMAIN_MISMATCH"}, + "SQUID_X509_V_ERR_DOMAIN_MISMATCH"}, {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT"}, {X509_V_ERR_UNABLE_TO_GET_CRL,