Commit Graph

22 Commits

Author SHA1 Message Date
bdb8a0a993 Start the ssl stream off in non-ssl mode (useful for STARTTLS).
2002-03-05  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_new_raw):
	Start the ssl stream off in non-ssl mode (useful for STARTTLS).
	(camel_tcp_stream_openssl_enable_ssl): New function to toggle an
	ssl stream into ssl mode.
	(open_ssl_connection): Close the sockfd on fail so our caller
	doesn't have to - this also allows us to save the original errno.
	(stream_connect): If we want ssl mode, do our ssl stuff.
	(camel_tcp_stream_openssl_class_init): Init some SSL stuff here
	instead of in open_ssl_connection since these only ever need to be
	called once.
	(stream_read): Only use SSL_read if we are in ssl mode.
	(stream_write): Only use SSL_write if we are in ssl mode.

	* providers/smtp/camel-smtp-transport.c (smtp_helo): Check for the
	STARTTLS extension.
	(connect_to_server): Try to use STARTTLS whenever possible rather
	than the old way of doing things.
	(connect_to_server_wrapper): Wrapper around connect_to_server() to
	first try STARTTLS and then attempt normal SSL mode if we can't
	connect via STARTTLS.

	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_enable_ssl): New
	function to toggle an ssl stream into ssl mode.
	(camel_tcp_stream_ssl_new_raw): Start the ssl stream off in
	non-ssl mode (useful for STARTTLS).
	(stream_connect): Only connect in SSL mode if required.

svn path=/trunk/; revision=15937
2002-03-06 00:33:37 +00:00
4e96a9415b Oops, pass a mode argument to the open() call.
2001-11-07  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (save_ssl_cert): Oops, pass a mode
	argument to the open() call.

	* camel-tcp-stream-openssl.c (save_ssl_cert): Oops, pass a mode
	argument to the open() call.

svn path=/trunk/; revision=14636
2001-11-09 00:38:51 +00:00
0
9281c3d5f7 Fixed compilation errors.
2001-10-30    <NotZed@Ximian.com>

        * camel-tcp-stream-openssl.c (stream_write): Fixed compilation
        errors.

svn path=/trunk/; revision=14420
2001-10-30 04:29:00 +00:00
c779a57f33 fixed a compile problem and saved errno before calling fcntl() in stream_read
svn path=/trunk/; revision=14418
2001-10-30 04:24:28 +00:00
2a5e8cb179 Removed. (stream_write): Keep looping (non-blocking case) if errno is
2001-10-29  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.c (my_SSL_write): Removed.
	(stream_write): Keep looping (non-blocking case) if errno is
	EAGAIN, EINTR or EWOULDBLOCK. For NONBLOCKing I/O, sync up with
	CamelTcpStreamRaw. As with CamelTcpStreamRaw/SSL - make sure to
	write out everything before returning.
	(my_SSL_read): Removed.
	(stream_read): Just call ssl_error_to_errno() and check the errno
	values that we care about so we can keep the general look of all
	this stream code the same. Also when checking the return value of
	SSL_read, check for <0 instead of ==-1 since the man page for
	SSL_read doesn't say it will return -1 on fail, it just says <0.
	(stream_flush): Don't fsync() since syncing on a socket is a Bad
	Thing (tm).

	* camel-tcp-stream-ssl.c (stream_write): Make sure we write out
	everything just like in camel-tcp-stream-raw.c.

	* camel-stream-buffer.c (camel_stream_buffer_gets): If
	camel_stream_read() returns -1, don't necessarily return -1 to our
	caller since it's possible that we did actually "read" some data
	(ie, we copied some pre-buffered data into the out buffer).

	* camel-stream-buffer.h: Removed CAMEL_STREAM_BUFFER_NEWLINE since
	it never got used anywhere and it isn't supported anyway.

svn path=/trunk/; revision=14409
2001-10-30 03:09:01 +00:00
42606efd98 More fixing of the license texts.
svn path=/trunk/; revision=14216
2001-10-27 18:06:04 +00:00
fac0dbd69c If CAMEL_DEBUG is defined, print some useful ref/unref info.
2001-10-16  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-object.[c,h]: If CAMEL_DEBUG is defined, print some useful
	ref/unref info.

	* providers/imap/camel-imap-store.c (delete_folder): Fixed an
	assignment warning.

	* camel-uid-cache.c (camel_uid_cache_new): Make sure that the
	parent directory exists before trying to open the filename, if it
	doesn't, create it.

svn path=/trunk/; revision=13707
2001-10-16 21:47:34 +00:00
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
59eb8e34ef Make this take an SSL * instead of a CamelTcpStreamSSL *, since it can get
* camel-tcp-stream-openssl.c (ssl_error_to_errno): Make this take
	an SSL * instead of a CamelTcpStreamSSL *, since it can get called
	from open_ssl_connection, when the CamelTcpStreamSSL isn't set up
	right yet. Fixes a crash on connection failure.

