From: Nigel Metheringham <nigel@exim.org>
Date: Mon, 19 Oct 2009 11:25:31 +0000 (+0000)
Subject: Further minor tweak to sha256 inclusion. Fixes: #674 yet again
X-Git-Tag: exim-4_70_RC3~28
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=388d65643958d1850eacc423fb0b828abf2a5296;ds=sidebyside

Further minor tweak to sha256 inclusion. Fixes: #674 yet again
---

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index be06eaffb..80ac0ffe7 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/tls-openssl.c,v 1.19 2009/10/16 13:10:34 tom Exp $ */
+/* $Cambridge: exim/src/src/tls-openssl.c,v 1.20 2009/10/19 11:25:31 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -305,7 +305,7 @@ tls_init(host_item *host, uschar *dhparam, uschar *certificate,
 SSL_load_error_strings();          /* basic set up */
 OpenSSL_add_ssl_algorithms();
 
-#if OPENSSL_VERSION_NUMBER > 0x0090800fL
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
 /* SHA256 is becoming ever moar popular. This makes sure it gets added to the
 list of available digests. */
 EVP_add_digest(EVP_sha256());