git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Events: move from Experimental to mainline
[exim.git]
/
src
/
src
/
tls-gnu.c
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index c316d0a2454a68b67d9a0d42d4501e407ee42706..28ae46d9d1a5450ab68012d109a10ddd61482e07 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-47,9
+47,9
@@
require current GnuTLS, then we'll drop support for the ancient libraries).
# warning "GnuTLS library version too old; define DISABLE_OCSP in Makefile"
# define DISABLE_OCSP
#endif
# warning "GnuTLS library version too old; define DISABLE_OCSP in Makefile"
# define DISABLE_OCSP
#endif
-#if GNUTLS_VERSION_NUMBER < 0x020a00 &&
defined(EXPERIMENTAL
_EVENT)
+#if GNUTLS_VERSION_NUMBER < 0x020a00 &&
!defined(DISABLE
_EVENT)
# warning "GnuTLS library version too old; tls:cert event unsupported"
# warning "GnuTLS library version too old; tls:cert event unsupported"
-#
undef EXPERIMENTAL
_EVENT
+#
define DISABLE
_EVENT
#endif
#if GNUTLS_VERSION_NUMBER >= 0x030306
# define SUPPORT_CA_DIR
#endif
#if GNUTLS_VERSION_NUMBER >= 0x030306
# define SUPPORT_CA_DIR
@@
-121,7
+121,7
@@
typedef struct exim_gnutls_state {
uschar *exp_tls_require_ciphers;
uschar *exp_tls_ocsp_file;
const uschar *exp_tls_verify_cert_hostnames;
uschar *exp_tls_require_ciphers;
uschar *exp_tls_ocsp_file;
const uschar *exp_tls_verify_cert_hostnames;
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
uschar *event_action;
#endif
uschar *event_action;
#endif
@@
-140,7
+140,7
@@
static const exim_gnutls_state_st exim_gnutls_state_init = {
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL,
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
NULL,
#endif
NULL,
NULL,
#endif
NULL,
@@
-1598,7
+1598,7
@@
return 0;
#endif
#endif
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
/*
We use this callback to get observability and detail-level control
for an exim TLS connection (either direction), raising a tls:cert event
/*
We use this callback to get observability and detail-level control
for an exim TLS connection (either direction), raising a tls:cert event
@@
-1722,7
+1722,7
@@
else
gnutls_certificate_server_set_request(state->session, GNUTLS_CERT_IGNORE);
}
gnutls_certificate_server_set_request(state->session, GNUTLS_CERT_IGNORE);
}
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
if (event_action)
{
state->event_action = event_action;
if (event_action)
{
state->event_action = event_action;
@@
-1834,7
+1834,7
@@
tls_client_setup_hostname_checks(host_item * host, exim_gnutls_state_st * state,
if (verify_check_given_host(&ob->tls_verify_cert_hostnames, host) == OK)
{
state->exp_tls_verify_cert_hostnames =
if (verify_check_given_host(&ob->tls_verify_cert_hostnames, host) == OK)
{
state->exp_tls_verify_cert_hostnames =
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
string_domain_utf8_to_alabel(host->name, NULL);
#else
host->name;
string_domain_utf8_to_alabel(host->name, NULL);
#else
host->name;
@@
-1953,7
+1953,7
@@
if (request_ocsp)
}
#endif
}
#endif
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
if (tb->event_action)
{
state->event_action = tb->event_action;
if (tb->event_action)
{
state->event_action = tb->event_action;