From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 21 Mar 2015 11:58:32 +0000 (-0700)
Subject: Define Security::ContextPointer for GnuTLS
X-Git-Tag: merge-candidate-3-v1~38^2~21^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5919df439b43f90642a7bbb21a03895e4b7c261d;p=thirdparty%2Fsquid.git

Define Security::ContextPointer for GnuTLS
---

diff --git a/src/security/Context.h b/src/security/Context.h
index 36a6163429..84a59da25e 100644
--- a/src/security/Context.h
+++ b/src/security/Context.h
@@ -10,15 +10,25 @@
 #define SQUID_SRC_SECURITY_CONTEXT_H
 
 #if USE_OPENSSL
-#include "ssl/gadgets.h"
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/ssl.h>
+#endif
+#endif
+
+#if USE_GNUTLS
+#if HAVE_GNUTLS_GNUTLS_H
+#include <gnutls/gnutls.h>
+#endif
 #endif
 
 namespace Security {
 
 #if USE_OPENSSL
-// XXX: make this a SSL_CTX_Pointer
 typedef SSL_CTX* ContextPointer;
 
+#elif USE_GNUTLS
+typedef gnutls_certificate_credentials_t* ContextPointer;
+
 #else
 // use void* so we can check against NULL
 typedef void* ContextPointer;