Hello,

to build dovecot-2.2.5 on a system based on openssl-0.9.7 I had to apply the 
attached patch.
Maybe it could be applied in the next versions

Thanks.


-- 
Andreas Schulze
Internetdienste | P252

DATEV eG
90329 Nürnberg | Telefon +49 911 319-0 | Telefax +49 911 319-3196
E-Mail info @datev.de | Internet www.datev.de
Sitz: 90429 Nürnberg, Paumgartnerstr. 6-14 | Registergericht Nürnberg, GenReg 
Nr.70
Vorstand
Prof. Dieter Kempf (Vorsitzender)
Dipl.-Kfm. Wolfgang Stegmann (stellvertretender Vorsitzender)
Dipl.-Kfm. Michael Leistenschneider
Dipl.-Kfm. Dr. Robert Mayr
Jörg Rabe v. Pappenheim
Dipl.-Vw. Eckhard Schwarzer
Vorsitzender des Aufsichtsrates: Reinhard Verholen
Index: dovecot-2.2.5/src/lib-ssl-iostream/iostream-openssl-context.c
===================================================================
--- dovecot-2.2.5.orig/src/lib-ssl-iostream/iostream-openssl-context.c	2013-09-02 16:57:18.000000000 +0200
+++ dovecot-2.2.5/src/lib-ssl-iostream/iostream-openssl-context.c	2013-09-02 17:05:46.000000000 +0200
@@ -444,7 +444,7 @@
 	if (SSL_CTX_need_tmp_RSA(ssl_ctx))
 		SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
 	SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
-#if !defined(OPENSSL_NO_ECDH)
+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x00908000L
 	/* In the non-recommended situation where ECDH cipher suites are being
 	   used instead of ECDHE, do not reuse the same ECDH key pair for
 	   different sessions. This option improves forward secrecy. */
Index: dv-dovecot-2.2.5/src/login-common/ssl-proxy-openssl.c
===================================================================
--- dovecot-2.2.5.orig/src/login-common/ssl-proxy-openssl.c	2013-09-02 17:06:07.000000000 +0200
+++ dovecot-2.2.5/src/login-common/ssl-proxy-openssl.c	2013-09-02 17:06:39.000000000 +0200
@@ -1023,7 +1023,7 @@
 	if (SSL_CTX_need_tmp_RSA(ssl_ctx))
 		SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
 	SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
-#if !defined(OPENSSL_NO_ECDH)
+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x00908000L
 	/* In the non-recommended situation where ECDH cipher suites are being
 	   used instead of ECDHE, do not reuse the same ECDH key pair for
 	   different sessions. This option improves forward secrecy. */

Reply via email to