[Simplemail-cvs] simplemail configuration.c, 1.103, 1.104 configuration.h, 1.66, 1.67 ssl.c, 1.6, 1.7

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31927

Modified Files:
	configuration.c configuration.h ssl.c 
Log Message:
Renamed field cypher_list to ssl_cypher_list.


Index: configuration.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/configuration.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- configuration.c	23 Feb 2014 14:52:06 -0000	1.103
+++ configuration.c	23 Feb 2014 14:52:27 -0000	1.104
@@ -185,7 +185,7 @@
 	user.config.dont_draw_alternating_rows = 0;
 	user.config.row_background = ROW_BACKGROUND;        /* Row color */
 	user.config.alt_row_background = ALT_ROW_BACKGROUND;       /* Color of alternative row */
-	user.config.cypher_list = NULL;
+	user.config.ssl_cypher_list = NULL;
 
 	return 1;
 }
@@ -211,7 +211,7 @@
 	free(user.config.receive_arexx_file);
 	free(user.config.read_propfont);
 	free(user.config.read_fixedfont);
-	free(user.config.cypher_list);
+	free(user.config.ssl_cypher_list);
 	array_free(user.config.header_array);
 	array_free(user.config.internet_emails);
 	array_free(user.config.spam_white_emails);
@@ -400,10 +400,10 @@
 							user.config.row_background = strtoul(result,NULL,0);
 						if ((result = get_config_item(buf,"Hidden.AltRowBackground")))
 							user.config.alt_row_background = strtoul(result,NULL,0);
-						if ((result = get_config_item(buf,"Hidden.CypherList")))
+						if ((result = get_config_item(buf,"Hidden.SSLCypherList")))
 						{
-							free(user.config.cypher_list);
-							user.config.cypher_list = mystrdup(result);
+							free(user.config.ssl_cypher_list);
+							user.config.ssl_cypher_list = mystrdup(result);
 						}
 
 						if (!mystrnicmp(buf, "ACCOUNT",7))

Index: configuration.h
===================================================================
RCS file: /cvsroot/simplemail/simplemail/configuration.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- configuration.h	23 Feb 2014 14:51:13 -0000	1.66
+++ configuration.h	23 Feb 2014 14:52:27 -0000	1.67
@@ -152,7 +152,7 @@
 	int dont_draw_alternating_rows;  /* Disable the rendering of alternating rows */
 	int row_background;              /* Row color */
 	int alt_row_background;          /* Color of alternative row */
-	char *cypher_list;           /* The cypher list used for ssl connections */
+	char *ssl_cypher_list;           /* The cypher list used for ssl connections */
 };
 
 struct user

Index: ssl.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/ssl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ssl.c	23 Feb 2014 14:51:48 -0000	1.6
+++ ssl.c	23 Feb 2014 14:52:27 -0000	1.7
@@ -47,7 +47,7 @@
 
 	if ((ctx = SSL_CTX_new(SSLv23_client_method())))
 	{
-		const char *cypher_list = user.config.cypher_list;
+		const char *cypher_list = user.config.ssl_cypher_list;
 
 		if (!cypher_list)
 			cypher_list = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK@STRENGTH";