From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 6 Nov 2016 15:54:33 +0000 (+1300)
Subject: Use Security::CertPointer in ACLServerCertificateStrategy
X-Git-Tag: SQUID_4_0_17~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b630a182280d1a57aaaa4748eaf221672b54d64;p=thirdparty%2Fsquid.git

Use Security::CertPointer in ACLServerCertificateStrategy
---

diff --git a/src/acl/ServerCertificate.cc b/src/acl/ServerCertificate.cc
index 6dca5552fa..73c7238567 100644
--- a/src/acl/ServerCertificate.cc
+++ b/src/acl/ServerCertificate.cc
@@ -21,16 +21,16 @@
 int
 ACLServerCertificateStrategy::match(ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
 {
-    X509 *cert = NULL;
-    if (checklist->serverCert.get())
-        cert = checklist->serverCert.get();
+    Security::CertPointer cert;
+    if (checklist->serverCert)
+        cert = checklist->serverCert;
     else if (checklist->conn() != NULL && checklist->conn()->serverBump())
-        cert = checklist->conn()->serverBump()->serverCert.get();
+        cert = checklist->conn()->serverBump()->serverCert;
 
     if (!cert)
         return 0;
 
-    return data->match(cert);
+    return data->match(cert.get());
 }
 
 ACLServerCertificateStrategy *