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
OpenSSL: use nondeprecated EC-group functions under 3.0.0.
[exim.git]
/
src
/
src
/
dkim_transport.c
diff --git
a/src/src/dkim_transport.c
b/src/src/dkim_transport.c
index db3db91809b6d7a55e0f0cedae82a4456bfe8024..c09c5059b871e5477204ababd9202a4b650f363b 100644
(file)
--- a/
src/src/dkim_transport.c
+++ b/
src/src/dkim_transport.c
@@
-21,8
+21,8
@@
if (dkim->dkim_strict)
uschar * dkim_strict_result = expand_string(dkim->dkim_strict);
if (dkim_strict_result)
uschar * dkim_strict_result = expand_string(dkim->dkim_strict);
if (dkim_strict_result)
- if (
(strcmpic(dkim->dkim_strict, US"1") == 0) ||
-
(strcmpic(dkim->dkim_strict, US"true") == 0)
)
+ if (
strcmpic(dkim_strict_result, US"1") == 0
+
|| strcmpic(dkim_strict_result, US"true") == 0
)
{
/* Set errno to something halfway meaningful */
*errp = EACCES;
{
/* Set errno to something halfway meaningful */
*errp = EACCES;
@@
-83,7
+83,7
@@
else
while (sread)
{
while (sread)
{
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
wwritten = tls_out.active.sock == out_fd
? tls_write(tls_out.active.tls_ctx, p, sread, FALSE)
: write(out_fd, CS p, sread);
wwritten = tls_out.active.sock == out_fd
? tls_write(tls_out.active.tls_ctx, p, sread, FALSE)
: write(out_fd, CS p, sread);
@@
-124,7
+124,7
@@
dkt_direct(transport_ctx * tctx, struct ob_dkim * dkim,
{
int save_fd = tctx->u.fd;
int save_options = tctx->options;
{
int save_fd = tctx->u.fd;
int save_options = tctx->options;
-BOOL save_wireformat = spool_file_wireformat;
+BOOL save_wireformat =
f.
spool_file_wireformat;
uschar * hdrs;
gstring * dkim_signature;
int hsize;
uschar * hdrs;
gstring * dkim_signature;
int hsize;
@@
-157,7
+157,7
@@
arc_sign_init();
/* The dotstuffed status of the datafile depends on whether it was stored
in wireformat. */
/* The dotstuffed status of the datafile depends on whether it was stored
in wireformat. */
-dkim->dot_stuffed = spool_file_wireformat;
+dkim->dot_stuffed =
f.
spool_file_wireformat;
if (!(dkim_signature = dkim_exim_sign(deliver_datafile, SPOOL_DATA_START_OFFSET,
hdrs, dkim, &errstr)))
if (!(rc = dkt_sign_fail(dkim, &errno)))
if (!(dkim_signature = dkim_exim_sign(deliver_datafile, SPOOL_DATA_START_OFFSET,
hdrs, dkim, &errstr)))
if (!(rc = dkt_sign_fail(dkim, &errno)))
@@
-186,7
+186,7
@@
having already been done - but we have to say we want CRLF output format, and
temporarily set the marker for possible already-CRLF input. */
tctx->options &= ~topt_escape_headers;
temporarily set the marker for possible already-CRLF input. */
tctx->options &= ~topt_escape_headers;
-spool_file_wireformat = TRUE;
+
f.
spool_file_wireformat = TRUE;
transport_write_reset(0);
if ( ( dkim_signature
&& dkim_signature->ptr > 0
transport_write_reset(0);
if ( ( dkim_signature
&& dkim_signature->ptr > 0
@@
-196,7
+196,7
@@
if ( ( dkim_signature
)
return FALSE;
)
return FALSE;
-spool_file_wireformat = save_wireformat;
+
f.
spool_file_wireformat = save_wireformat;
tctx->options = save_options | topt_no_headers | topt_continuation;
if (!(transport_write_message(tctx, 0)))
tctx->options = save_options | topt_no_headers | topt_continuation;
if (!(transport_write_message(tctx, 0)))