git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e5127a
)
Further minor tweak to sha256 inclusion. Fixes: #674 yet again
author
Nigel Metheringham
<nigel@exim.org>
Mon, 19 Oct 2009 11:25:31 +0000
(11:25 +0000)
committer
Nigel Metheringham
<nigel@exim.org>
Mon, 19 Oct 2009 11:25:31 +0000
(11:25 +0000)
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index be06eaffba38320613d3c8ef37252dc147099290..80ac0ffe78d07d78cc2ea1b63242272a33670096 100644
(file)
--- 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 *
/*************************************************
* 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();
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());
/* SHA256 is becoming ever moar popular. This makes sure it gets added to the
list of available digests. */
EVP_add_digest(EVP_sha256());