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-remote-store.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'camel/camel-remote-store.c') diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c index 8c299cec0c..08308c8253 100644 --- a/camel/camel-remote-store.c +++ b/camel/camel-remote-store.c @@ -47,14 +47,10 @@ #include "camel-tcp-stream.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-url.h" #include "string-utils.h" @@ -240,21 +236,15 @@ remote_connect (CamelService *service, CamelException *ex) else port = store->default_port; -#if defined(HAVE_NSS) || defined(HAVE_OPENSSL) +#ifdef HAVE_SSL if (store->use_ssl) { -#ifdef HAVE_NSS - /* this is the preferred SSL implementation */ tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host); -#else - /* use openssl... */ - tcp_stream = camel_tcp_stream_openssl_new (service, service->url->host); -#endif /* HAVE_NSS */ } else { tcp_stream = camel_tcp_stream_raw_new (); } #else tcp_stream = camel_tcp_stream_raw_new (); -#endif /* HAVE_NSS || HAVE_OPENSSL */ +#endif /* HAVE_SSL */ ret = camel_tcp_stream_connect (CAMEL_TCP_STREAM (tcp_stream), h, port); camel_free_host(h); -- cgit v1.2.3