git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying: CCSS macro
[users/jgh/exim.git]
/
src
/
src
/
tls-gnu.c
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index 69a8bd6f41fb510106e42c60b57b7f2c202d21ef..028d06219ca02936d95fc49be094040da6ce8b39 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-1939,7
+1939,7
@@
else
const char ** dd;
int * ddl;
const char ** dd;
int * ddl;
- for(nrec = 0; state->dane_data_len[nrec]; ) nrec++;
+ for
(nrec = 0; state->dane_data_len[nrec]; ) nrec++;
nrec++;
dd = store_get(nrec * sizeof(uschar *), FALSE);
nrec++;
dd = store_get(nrec * sizeof(uschar *), FALSE);
@@
-2529,8
+2529,10
@@
if (rc != GNUTLS_E_SUCCESS)
return FAIL;
}
return FAIL;
}
+#ifdef GNUTLS_SFLAGS_EXT_MASTER_SECRET
if (gnutls_session_get_flags(state->session) & GNUTLS_SFLAGS_EXT_MASTER_SECRET)
tls_in.ext_master_secret = TRUE;
if (gnutls_session_get_flags(state->session) & GNUTLS_SFLAGS_EXT_MASTER_SECRET)
tls_in.ext_master_secret = TRUE;
+#endif
#ifdef EXPERIMENTAL_TLS_RESUME
tls_server_resume_posthandshake(state);
#ifdef EXPERIMENTAL_TLS_RESUME
tls_server_resume_posthandshake(state);
@@
-3001,8
+3003,10
@@
if (!verify_certificate(state, errstr))
return FALSE;
}
return FALSE;
}
+#ifdef GNUTLS_SFLAGS_EXT_MASTER_SECRET
if (gnutls_session_get_flags(state->session) & GNUTLS_SFLAGS_EXT_MASTER_SECRET)
tlsp->ext_master_secret = TRUE;
if (gnutls_session_get_flags(state->session) & GNUTLS_SFLAGS_EXT_MASTER_SECRET)
tlsp->ext_master_secret = TRUE;
+#endif
#ifndef DISABLE_OCSP
if (request_ocsp)
#ifndef DISABLE_OCSP
if (request_ocsp)