From 6024691d3c352e0c845672667cd2ef6a9e3bfdad Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 11 Mar 2002 02:33:27 +0000 Subject: Rename the OpenSSL implementation of things to match the NSS implementation so that callers don't need to care which one is being used. * camel-tcp-stream-openssl.c: Implement CamelTcpStreamSSL, not CamelTcpStreamOpenSSL. Rename methods as well. Replace the camel-tcp-stream-openssl.h include with camel-tcp-stream-ssl.h. * camel-tcp-stream-openssl.h: Gone. * camel-tcp-stream-ssl.c: Add a note explaining that this implementation is only used for NSS, and that OpenSSL's implementation is in another file. (Should probably do some CVS renaming magic at some point.) * camel-http-stream.c (http_connect): Remove OpenSSL refs; the previously-NSS-specific code works for both now. * camel-remote-store.c: Likewise. * providers/smtp/camel-smtp-transport.c: Likewise. * providers/pop3/camel-pop3-store.c: Likewise. * Makefile.am (libcamelinclude_HEADERS): Remove camel-tcp-stream-openssl.h svn path=/trunk/; revision=16093 --- camel/camel-http-stream.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'camel/camel-http-stream.c') diff --git a/camel/camel-http-stream.c b/camel/camel-http-stream.c index 9c1a5a10f0..e0cdaba430 100644 --- a/camel/camel-http-stream.c +++ b/camel/camel-http-stream.c @@ -34,12 +34,9 @@ #include "camel-http-stream.h" #include "camel-stream-buffer.h" #include "camel-tcp-stream-raw.h" -#ifdef HAVE_NSS +#ifdef HAVE_SSL #include "camel-tcp-stream-ssl.h" #endif -#ifdef HAVE_OPENSSL -#include "camel-tcp-stream-openssl.h" -#endif #include "camel-exception.h" #include "camel-session.h" @@ -182,13 +179,9 @@ http_connect (CamelService *service, CamelURL *url) int errsave; if (!strcasecmp (url->protocol, "https")) { -#ifdef HAVE_NSS +#ifdef HAVE_SSL stream = camel_tcp_stream_ssl_new (service, url->host); -#else -#ifdef HAVE_OPENSSL - stream = camel_tcp_stream_openssl_new (service, url->host); -#endif /* HAVE_OPENSSL */ -#endif /* HAVE_NSS */ +#endif } else { stream = camel_tcp_stream_raw_new (); } -- cgit v1.2.3