Attachment #197985 for bug #232135

View | Details | Raw Unified | Return to bug 232135
Collapse All | Expand All

Lines 2-8 Link Here

(-)mail/prayer/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= prayer	3	PORTNAME= prayer
4	PORTVERSION= 1.3.5	4	PORTVERSION= 1.3.5
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= mail www	6	CATEGORIES= mail www
7	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/	7	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
8		8




--- lib/ssl.c.orig	2012-06-30 14:30:08 UTC
+++ lib/ssl.c
@@ -14,6 +14,7 @@
 /* Headers files for OpenSSL */
 
 #include <openssl/lhash.h>
+#include <openssl/opensslv.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
@@ -78,17 +79,6 @@ static void os_initialize_prng(struct ssl_config *ssl_
     int totbytes = 0;
     int bytes;
 
-    if (ssl_config->egd_socket) {
-        if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) {
-            log_fatal("EGD Socket %s failed", ssl_config->egd_socket);
-        } else {
-            totbytes += bytes;
-            log_debug("Snagged %d random bytes from EGD Socket %s",
-                      bytes, ssl_config->egd_socket);
-            goto SEEDED;        /* ditto */
-        }
-    }
-
     /* Try the good-old default /dev/urandom, if available  */
     totbytes += add_rand_file("/dev/urandom");
     if (prng_seeded(totbytes)) {
@@ -212,6 +202,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
     unsigned char *data = NULL, *asn;
     time_t expire;
     int ret = -1;
+    unsigned int session_id_length;
+    unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length);
 
     if (!sess_dbopen)
         return 0;
@@ -241,8 +233,7 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
     if (data && len) {
         /* store the session in our database */
         do {
-            ret = DB->store(sessdb, (void *) sess->session_id,
-                            sess->session_id_length,
+            ret = DB->store(sessdb, (void *) session_id, session_id_length,
                             (void *) data, len + sizeof(time_t), NULL);
         }
         while (ret == MYDB_AGAIN);
@@ -255,8 +246,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
     if (ssl_verbose_logging) {
         int i;
         char idstr[SSL_MAX_SSL_SESSION_ID_LENGTH * 2 + 1];
-        for (i = 0; i < sess->session_id_length; i++)
-            sprintf(idstr + i * 2, "%02X", sess->session_id[i]);
+        for (i = 0; i < session_id_length; i++)
+            sprintf(idstr + i * 2, "%02X", session_id[i]);
 
         log_debug("new SSL session: id=%s, expire=%s, status=%s",
                   idstr, ctime(&expire), ret ? "failed" : "ok");
@@ -298,7 +289,10 @@ static void remove_session(unsigned char *id, int idle
  */
 static void remove_session_cb(SSL_CTX * ctx, SSL_SESSION * sess)
 {
-    remove_session(sess->session_id, sess->session_id_length);
+    unsigned int session_id_length;
+    unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length);
+
+    remove_session(session_id, session_id_length);
 }
 
 /*
@@ -387,16 +381,17 @@ void ssl_context_init(struct ssl_config *ssl_config)
     SSL_load_error_strings();
 
     /* Set up client context: only used by accountd */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     client_ctx = SSL_CTX_new(SSLv3_client_method());
+#else
+    client_ctx = SSL_CTX_new(TLS_client_method());
+#endif
     SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_BOTH);
     SSL_CTX_set_info_callback(client_ctx, info_callback);
 #ifdef SSL_MODE_AUTO_RETRY
     SSL_CTX_set_mode(client_ctx, SSL_MODE_AUTO_RETRY);
 #endif
 
-    if (SSL_CTX_need_tmp_RSA(client_ctx))
-        SSL_CTX_set_tmp_rsa_callback(client_ctx, rsa_callback);
-
     /* Don't bother with session cache for client side: not enough
      * connections to worry about caching */
     SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_OFF);
@@ -503,10 +498,6 @@ void ssl_context_init(struct ssl_config *ssl_config)
         log_fatal("SSL_CTX_set_options(SSL_OP_CIPHER_SERVER_PREFERENCE)"
                   "failed");
 
-    /* Set up RSA temporary key callback routine */
-    if (SSL_CTX_need_tmp_RSA(server_ctx))
-        SSL_CTX_set_tmp_rsa_callback(server_ctx, rsa_callback);
-
     /* Initialise RSA temporary key (will take a couple of secs to complete) */
     ssl_init_rsakey(ssl_config);
 }
