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:
3cbde9b
)
GnuTLS: fix build on older libraries
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 21 Sep 2019 22:27:03 +0000
(23:27 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 21 Sep 2019 22:34:27 +0000
(23:34 +0100)
src/src/tls-gnu.c
patch
|
blob
|
history
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index f64b0ae68f53ddbf1d6e896425a78c17ad7c3b24..fce4b86472e891c69a4a6d059edda04187957c13 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-903,6
+903,7
@@
return gnutls_ext_raw_parse(NULL, tls_server_clienthello_ext, msg,
}
#endif
}
#endif
+#if defined(EXPERIMENTAL_TLS_RESUME) || defined(SUPPORT_GNUTLS_EXT_RAW_PARSE)
/* Callback for certificate-status, on server. We sent stapled OCSP. */
static int
tls_server_certstatus_cb(gnutls_session_t session, unsigned int htype,
/* Callback for certificate-status, on server. We sent stapled OCSP. */
static int
tls_server_certstatus_cb(gnutls_session_t session, unsigned int htype,
@@
-925,22
+926,24
@@
tls_server_hook_cb(gnutls_session_t sess, u_int htype, unsigned when,
{
switch (htype)
{
{
switch (htype)
{
-#ifdef SUPPORT_GNUTLS_EXT_RAW_PARSE
+#
ifdef SUPPORT_GNUTLS_EXT_RAW_PARSE
case GNUTLS_HANDSHAKE_CLIENT_HELLO:
return tls_server_clienthello_cb(sess, htype, when, incoming, msg);
case GNUTLS_HANDSHAKE_CLIENT_HELLO:
return tls_server_clienthello_cb(sess, htype, when, incoming, msg);
-#endif
+#
endif
case GNUTLS_HANDSHAKE_CERTIFICATE_STATUS:
return tls_server_certstatus_cb(sess, htype, when, incoming, msg);
case GNUTLS_HANDSHAKE_CERTIFICATE_STATUS:
return tls_server_certstatus_cb(sess, htype, when, incoming, msg);
-#ifdef EXPERIMENTAL_TLS_RESUME
+#
ifdef EXPERIMENTAL_TLS_RESUME
case GNUTLS_HANDSHAKE_NEW_SESSION_TICKET:
return tls_server_ticket_cb(sess, htype, when, incoming, msg);
case GNUTLS_HANDSHAKE_NEW_SESSION_TICKET:
return tls_server_ticket_cb(sess, htype, when, incoming, msg);
-#endif
+#
endif
default:
return 0;
}
}
default:
return 0;
}
}
+#endif
+#if !defined(DISABLE_OCSP) && defined(SUPPORT_GNUTLS_EXT_RAW_PARSE)
static void
tls_server_testharness_ocsp_fiddle(void)
{
static void
tls_server_testharness_ocsp_fiddle(void)
{
@@
-952,6
+955,7
@@
if (environ) for (uschar ** p = USS environ; *p; p++)
exim_testharness_disable_ocsp_validity_check = TRUE;
}
}
exim_testharness_disable_ocsp_validity_check = TRUE;
}
}
+#endif
/*************************************************
* Variables re-expanded post-SNI *
/*************************************************
* Variables re-expanded post-SNI *