]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Removed kludge added to test writeCertAndPrivateKeyToMemory() failure bypass. BumpSslServerFirst.take06
authorAlex Rousskov <rousskov@measurement-factory.com>
Thu, 8 Mar 2012 04:02:40 +0000 (21:02 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Thu, 8 Mar 2012 04:02:40 +0000 (21:02 -0700)
src/ssl/crtd_message.cc

index 48c4c50af641f85573625a38ee22bcef311deb7e..107325ed86e38bde90b2bf96cd6f1d21f6d3e353 100644 (file)
@@ -245,7 +245,7 @@ void Ssl::CrtdMessage::composeRequest(Ssl::CertificateProperties const &certProp
         body +=  "\n" +  Ssl::CrtdMessage::param_Sign + "=" +  certSignAlgorithm(certProperties.signAlgorithm);
 
     std::string certsPart;
-    if (!Ssl::writeCertAndPrivateKeyToMemory(certProperties.signWithX509, certProperties.signWithPkey, certsPart) || true)
+    if (!Ssl::writeCertAndPrivateKeyToMemory(certProperties.signWithX509, certProperties.signWithPkey, certsPart))
         throw std::runtime_error("Ssl::writeCertAndPrivateKeyToMemory()");
     if (certProperties.mimicCert.get()) {
         if (!Ssl::appendCertToMemory(certProperties.mimicCert, certsPart))