]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Use Security::CertPointer in ACLServerCertificateStrategy
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 6 Nov 2016 15:54:33 +0000 (04:54 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 6 Nov 2016 15:54:33 +0000 (04:54 +1300)
src/acl/ServerCertificate.cc

index 6dca5552fa9fe9f7f2aae8214965ff0d488ef808..73c7238567e40b981a10361f10bf1c1def6f591a 100644 (file)
 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 *