[dovecot-cvs] dovecot/src/login-common ssl-proxy-openssl.c, 1.19, 1.20

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv31676/src/login-common

Modified Files:
	ssl-proxy-openssl.c 
Log Message:
Added ssl_cipher_list setting.



Index: ssl-proxy-openssl.c
===================================================================
RCS file: /home/cvs/dovecot/src/login-common/ssl-proxy-openssl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ssl-proxy-openssl.c	19 Jan 2004 17:07:21 -0000	1.19
+++ ssl-proxy-openssl.c	10 May 2004 01:55:41 -0000	1.20
@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#define SSL_CIPHER_LIST "ALL:!LOW"
+#define DOVECOT_SSL_DEFAULT_CIPHER_LIST "ALL:!LOW"
 
 enum ssl_io_action {
 	SSL_ADD_INPUT,
@@ -403,7 +403,7 @@
 
 void ssl_proxy_init(void)
 {
-	const char *cafile, *certfile, *keyfile, *paramfile;
+	const char *cafile, *certfile, *keyfile, *paramfile, *cipher_list;
 	char buf;
 
 	cafile = getenv("SSL_CA_FILE");
@@ -424,9 +424,12 @@
 
 	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
 
-	if (SSL_CTX_set_cipher_list(ssl_ctx, SSL_CIPHER_LIST) != 1) {
+	cipher_list = getenv("SSL_CIPHER_LIST");
+	if (cipher_list == NULL)
+		cipher_list = DOVECOT_SSL_DEFAULT_CIPHER_LIST;
+	if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list) != 1) {
 		i_fatal("Can't set cipher list to '%s': %s",
-			SSL_CIPHER_LIST, ssl_last_error());
+			cipher_list, ssl_last_error());
 	}
 
 	if (cafile != NULL) {