/* Create new context */
dkim_verify_ctx = pdkim_init_verify(PDKIM_INPUT_SMTP, &dkim_exim_query_dns_txt);
-
-if ((dkim_collect_input = !!dkim_verify_ctx))
+dkim_collect_input = !!dkim_verify_ctx;
+#ifdef PDKIM_DEBUG
+if (dkim_collect_input)
pdkim_set_debug_stream(dkim_verify_ctx, debug_file);
+#endif
}
/* Log a line for each signature */
uschar *logmsg = string_append(NULL, &size, &ptr, 5,
- string_sprintf("d=%s s=%s c=%s/%s a=%s ",
+ string_sprintf("d=%s s=%s c=%s/%s a=%s b=%d ",
sig->domain,
sig->selector,
sig->canon_headers == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
sig->canon_body == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
- sig->algo == PDKIM_ALGO_RSA_SHA256 ? "rsa-sha256" : "rsa-sha1"),
+ sig->algo == PDKIM_ALGO_RSA_SHA256 ? "rsa-sha256" : "rsa-sha1",
+ sig->sigdata_len * 8
+ ),
sig->identity ? string_sprintf("i=%s ", sig->identity) : US"",
sig->created > 0 ? string_sprintf("t=%lu ", sig->created) : US"",
pdkim_signature * sig;
uschar * cmp_val;
-
dkim_cur_sig = NULL;
dkim_cur_signer = id;
dkim_signing_domain = US sig->domain;
dkim_signing_selector = US sig->selector;
+ dkim_key_length = sig->sigdata_len * 8;
return;
}
}
(char *) dkim_signing_domain,
(char *) dkim_signing_selector,
(char *) dkim_private_key_expanded);
+#ifdef PDKIM_DEBUG
pdkim_set_debug_stream(ctx, debug_file);
+#endif
pdkim_set_optional(ctx,
(char *) dkim_sign_headers_expanded,
NULL,