svn path=/trunk/; revision=13213
2001-09-28 14:36:44 +00:00
4f83aaa7cc call SSL_read/write, looping on SSL_ERROR_WANT_READ/WRITE. I'm sure
* camel-tcp-stream-openssl.c (my_SSL_read, my_SSL_write): call
	SSL_read/write, looping on SSL_ERROR_WANT_READ/WRITE. I'm sure
	there's a perfectly good reason that the API works this way. No,
	really.
	(stream_read, stream_write): use my_SSL_read and my_SSL_write.
	Fixes at least ximian 8593, and probably 6024 and maybe 10366,
	at least for OpenSSL. There may be a parallel NSS bug?

svn path=/trunk/; revision=13121
2001-09-25 21:14:09 +00:00
d4f1993073 fixed compile warning
svn path=/trunk/; revision=13090
2001-09-24 00:39:24 +00:00
1df3e6787e Don't even try to alert the user if the session isn't interactive.
2001-09-23  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.c (ssl_verify): Don't even try to alert
	the user if the session isn't interactive.
	(errlib_error_to_errno): Make the default errno EINTR so that we
	act just like CamelTcpStreamSSL.

	* camel-pgp-context.c (pgp_sign): When the password is not
	provided, set the exception to USER_CANCEL.
	(pgp_clearsign): Same.
	(pgp_encrypt): And here.
	(pgp_decrypt): Here too.

svn path=/trunk/; revision=13088
2001-09-23 22:41:54 +00:00
5fc7eeebc0 New function. Try to approximate the SSL error into errno.
2001-08-15  Peter Williams  <peterw@ximian.com>

	* camel-tcp-stream-openssl.c (ssl_error_to_errno): New function. Try
	to approximate the SSL error into errno.
	(errlib_error_to_errno): New function, try to approximate OpenSSl's
	error library's error (ERR_*) into errno.
	(stream_read): Try to set errno using ssl_error_to_errno.
	(stream_write): Same.
	(open_ssl_connection): Same.

svn path=/trunk/; revision=12065
2001-08-15 20:05:26 +00:00
a29542eef6 openssl_table is gone. we now store/get the stream from the SSL_CTX's
2001-07-08  Chris Toshok  <toshok@ximian.com>

	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
	openssl_table is gone.  we now store/get the stream from the
	SSL_CTX's app_data.
	(stream_read): rework the non-blocking case to account for SSL
	possibly buffering data (in which case select will block even
	though data is ready to be read), and to account for FreeBSD's
	strange behavior of returning -1/EAGAIN even though select said
	the fd was ready to be read.
	(ssl_verify): openssl_table is gone.
	(open_ssl_connection): set the SSL_CTX's app_data to be the
	stream, remove the openssl_table code.

svn path=/trunk/; revision=10894
2001-07-08 22:15:30 +00:00
1421494ea6 use X509_STORE_CTX_get_ex_data to get at the SSL* - don't use the
2001-07-05  Chris Toshok  <toshok@ximian.com>

	* camel-tcp-stream-openssl.c (ssl_verify): use
	X509_STORE_CTX_get_ex_data to get at the SSL* - don't use the
	X509_STORE_CTX to look up our stream, since it's not what we used
	to insert our stream into the hashtable.
	(open_ssl_connection): insert the stream into the hashtable before
	calling SSL_connect, as this can cause ssl_verify to be called,
	and we need to look up the stream there.  remove the stream from
	the hashtable if there's an error connecting.
	(stream_connect): pass the CamelTcpStreamOpenSSL* to
	open_ssl_connection since it handles the hashtable stuff.  remove
	hashtable stuff from here.

svn path=/trunk/; revision=10819
2001-07-05 19:11:50 +00:00
cb92bb76a6 Store the CamelFolderInfo tree that was returned from
2001-05-21  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/imap/camel-imap-store.c (get_folder_info_online):
	Store the CamelFolderInfo tree that was returned from
	camel_folder_info_build() in a new variable, 'tree', rather than
	'fi' since we later use 'fi' when syncing folders. Not only does
	this fix a memory leak, but it also fixes the bug where the user
	would only see the last folder in the folder list and/or it's
	subfolders.

svn path=/trunk/; revision=9911
2001-05-21 22:53:15 +00:00
416d8fa6cd Add support for using OpenSSL.
2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/smtp/camel-smtp-transport.c (connect_to_server): Add
	support for using OpenSSL.

	* camel-remote-store.c (remote_connect): Add support for using the
	OpenSSL implementation.

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hmmmm, don't pass in a
	NULL as the last argument to alert_user - prototype doesn't take
	that argument anymore?

	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):
	(ssl_verify): Use a global hash table to try and lookup the
	CamelTcpStreamOpenSSL object given the ssl context since OpenSSL
	doesn't think one needs to pass data around, we should all be
	living in a world of global variables, duh!

svn path=/trunk/; revision=9697
2001-05-07 20:33:25 +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
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
4391d0f3b1 Added
2001-03-14  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-openssl.[c,h]: Added

	* Makefile.am: Added camel-tcp-stream-openssl.[c,h] to the build.

	* camel-types.h: Added CamelTcpStreamSSL and CamelTcpStreamOpenSSL

svn path=/trunk/; revision=8710
2001-03-14 19:53:12 +00:00