From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 23 Sep 2012 10:30:46 +0000 (+0200)
Subject: Moved sslproxy cert types to own header in ssl/
X-Git-Tag: SQUID_3_3_0_1~33^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c7489ef83598b3d13787f8ced82918e2d06a0c;p=thirdparty%2Fsquid.git

Moved sslproxy cert types to own header in ssl/
Added missing include in acl/FilledChecklist.h
---

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 131eb25c21..bd3e9fbce8 100644
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -41,6 +41,8 @@
 
 #if USE_SSL
 #include <openssl/ssl.h>
+class sslproxy_cert_sign;
+class sslproxy_cert_adapt;
 #endif
 
 class acl_access;
diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index 81e5c9d790..d2697883de 100644
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -2,6 +2,7 @@
 #define SQUID_ACLFILLED_CHECKLIST_H
 
 #include "acl/Checklist.h"
+#include "ip/Address.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
 #endif
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 608541d16e..3c4ee2c9d4 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -70,6 +70,7 @@
 #include "rfc1738.h"
 #include "SquidConfig.h"
 #include "SquidString.h"
+#include "ssl/ProxyCerts.h"
 #include "Store.h"
 #include "StoreFileSystem.h"
 #include "structs.h"
diff --git a/src/client_side.cc b/src/client_side.cc
index e0a280230a..624d78c5df 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -137,6 +137,7 @@
 #include "ClientInfo.h"
 #endif
 #if USE_SSL
+#include "ssl/ProxyCerts.h"
 #include "ssl/context_storage.h"
 #include "ssl/helper.h"
 #include "ssl/ServerBump.h"
diff --git a/src/ssl/Makefile.am b/src/ssl/Makefile.am
index 1b47a484c9..18b7a34b97 100644
--- a/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@ -29,6 +29,7 @@ libsslsquid_la_SOURCES = \
 	ErrorDetail.h \
 	ErrorDetailManager.cc \
 	ErrorDetailManager.h \
+	ProxyCerts.h \
 	ServerBump.cc \
 	ServerBump.h \
 	support.cc \
diff --git a/src/ssl/ProxyCerts.h b/src/ssl/ProxyCerts.h
new file mode 100644
index 0000000000..22b4edadec
--- /dev/null
+++ b/src/ssl/ProxyCerts.h
@@ -0,0 +1,51 @@
+#ifndef SQUID_SSLPROXYCERTS_H_
+#define SQUID_SSLPROXYCERTS_H_
+/*
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#if USE_SSL
+class ACLList;
+
+class sslproxy_cert_sign {
+public:
+    int alg;
+    ACLList *aclList;
+    sslproxy_cert_sign *next;
+};
+
+class sslproxy_cert_adapt {
+public:
+    int alg;
+    char *param;
+    ACLList *aclList;
+    sslproxy_cert_adapt *next;
+};
+#endif
+
+#endif /* SQUID_SSLPROXYCERTS_H_ */
diff --git a/src/structs.h b/src/structs.h
index 3f4276bf1b..7b3011e45a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -85,19 +85,4 @@ struct _fde_disk {
     off_t offset;
 };
 
-#if USE_SSL
-struct _sslproxy_cert_sign {
-    int alg;
-    ACLList *aclList;
-    sslproxy_cert_sign *next;
-};
-
-struct _sslproxy_cert_adapt {
-    int alg;
-    char *param;
-    ACLList *aclList;
-    sslproxy_cert_adapt *next;
-};
-#endif
-
 #endif /* SQUID_STRUCTS_H */
diff --git a/src/typedefs.h b/src/typedefs.h
index 03329961ef..488671adbc 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -47,12 +47,6 @@ typedef struct {
 
 typedef struct _CommWriteStateData CommWriteStateData;
 
-#if USE_SSL
-typedef struct _sslproxy_cert_sign sslproxy_cert_sign;
-
-typedef struct _sslproxy_cert_adapt sslproxy_cert_adapt;
-#endif
-
 #if SQUID_SNMP
 #include "snmp_vars.h"
 #include "cache_snmp.h"