SSL server certificate validator implementation: remove more "#if 1 //USE_SSL_CERT_VA...

diff --git a/src/forward.h b/src/forward.h
index 4c0e945103d249beb0420e99f5e93eb6241df562..e269703141b4db15c1a4f5c58095790a818b2cf2 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -9,7 +9,7 @@
 #include "fde.h"
 #include "HttpStatusCode.h"
 #include "ip/Address.h"
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
 #include "ssl/support.h"
 #endif
 
@@ -20,7 +20,7 @@ typedef RefCount<AccessLogEntry> AccessLogEntryPointer;
 class ErrorState;
 class HttpRequest;
 
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
 namespace Ssl
 {
 class ErrorDetail;
@@ -84,7 +84,7 @@ public:
     /** return a ConnectionPointer to the current server connection (may or may not be open) */
     Comm::ConnectionPointer const & serverConnection() const { return serverConn; };
 
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
     /// Callback function called when squid receive message from cert validator helper
     static void sslCrtvdHandleReplyWrapper(void *data, const HelperReply &reply);
     /// Process response from cert validator helper

diff --git a/src/ssl/Config.h b/src/ssl/Config.h
index e3a99a4605cff2433563ad7b1ace42c46b51a4c8..6fa5daedd5ea21d388cad23d6c92037540f79c6a 100644 (file)
--- a/src/ssl/Config.h
+++ b/src/ssl/Config.h
@@ -14,10 +14,8 @@ public:
     /// The number of processes spawn for ssl_crtd.
     HelperChildConfig ssl_crtdChildren;
 #endif
-#if 1 // USE_SSL_CERT_VALIDATOR
     char *ssl_crt_validator;
     HelperChildConfig ssl_crt_validator_Children;
-#endif
     Config();
     ~Config();
 private:

diff --git a/src/ssl/helper.h b/src/ssl/helper.h
index 0ed3115efcd1e69cdd6e4059ac088bb9cb5c2e7e..cc51ec8208cf8f50a3b302736bc6485c76fb2c85 100644 (file)
--- a/src/ssl/helper.h
+++ b/src/ssl/helper.h
@@ -28,7 +28,6 @@ private:
 };
 #endif
 
-#if 1 // USE_SSL_CERT_VALIDATOR
 class CertValidationHelper
 {
 public:
@@ -43,7 +42,6 @@ private:
 
     helper * ssl_crt_validator; ///< helper for management of ssl_crtd.
 };
-#endif // USE_SSL_CERT_VALIDATOR
 
 } //namespace Ssl
 #endif // SQUID_SSL_HELPER_H