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 5aebfd4fe8669641d967438ea1a4cd690c7a771a..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
@@
-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,8
+2573,7
@@
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, %lu%s)\n", __FUNCTION__,
buff, (unsigned long)len, more ? ", more" : "");
DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
buff, (unsigned long)len, more ? ", more" : "");
@@
-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