Moved time_msec_t from typedefs.h to SquidTime.h

[thirdparty/squid.git] / src / SquidConfig.h

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index f4c5a9777bf71ca735bb68a015e051e92fcf389c..ff0aa92c241ef3d27035703510b67458c0b39f34 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -17,13 +17,11 @@
 #include "HttpHeaderTools.h"
 #include "ip/Address.h"
 #include "Notes.h"
+#include "security/forward.h"
+#include "SquidTime.h"
 #include "YesNoNone.h"
 
 #if USE_OPENSSL
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#endif
-
 class sslproxy_cert_sign;
 class sslproxy_cert_adapt;
 #endif
@@ -492,14 +490,14 @@ public:
     time_t minimum_expiry_time; /* seconds */
     external_acl *externalAclHelperList;
 
-#if USE_OPENSSL
     struct {
+        Security::ContextPointer sslContext;
+#if USE_OPENSSL
         acl_access *cert_error;
-        SSL_CTX *sslContext;
         sslproxy_cert_sign *cert_sign;
         sslproxy_cert_adapt *cert_adapt;
-    } ssl_client;
 #endif
+    } ssl_client;
 
     char *accept_filter;
     int umask;