From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 26 Jan 2012 21:32:25 +0000 (-0700)
Subject: No need to require s->key to be set: s->cert is used instead when needed.
X-Git-Tag: BumpSslServerFirst.take04~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c1eed480baac7e7a30cc41df8797e23a6a9296;p=thirdparty%2Fsquid.git

No need to require s->key to be set: s->cert is used instead when needed.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 189aa0ffe4..5f325270cc 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -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);
         }
     }