@@ -615,7 +606,7 @@ void *ssl_start_server(int fd, unsigned long timeout)
     else
         log_debug("SSL: No client certificate");
 
-    switch (ssl->session->ssl_version) {
+    switch (SSL_version(ssl)) {
     case SSL2_VERSION:
         ver = "SSLv2";
         break;
@@ -668,7 +659,7 @@ void *ssl_start_client(int fd, unsigned long timeout)
 
     /* Verify certificate here? Need local context to play with? */
 
-    switch (((SSL *) ssl)->session->ssl_version) {
+    switch (SSL_version(ssl)) {
     case SSL2_VERSION:
         ver = "SSLv2";
         break;




--- shared/config.c.orig	2012-06-30 14:30:08 UTC
+++ shared/config.c
@@ -455,9 +455,9 @@ static struct {
     "draft_att_total_max", config_number, OFFSET(draft_att_total_max)}
     , {
     "dualuse", config_bool, OFFSET(dualuse)}
-    , {
+    , /*{
     "egd_socket", config_path, OFFSET(egd_socket)}
-    , {
+    , */{
     "expunge_on_exit", config_bool, OFFSET(expunge_on_exit)}
     , {
     "fatal_dump_core", config_bool, OFFSET(fatal_dump_core)}

Return to bug 232135

Lines 1-27 Link Here

(-)mail/prayer/files/patch-lib_ssl.c (-14 / +107 lines)
1	--- lib/ssl.c.orig 2012-06-30 14:30:08 UTC	1	--- lib/ssl.c.orig 2012-06-30 14:30:08 UTC
2	+++ lib/ssl.c	2	+++ lib/ssl.c
3	@@ -78,6 +78,7 @@ static void os_initialize_prng(struct ss	3	@@ -14,6 +14,7 @@
		4	/* Headers files for OpenSSL */
		5
		6	#include <openssl/lhash.h>
		7	+#include <openssl/opensslv.h>
		8	#include <openssl/ssl.h>
		9	#include <openssl/err.h>
		10	#include <openssl/rand.h>
		11	@@ -78,17 +79,6 @@ static void os_initialize_prng(struct ssl_config *ssl_
4	int totbytes = 0;	12	int totbytes = 0;
5	int bytes;	13	int bytes;
6		14
7	+#ifndef OPENSSL_NO_EGD	15	- if (ssl_config->egd_socket) {
8	if (ssl_config->egd_socket) {	16	- if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) {
9	if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) {	17	- log_fatal("EGD Socket %s failed", ssl_config->egd_socket);
10	log_fatal("EGD Socket %s failed", ssl_config->egd_socket);	18	- } else {
11	@@ -88,6 +89,7 @@ static void os_initialize_prng(struct ss	19	- totbytes += bytes;
12	goto SEEDED; /* ditto */	20	- log_debug("Snagged %d random bytes from EGD Socket %s",
		21	- bytes, ssl_config->egd_socket);
		22	- goto SEEDED; /* ditto */
		23	- }
		24	- }
		25	-
		26	/* Try the good-old default /dev/urandom, if available */
		27	totbytes += add_rand_file("/dev/urandom");
		28	if (prng_seeded(totbytes)) {
		29	@@ -212,6 +202,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
		30	unsigned char data = NULL, asn;
		31	time_t expire;
		32	int ret = -1;
		33	+ unsigned int session_id_length;
		34	+ unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length);
		35
		36	if (!sess_dbopen)
		37	return 0;
		38	@@ -241,8 +233,7 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
		39	if (data && len) {
		40	/* store the session in our database */
		41	do {
		42	- ret = DB->store(sessdb, (void *) sess->session_id,
		43	- sess->session_id_length,
		44	+ ret = DB->store(sessdb, (void *) session_id, session_id_length,
		45	(void *) data, len + sizeof(time_t), NULL);
13	}	46	}
14	}	47	while (ret == MYDB_AGAIN);
15	+#endif	48	@@ -255,8 +246,8 @@ static int new_session_cb(SSL * ssl, SSL_SESSION * ses
		49	if (ssl_verbose_logging) {
		50	int i;
		51	char idstr[SSL_MAX_SSL_SESSION_ID_LENGTH * 2 + 1];
		52	- for (i = 0; i < sess->session_id_length; i++)
		53	- sprintf(idstr + i * 2, "%02X", sess->session_id[i]);
		54	+ for (i = 0; i < session_id_length; i++)
		55	+ sprintf(idstr + i * 2, "%02X", session_id[i]);
16		56
17	/* Try the good-old default /dev/urandom, if available */	57	log_debug("new SSL session: id=%s, expire=%s, status=%s",
18	totbytes += add_rand_file("/dev/urandom");	58	idstr, ctime(&expire), ret ? "failed" : "ok");
19	@@ -387,7 +389,7 @@ void ssl_context_init(struct ssl_config	59	@@ -298,7 +289,10 @@ static void remove_session(unsigned char *id, int idle
		60	*/
		61	static void remove_session_cb(SSL_CTX * ctx, SSL_SESSION * sess)
		62	{
		63	- remove_session(sess->session_id, sess->session_id_length);
		64	+ unsigned int session_id_length;
		65	+ unsigned char *session_id = SSL_SESSION_get_id(sess, &session_id_length);
		66	+
		67	+ remove_session(session_id, session_id_length);
		68	}
		69
		70	/*
		71	@@ -387,16 +381,17 @@ void ssl_context_init(struct ssl_config *ssl_config)
20	SSL_load_error_strings();	72	SSL_load_error_strings();
21		73
22	/* Set up client context: only used by accountd */	74	/* Set up client context: only used by accountd */
23	- client_ctx = SSL_CTX_new(SSLv3_client_method());	75	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
24	+ client_ctx = SSL_CTX_new(SSLv23_client_method());	76	client_ctx = SSL_CTX_new(SSLv3_client_method());
		77	+#else
		78	+ client_ctx = SSL_CTX_new(TLS_client_method());
		79	+#endif
25	SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_BOTH);	80	SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_BOTH);
26	SSL_CTX_set_info_callback(client_ctx, info_callback);	81	SSL_CTX_set_info_callback(client_ctx, info_callback);
27	#ifdef SSL_MODE_AUTO_RETRY	82	#ifdef SSL_MODE_AUTO_RETRY
		83	SSL_CTX_set_mode(client_ctx, SSL_MODE_AUTO_RETRY);
		84	#endif
		85
		86	- if (SSL_CTX_need_tmp_RSA(client_ctx))
		87	- SSL_CTX_set_tmp_rsa_callback(client_ctx, rsa_callback);
		88	-
		89	/* Don't bother with session cache for client side: not enough
		90	* connections to worry about caching */
		91	SSL_CTX_set_session_cache_mode(client_ctx, SSL_SESS_CACHE_OFF);
		92	@@ -503,10 +498,6 @@ void ssl_context_init(struct ssl_config *ssl_config)
		93	log_fatal("SSL_CTX_set_options(SSL_OP_CIPHER_SERVER_PREFERENCE)"
		94	"failed");
		95
		96	- /* Set up RSA temporary key callback routine */
		97	- if (SSL_CTX_need_tmp_RSA(server_ctx))
		98	- SSL_CTX_set_tmp_rsa_callback(server_ctx, rsa_callback);
		99	-
		100	/* Initialise RSA temporary key (will take a couple of secs to complete) */
		101	ssl_init_rsakey(ssl_config);
		102	}
		103	@@ -615,7 +606,7 @@ void *ssl_start_server(int fd, unsigned long timeout)
		104	else
		105	log_debug("SSL: No client certificate");
		106
		107	- switch (ssl->session->ssl_version) {
		108	+ switch (SSL_version(ssl)) {
		109	case SSL2_VERSION:
		110	ver = "SSLv2";
		111	break;
		112	@@ -668,7 +659,7 @@ void *ssl_start_client(int fd, unsigned long timeout)
		113
		114	/* Verify certificate here? Need local context to play with? */
		115
		116	- switch (((SSL *) ssl)->session->ssl_version) {
		117	+ switch (SSL_version(ssl)) {
		118	case SSL2_VERSION:
		119	ver = "SSLv2";
		120	break;

Line 0 Link Here

(-)mail/prayer/files/patch-shared_config.c (+14 lines)
	1	--- shared/config.c.orig 2012-06-30 14:30:08 UTC
	2	+++ shared/config.c
	3	@@ -455,9 +455,9 @@ static struct {
	4	"draft_att_total_max", config_number, OFFSET(draft_att_total_max)}
	5	, {
	6	"dualuse", config_bool, OFFSET(dualuse)}
	7	- , {
	8	+ , /*{
	9	"egd_socket", config_path, OFFSET(egd_socket)}
	10	- , {
	11	+ , */{
	12	"expunge_on_exit", config_bool, OFFSET(expunge_on_exit)}
	13	, {
	14	"fatal_dump_core", config_bool, OFFSET(fatal_dump_core)}