dovecot-2.2: lib-http: Added ssl_cert|key|key_password settings ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/af9947e1e5f7
changeset: 16392:af9947e1e5f7
user:      Timo Sirainen <tss at iki.fi>
date:      Thu May 23 17:36:54 2013 +0300
description:
lib-http: Added ssl_cert|key|key_password settings to be passed to ssl-iostream.
These are used for sending client's SSL certificate.

diffstat:

 src/lib-http/http-client.c |  6 ++++++
 src/lib-http/http-client.h |  2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (35 lines):

diff -r 9d21241fa792 -r af9947e1e5f7 src/lib-http/http-client.c
--- a/src/lib-http/http-client.c	Wed May 22 15:59:38 2013 +0300
+++ b/src/lib-http/http-client.c	Thu May 23 17:36:54 2013 +0300
@@ -86,6 +86,9 @@
 	client->set.ssl_ca = p_strdup(pool, set->ssl_ca);
 	client->set.ssl_crypto_device = p_strdup(pool, set->ssl_crypto_device);
 	client->set.ssl_allow_invalid_cert = set->ssl_allow_invalid_cert;
+	client->set.ssl_cert = p_strdup(pool, set->ssl_cert);
+	client->set.ssl_key = p_strdup(pool, set->ssl_key);
+	client->set.ssl_key_password = p_strdup(pool, set->ssl_key_password);
 	client->set.max_idle_time_msecs = set->max_idle_time_msecs;
 	client->set.max_parallel_connections =
 		(set->max_parallel_connections > 0 ? set->max_parallel_connections : 1);
@@ -197,6 +200,9 @@
 	ssl_set.ca = client->set.ssl_ca;
 	ssl_set.verify_remote_cert = TRUE;
 	ssl_set.crypto_device = client->set.ssl_crypto_device;
+	ssl_set.cert = client->set.ssl_cert;
+	ssl_set.key = client->set.ssl_key;
+	ssl_set.key_password = client->set.ssl_key_password;
 	ssl_set.verbose = client->set.debug;
 	ssl_set.verbose_invalid_cert = client->set.debug;
 
diff -r 9d21241fa792 -r af9947e1e5f7 src/lib-http/http-client.h
--- a/src/lib-http/http-client.h	Wed May 22 15:59:38 2013 +0300
+++ b/src/lib-http/http-client.h	Thu May 23 17:36:54 2013 +0300
@@ -36,6 +36,8 @@
 	const char *ssl_ca_dir, *ssl_ca_file, *ssl_ca;
 	const char *ssl_crypto_device;
 	bool ssl_allow_invalid_cert;
+	/* user cert */
+	const char *ssl_cert, *ssl_key, *ssl_key_password;
 
 	const char *rawlog_dir;