Commit Graph

31 Commits

Author SHA1 Message Date
d965c00a22 Same.
2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_cert_is_saved): Same.

	* camel-tcp-stream-openssl.c (ssl_cert_is_saved): Instead of
	opening the file, stat it and make sure that it belongs to us.

svn path=/trunk/; revision=13600
2001-10-11 21:57:20 +00:00
f3e2d67d4d Same hack as below.
2001-10-10  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.c (ssl_verify): Same hack as below.

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hack around the fact that
	adding a cert to nss's certdb seems to not work.

svn path=/trunk/; revision=13575
2001-10-10 22:13:05 +00:00
7b834caab7 remove unused variable
svn path=/trunk/; revision=13364
2001-10-03 02:56:40 +00:00
27da08a1bf Import the certificate if the user accepts it.
2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Import the certificate if
	the user accepts it.

svn path=/trunk/; revision=13363
2001-10-03 02:55:50 +00:00
f9329be8ee Oops, don't fail if `data' isn't a CamelService...cuz it's not supposed to
2001-09-19  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Oops, don't fail if
	`data' isn't a CamelService...cuz it's not supposed to be! It's a
	CamelTcpStreamSSL object...doh!

svn path=/trunk/; revision=12992
2001-09-19 22:09:36 +00:00
1751d70335 #if 0 out the code that was hopefully going to fix bug #5325 because the
2001-09-07  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): #if 0 out the code that
	was hopefully going to fix bug #5325 because the functions I used
	seem to have been deprecated. *sigh*.

svn path=/trunk/; revision=12699
2001-09-08 00:42:09 +00:00
d53fdf3ae9 #include pk11func.h. (ssl_bad_cert): Use CERT_GetDefaultCertDB.
2001-08-30  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c: #include pk11func.h.
	(ssl_bad_cert): Use CERT_GetDefaultCertDB.

svn path=/trunk/; revision=12530
2001-08-30 17:20:39 +00:00
fb7ab0fcbe If the user accepts the certificate, add it to the database as a trusted
2001-08-28  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): If the user accepts the
	certificate, add it to the database as a trusted CA.

svn path=/trunk/; revision=12502
2001-08-28 20:41:01 +00:00
7a8894af60 er, OptionSet
svn path=/trunk/; revision=9785
2001-05-13 01:44:16 +00:00
40e30e58b8 s/SSL_Enable/SSL_SetOption
svn path=/trunk/; revision=9784
2001-05-13 01:42:48 +00:00
b3424b533c call SSL_Enable after the SSL_ImportFD and before PR_Connect. Otherwise,
2001-05-10  Chris Toshok  <toshok@ximian.com>

	* camel-tcp-stream-ssl.c (stream_connect): call SSL_Enable after
	the SSL_ImportFD and before PR_Connect.  Otherwise, NSS aborts
	during the connect.

svn path=/trunk/; revision=9751
2001-05-10 22:03:08 +00:00
d3bcd3e9d6 Remove the last argument from camel_session_alert_user.
2001-05-01  Anders Carlsson  <andersca@codefactory.se>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Remove the last argument from
	camel_session_alert_user.

svn path=/trunk/; revision=9640
2001-05-01 19:44:45 +00:00
63e96e1002 Redo this a lot so that instead of having a class full of callbacks, we
* camel-session.c: Redo this a lot so that instead of having a
	class full of callbacks, we have a subclassable class. Also,
	replace the increasingly horrifying
	camel_session_query_authenticator with three new routines,
	camel_session_get_password, camel_session_forget_password, and
	camel_session_alert_user.

	* camel-pgp-context.c:
	* camel-pkcs7-context.c:
	* camel-smime-context.c:
	* providers/imap/camel-imap-store.c:
	* providers/pop3/camel-pop3-store.c:
	* providers/smtp/camel-smtp-transport.c:
	Use camel_session_get_password / camel_session_forget_password.

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Use
	camel_session_alert_user.

svn path=/trunk/; revision=9617
2001-04-27 21:08:08 +00:00
fe962a2055 Big header cleanups and nntp compile fix
svn path=/trunk/; revision=9024
2001-03-29 20:31:40 +00:00
0ec6ccc4df Return -1 on fail. (camel_filter_driver_filter_folder): Same.
2001-03-21  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-filter-driver.c (camel_filter_driver_filter_message):
	Return -1 on fail.
	(camel_filter_driver_filter_folder): Same.
	(camel_filter_driver_filter_mbox): Same.
	(camel_filter_driver_filter_folder): Return -1 if an exception was
	set as well.

2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
	Free the expected host.
	(camel_tcp_stream_openssl_new): Now takes a Service and an
	expected_host. Set them.

svn path=/trunk/; revision=8871
2001-03-21 21:45:26 +00:00
c768305c2f Don't include system include dir.
2001-03-17  Jeffrey Stedfast <fejj@ximian.com>

	* Makefile.am: Don't include system include dir.

	* camel.c: Use quotes around the nss.h include so it doesn't try
	to use the systen nss.h file.

	* camel-tcp-stream-ssl.c: Same here.

svn path=/trunk/; revision=8786
2001-03-17 22:13:19 +00:00
a9df5de4af Print info about the issuer of the certificate.
2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Print info about the
	issuer of the certificate.

	* providers/smtp/camel-smtp-transport.c (smtp_connect): Use
	camel_tcp_stream_get_socket().

	* camel-tcp-stream-openssl.c (stream_get_socket): Implemented.

	* camel-tcp-stream-ssl.c (stream_get_socket): Implemented.

	* camel-tcp-stream-raw.c (stream_get_socket): Implemented.

	* camel-tcp-stream.c (camel_tcp_stream_get_socket): New function.

svn path=/trunk/; revision=8764
2001-03-16 23:02:04 +00:00
403205b15e Don't use the hardcoded cert db directory, use the one passed in.
2001-03-15  Jeffrey Stedfast  <fejj@ximian.com>

	* camel.c (camel_init): Don't use the hardcoded cert db directory,
	use the one passed in.

	* camel-tcp-stream-ssl.c (ssl_get_client_auth): Wrote the default
	implementation. Not that we'll use this though, since this is the
	default implementation provided by NSS anyway. This more or less
	serves as a reference in case we want to change anything.
	(ssl_auth_cert): Same.
	(ssl_bad_cert): Changed the prompt string and free it when we're
	done.

svn path=/trunk/; revision=8753
2001-03-16 04:41:49 +00:00
369d9ddc67 Ya know what? Lets not ref the service because otherwise we'll start
2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_new): Ya know what?
	Lets not ref the service because otherwise we'll start having the
	same problems we had back with vtrash. Besides, since the store
	owns the stream, it's not like the store is going anywhere without
	the stream anyway.
	(camel_tcp_stream_ssl_finalize): No need to unref the service.

svn path=/trunk/; revision=8722
2001-03-15 02:56:06 +00:00
c0686e978d 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
2001-03-15 02:33:34 +00:00
343844c138 Eek! So the service's URL isn't set until after this is initialized. This
2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/imap/camel-imap-store.c (camel_imap_store_init): Eek!
	So the service's URL isn't set until after this is
	initialized. This means we can't check for SSL here.
	(imap_connect): Set the SSL options here instead.

svn path=/trunk/; revision=8715
2001-03-15 00:51:09 +00:00
174adfa471 Numerous fixes to get it to build correctly with NSS enabled.
2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c: Numerous fixes to get it to build
	correctly with NSS enabled.

	* camel-remote-store.c (remote_connect): Pass in the session and
	expected host args, oops.

	* camel-provider.h (CAMEL_URL_ALLOW_SSL): Defined.

	* providers/imap/camel-imap-store.c (camel_imap_store_init): Check
	to see if we are supposed to use SSL and set the options
	accordingly.
	(imap_connect): Return FALSE here instead of NULL.

	* providers/imap/camel-imap-provider.c: Add CAMEL_URL_ALLOW_SSL.

	* providers/imap/libcamelimap.urls: Add "imaps" which is the
	protocol for Secure IMAP.

svn path=/trunk/; revision=8711
2001-03-14 21:59:40 +00:00
24bb645439 Made cancellable. (stream_write): Same. (stream_connect): Removed checks
2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-raw.c (stream_read): Made cancellable.
	(stream_write): Same.
	(stream_connect): Removed checks for DIVINE_INTERVENTION as the
	code worked fine.

	* camel-tcp-stream-ssl.c (stream_write): get rid of 'w' as it
	wasn't really needed.
	(set_errno): New function to set errno based on the NSPR error
	code.
	(stream_read): If an error occured, call set_errno().
	(stream_write): Same.

svn path=/trunk/; revision=8701
2001-03-14 04:31:58 +00:00
e258958d9e Oops. Make this a subclass of CamelTcpStream, not CamelStream.
2001-03-13  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_get_type):
	Oops. Make this a subclass of CamelTcpStream, not CamelStream.

	* camel-types.h: Add the defs for CamelTcpStream and
	CamelTcpStreamRaw

	* Makefile.am: Add camel-tcp-stream and camel-tcp-stream-raw to
	the build.

	* camel-remote-store.c (remote_connect): Update to use
	CamelTcpStreams.

	* camel-tcp-stream-raw.c (stream_connect): Made cancellable by
	copying the currently used code in camel-remote-store.c.
	(stream_setsockopt): Oops, flags = fcntl (..., GET_FL);
	(camel_tcp_stream_raw_get_type): Oops. Make this a subclass of
	CamelTcpStream, not CamelStream.

svn path=/trunk/; revision=8697
2001-03-14 00:46:59 +00:00
6da96db8dd Comment out everything unless HAVE_NSS is defined.
2001-03-09  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.h: Comment out everything unless HAVE_NSS
	is defined.

	* camel-tcp-stream-ssl.c (stream_read): Don't use errno, use
	nspr's error code stuff.
	(stream_write): Same.

svn path=/trunk/; revision=8626
2001-03-11 04:35:20 +00:00
afa21bb264 Oops, include the camel-tcp-stream-ssl header instead of the raw one.
2001-01-31  Jeffrey Stedfast  <fejj@helixcode.com>

	* camel-tcp-stream-ssl.c: Oops, include the camel-tcp-stream-ssl
	header instead of the raw one.

svn path=/trunk/; revision=8103
2001-02-08 04:50:59 +00:00
405f1c5229 Ugh, this design is ugly like my butt.
2001-01-16  Jeffrey Stedfast  <fejj@ximian.com>

	Ugh, this design is ugly like my butt.

	* camel-session.c (camel_session_query_cert_authenticator): New
	function which will be useful when we integrate SSL.

	* camel-tcp-stream-ssl.c (ssl_auth_cert): Callback to authenticate
	a certificate.
	(ssl_bad_cert): Callback that gets the reason the certificate is
	bad and then calls camel's cert-authenticator callback to notify
	the user and to allow the user to override the check.
	(stream_connect): Set the URL we expect to connect with and setup
	the auth_cert and bad_cert callbacks.
	(camel_tcp_stream_ssl_new): Now takes a CamelSession and a
	expected_host argument that it will use for certificate
	authentication.
	(camel_tcp_stream_ssl_finalize): Unref the session and free the
	expected_host.

svn path=/trunk/; revision=7531
2001-01-16 07:19:49 +00:00
d9b76e981f If the close() is successful, set the fd to -1.
2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-stream-fs.c (stream_close): If the close() is successful,
	set the fd to -1.

	* camel-tcp-stream-raw.c: Removed the disconnect() method.
	(stream_close): If the close() is successful, set the sockfd to
	-1.

	* camel-tcp-stream-ssl.c: Removed the disconnect() method.
	(stream_close): If the close() is successful, set the sockfd to
	NULL.

	* camel-tcp-stream.c (camel_tcp_stream_disconnect): Removed,
	easier to just use the close() method as it did the same thing
	anyway.

svn path=/trunk/; revision=7522
2001-01-16 00:54:18 +00:00
e12bc65aa5 Uses an SSL socket now although there's still a few things missing (like
2001-01-15  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (stream_connect): Uses an SSL socket now
	although there's still a few things missing (like certificate
	handling and such).

	* camel.c (camel_ssl_init): A replacement function for
	camel_init() that also initializes SSL.

svn path=/trunk/; revision=7494
2001-01-15 06:25:23 +00:00
24a2d4baa8 Implemented. (stream_setsockopt): Implemented.
2001-01-14  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (stream_getsockopt): Implemented.
	(stream_setsockopt): Implemented.

	* camel-tcp-stream-raw.c (stream_getsockopt): Implemented.
	(stream_setsockopt): Implemented.

	* camel-tcp-stream.c (camel_tcp_stream_getsockopt): New method.
	(camel_tcp_stream_setsockopt): Another new method. I think you get
	the idea of what these are for so I won't explain them.

svn path=/trunk/; revision=7491
2001-01-14 22:48:09 +00:00
5608af39dd New CamelTcpStream class that implements nspr sockets and eventually will
2001-01-14  Jeffrey Stedfast  <fejj@helixcode.com>

	* camel-tcp-stream-ssl.[c,h]: New CamelTcpStream class that
	implements nspr sockets and eventually will use nss for
	SSL/TLS. Currently doesn't do any SSL/TLS but it should still
	work. It's functionally equivalent to CamelTcpStreamRaw at the
	moment only it uses nspr i/o.

	* camel-tcp-stream-raw.[c,h]: New CamelTcpStream class that
	implements native sockets. Should be usable but may have some bugs
	yet.

svn path=/trunk/; revision=7489
2001-01-14 08:21:00 +00:00