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
Debug: add trace in the inlist expansion condition
[exim.git]
/
src
/
src
/
tls-openssl.c
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index 08382667453d5cbae8bd27455894f3cbc1c0c546..58401e93289d5018d036b956d34fe2b2b851cc88 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-29,7
+29,7
@@
functions from the OpenSSL library. */
# include <openssl/ocsp.h>
#endif
#ifdef EXPERIMENTAL_DANE
# include <openssl/ocsp.h>
#endif
#ifdef EXPERIMENTAL_DANE
-# include
<danessl.h>
+# include
"danessl.h"
#endif
#endif
@@
-46,7
+46,6
@@
functions from the OpenSSL library. */
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define EXIM_HAVE_OCSP_RESP_COUNT
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define EXIM_HAVE_OCSP_RESP_COUNT
-# define EXIM_HAVE_OPENSSL_DH_BITS
#else
# define EXIM_HAVE_EPHEM_RSA_KEX
# define EXIM_HAVE_RAND_PSEUDO
#else
# define EXIM_HAVE_EPHEM_RSA_KEX
# define EXIM_HAVE_RAND_PSEUDO
@@
-70,6
+69,7
@@
functions from the OpenSSL library. */
#ifndef LIBRESSL_VERSION_NUMBER
# if OPENSSL_VERSION_NUMBER >= 0x010100000L
# define EXIM_HAVE_OPENSSL_CHECKHOST
#ifndef LIBRESSL_VERSION_NUMBER
# if OPENSSL_VERSION_NUMBER >= 0x010100000L
# define EXIM_HAVE_OPENSSL_CHECKHOST
+# define EXIM_HAVE_OPENSSL_DH_BITS
# endif
# if OPENSSL_VERSION_NUMBER >= 0x010000000L \
&& (OPENSSL_VERSION_NUMBER & 0x0000ff000L) >= 0x000002000L
# endif
# if OPENSSL_VERSION_NUMBER >= 0x010000000L \
&& (OPENSSL_VERSION_NUMBER & 0x0000ff000L) >= 0x000002000L
@@
-1499,9
+1499,9
@@
if (!RAND_status())
gettimeofday(&r.tv, NULL);
r.p = getpid();
gettimeofday(&r.tv, NULL);
r.p = getpid();
- RAND_seed(
(uschar *)
(&r), sizeof(r));
- RAND_seed(
(uschar *)
big_buffer, big_buffer_size);
- if (addr != NULL) RAND_seed(
(uschar *)
addr, sizeof(addr));
+ RAND_seed(
US
(&r), sizeof(r));
+ RAND_seed(
US
big_buffer, big_buffer_size);
+ if (addr != NULL) RAND_seed(
US
addr, sizeof(addr));
if (!RAND_status())
return tls_error(US"RAND_status", host,
if (!RAND_status())
return tls_error(US"RAND_status", host,
@@
-2573,11
+2573,10
@@
tls_write(BOOL is_server, const uschar *buff, size_t len, BOOL more)
{
int outbytes, error, left;
SSL *ssl = is_server ? server_ssl : client_ssl;
{
int outbytes, error, left;
SSL *ssl = is_server ? server_ssl : client_ssl;
-static uschar * corked = NULL;
-static int c_size = 0, c_len = 0;
+static gstring * corked = NULL;
-DEBUG(D_tls) debug_printf("%s(%p, %
d
%s)\n", __FUNCTION__,
- buff,
left
, more ? ", more" : "");
+DEBUG(D_tls) debug_printf("%s(%p, %
lu
%s)\n", __FUNCTION__,
+ buff,
(unsigned long)len
, more ? ", more" : "");
/* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
"more" is notified. This hack is only ok if small amounts are involved AND only
/* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
"more" is notified. This hack is only ok if small amounts are involved AND only
@@
-2586,12
+2585,12
@@
for the responses to the received SMTP MAIL , RCPT, DATA sequence, only. */
if (is_server && (more || corked))
{
if (is_server && (more || corked))
{
- corked = string_catn(corked,
&c_size, &c_len,
buff, len);
+ corked = string_catn(corked, buff, len);
if (more)
return len;
if (more)
return len;
- buff = CUS corked;
- len = c
_len
;
- corked = NULL;
c_size = c_len = 0;
+ buff = CUS corked
->s
;
+ len = c
orked->ptr
;
+ corked = NULL;
}
for (left = len; left > 0;)
}
for (left = len; left > 0;)
@@
-2819,7
+2818,7
@@
if (!RAND_status())
gettimeofday(&r.tv, NULL);
r.p = getpid();
gettimeofday(&r.tv, NULL);
r.p = getpid();
- RAND_seed(
(uschar *)
(&r), sizeof(r));
+ RAND_seed(
US
(&r), sizeof(r));
}
/* We're after pseudo-random, not random; if we still don't have enough data
in the internal PRNG then our options are limited. We could sleep and hope
}
/* We're after pseudo-random, not random; if we still don't have enough data
in the internal PRNG then our options are limited. We could sleep and hope