git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
594706e
)
Feature compile-guard
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 17 Aug 2014 13:42:43 +0000
(14:42 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 17 Aug 2014 13:42:43 +0000
(14:42 +0100)
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index 57b0808fb6d399e98c0aebba66dc2d7c58ce6007..de2e7a3bd4d8aa960b04850588f2b328f9e71859 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-1866,6
+1866,7
@@
if (dane)
#ifndef DISABLE_OCSP
/* Request certificate status at connection-time. If the server
does OCSP stapling we will get the callback (set in tls_init()) */
#ifndef DISABLE_OCSP
/* Request certificate status at connection-time. If the server
does OCSP stapling we will get the callback (set in tls_init()) */
+# ifdef EXPERIMENTAL_DANE
if (request_ocsp)
{
const uschar * s;
if (request_ocsp)
{
const uschar * s;
@@
-1882,6
+1883,8
@@
if (request_ocsp)
NULL, host->name, host->address, NULL) == OK;
}
}
NULL, host->name, host->address, NULL) == OK;
}
}
+# endif
+
if (request_ocsp)
{
SSL_set_tlsext_status_type(client_ssl, TLSEXT_STATUSTYPE_ocsp);
if (request_ocsp)
{
SSL_set_tlsext_status_type(client_ssl, TLSEXT_STATUSTYPE_ocsp);