diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-08 15:35:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-08 15:35:27 +0000 |
| commit | 724e1819b1303ba959ab364a5704b07518b244e5 (patch) | |
| tree | 87bdbb901cde5c99dd472e970be47206153ce413 /cups/http-private.h | |
| parent | 59ac438c6b011a94563317193ac8054718619ac2 (diff) | |
Drop OpenSSL support.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11419 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http-private.h')
| -rw-r--r-- | cups/http-private.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/cups/http-private.h b/cups/http-private.h index c0b6d340b..5fdacd19c 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -73,11 +73,7 @@ typedef int socklen_t; # include "md5-private.h" # include "ipp-private.h" -# if defined HAVE_LIBSSL -# include <openssl/err.h> -# include <openssl/rand.h> -# include <openssl/ssl.h> -# elif defined HAVE_GNUTLS +# ifdef HAVE_GNUTLS # include <gnutls/gnutls.h> # include <gnutls/x509.h> # include <gcrypt.h> @@ -109,7 +105,7 @@ typedef int socklen_t; # endif /* HAVE_SECPOLICYPRIV_H */ # elif defined(HAVE_SSPISSL) # include "sspi-private.h" -# endif /* HAVE_LIBSSL */ +# endif /* HAVE_GNUTLS */ # ifndef WIN32 # include <net/if.h> @@ -152,19 +148,7 @@ extern "C" { * Types and functions for SSL support... */ -# if defined HAVE_LIBSSL -/* - * The OpenSSL library provides its own SSL/TLS context structure for its - * IO and protocol management. However, we need to provide our own BIO - * (basic IO) implementation to do timeouts... - */ - -typedef SSL *http_tls_t; -typedef void *http_tls_credentials_t; - -//extern BIO_METHOD *_httpBIOMethods(void); - -# elif defined HAVE_GNUTLS +# ifdef HAVE_GNUTLS /* * The GNU TLS library is more of a "bare metal" SSL/TLS library... */ @@ -215,7 +199,7 @@ typedef void *http_tls_credentials_t; typedef void *http_tls_t; typedef void *http_tls_credentials_t; -# endif /* HAVE_LIBSSL */ +# endif /* HAVE_GNUTLS */ typedef enum _http_coding_e /**** HTTP content coding enumeration ****/ { |