From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 8 Mar 2012 04:02:40 +0000 (-0700)
Subject: Removed kludge added to test writeCertAndPrivateKeyToMemory() failure bypass.
X-Git-Tag: BumpSslServerFirst.take06
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b78835c3a2838e6d5c072f96e03f29473e636f3;p=thirdparty%2Fsquid.git

Removed kludge added to test writeCertAndPrivateKeyToMemory() failure bypass.
---

diff --git a/src/ssl/crtd_message.cc b/src/ssl/crtd_message.cc
index 48c4c50af6..107325ed86 100644
--- a/src/ssl/crtd_message.cc
+++ b/src/ssl/crtd_message.cc
@@ -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))