]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
No need to require s->key to be set: s->cert is used instead when needed.
authorAlex Rousskov <rousskov@measurement-factory.com>
Thu, 26 Jan 2012 21:32:25 +0000 (14:32 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Thu, 26 Jan 2012 21:32:25 +0000 (14:32 -0700)
src/cache_cf.cc

index 189aa0ffe40d152f0a7e0f2de2a4a7c68b8f08e5..5f325270cc60f1f58f944a7afaabca88c3aa1577 100644 (file)
@@ -904,7 +904,7 @@ configDoConfigure(void)
         http_port_list *s;
 
         for (s = Config.Sockaddr.http; s != NULL; s = (http_port_list *) s->next) {
-            if (!s->cert && !s->key)
+            if (!s->cert)
                 continue;
 
             debugs(3, 1, "Initializing http_port " << s->http.s << " SSL context");
@@ -932,7 +932,7 @@ configDoConfigure(void)
                                        s->cafile, s->capath, s->crlfile, s->dhfile,
                                        s->sslContextSessionId));
 
-            if (s->cert && s->key && s->sslBump)
+            if (s->cert && s->sslBump)
                 Ssl::readCertChainAndPrivateKeyFromFiles(s->signingCert, s->signPkey, s->certsToChain, s->cert, s->key);
         }
     }