aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-03-15 10:33:34 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-03-15 10:33:34 +0800
commitc0686e978da2010088758d28f6042b41a1110b56 (patch)
tree597c93f0a96cd803063dc2ef205c3e284093b60a
parent013b2e0078b62ce13eb679837cdf6aa1d20ec1d0 (diff)
downloadgsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar.gz
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar.bz2
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar.lz
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar.xz
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.tar.zst
gsoc2013-evolution-c0686e978da2010088758d28f6042b41a1110b56.zip
Pass the service into the SSL stream, not the session.
2001-03-14 Jeffrey Stedfast <fejj@ximian.com> * camel-remote-store.c (remote_connect): Pass the service into the SSL stream, not the session. * camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_init): Set the service to NULL. (camel_tcp_stream_ssl_finalize): Unref the service. (camel_tcp_stream_ssl_new): Takes a CamelService arg now rather than a CamelSession arg. svn path=/trunk/; revision=8720
-rw-r--r--camel/ChangeLog11
-rw-r--r--camel/camel-remote-store.c2
-rw-r--r--camel/camel-tcp-stream-ssl.c38
-rw-r--r--camel/camel-tcp-stream-ssl.h8
4 files changed, 37 insertions, 22 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index a1f0bcafab..de3ff8ecdf 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,16 @@
2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-remote-store.c (remote_connect): Pass the service into the
+ SSL stream, not the session.
+
+ * camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_init): Set the
+ service to NULL.
+ (camel_tcp_stream_ssl_finalize): Unref the service.
+ (camel_tcp_stream_ssl_new): Takes a CamelService arg now rather
+ than a CamelSession arg.
+
+2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
+
* camel.c (camel_init): So it turns out that NSS_Init *isn't*
idempotent, so we have to protect against initializing it more
than once(contrary to what their design specs suggest).
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
index 3f66d6a462..ef06eb71ec 100644
--- a/camel/camel-remote-store.c
+++ b/camel/camel-remote-store.c
@@ -218,7 +218,7 @@ remote_connect (CamelService *service, CamelException *ex)
#ifdef HAVE_NSS
if (store->use_ssl)
- tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host);
+ tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host);
else
tcp_stream = camel_tcp_stream_raw_new ();
#else
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index e34cef0202..4b2d4fc578 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -25,6 +25,7 @@
#ifdef HAVE_NSS
#include "camel-tcp-stream-ssl.h"
+#include "camel-session.h"
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -84,7 +85,7 @@ camel_tcp_stream_ssl_init (gpointer object, gpointer klass)
CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);
stream->sockfd = NULL;
- stream->session = NULL;
+ stream->service = NULL;
stream->expected_host = NULL;
}
@@ -96,7 +97,7 @@ camel_tcp_stream_ssl_finalize (CamelObject *object)
if (stream->sockfd != NULL)
PR_Close (stream->sockfd);
- camel_object_unref (CAMEL_OBJECT (stream->session));
+ camel_object_unref (CAMEL_OBJECT (stream->service));
g_free (stream->expected_host);
}
@@ -122,24 +123,24 @@ camel_tcp_stream_ssl_get_type (void)
/**
* camel_tcp_stream_ssl_new:
- * @session: camel session
+ * @service: camel service
* @expected_host: host that the stream is expected to connect with.
*
* Since the SSL certificate authenticator may need to prompt the
- * user, a CamelSession is needed. #expected_host is needed as a
+ * user, a CamelService is needed. #expected_host is needed as a
* protection against an MITM attack.
*
* Return value: a tcp stream
**/
CamelStream *
-camel_tcp_stream_ssl_new (CamelSession *session, const char *expected_host)
+camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host)
{
CamelTcpStreamSSL *stream;
stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));
- camel_object_ref (CAMEL_OBJECT (session));
- stream->session = session;
+ camel_object_ref (CAMEL_OBJECT (service));
+ stream->service = service;
stream->expected_host = g_strdup (expected_host);
return CAMEL_STREAM (stream);
@@ -221,23 +222,26 @@ ssl_auth_cert (void *data, PRFileDesc *fd, PRBool checksig, PRBool is_server)
static SECStatus
ssl_bad_cert (void *data, PRFileDesc *fd)
{
- CamelSession *session;
+ CamelService *service;
+ char *string, *err;
gpointer accept;
- char *string;
PRInt32 len;
g_return_val_if_fail (data != NULL, SECFailure);
- g_return_val_if_fail (CAMEL_IS_SESSION (data), SECFailure);
+ g_return_val_if_fail (CAMEL_IS_SERVICE (data), SECFailure);
- session = CAMEL_SESSION (data);
+ service = CAMEL_SERVICE (data);
/* FIXME: International issues here?? */
len = PR_GetErrorTextLength ();
- string = g_malloc0 (len + 1);
- PR_GetErrorText (string);
+ err = g_malloc0 (len + 1);
+ PR_GetErrorText (err);
- accept = camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_ACCEPT,
- string, FALSE, NULL, NULL, NULL);
+ string = g_strdup_printf (_("Do you wish to accept this certificate from %s?\n\n%s"),
+ service->url->host, err);
+
+ accept = camel_session_query_authenticator (service->session, CAMEL_AUTHENTICATOR_ACCEPT,
+ string, FALSE, service, NULL, NULL);
if (GPOINTER_TO_INT (accept))
return SECSuccess;
@@ -273,8 +277,8 @@ stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
return -1;
}
- SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, NULL);
- SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl->session);
+ /*SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, NULL);*/
+ SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl->service);
ssl->sockfd = ssl_fd;
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
index ef4e21126c..883e1cda2a 100644
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@ -34,8 +34,8 @@ extern "C" {
#ifdef HAVE_NSS
#include <camel/camel-tcp-stream.h>
-#include <camel/camel-session.h>
-#include <mozilla/nspr.h>
+#include <camel/camel-service.h>
+#include <nspr.h>
#define CAMEL_TCP_STREAM_SSL_TYPE (camel_tcp_stream_ssl_get_type ())
#define CAMEL_TCP_STREAM_SSL(obj) (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSL))
@@ -47,7 +47,7 @@ struct _CamelTcpStreamSSL {
PRFileDesc *sockfd;
- CamelSession *session;
+ CamelService *service;
char *expected_host;
};
@@ -62,7 +62,7 @@ typedef struct {
CamelType camel_tcp_stream_ssl_get_type (void);
/* public methods */
-CamelStream *camel_tcp_stream_ssl_new (CamelSession *session, const char *expected_host);
+CamelStream *camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host);
#endif /* HAVE_NSS */