/* Create new context */
-dkim_verify_ctx = pdkim_init_verify(PDKIM_INPUT_SMTP, &dkim_exim_query_dns_txt);
+dkim_verify_ctx = pdkim_init_verify(&dkim_exim_query_dns_txt);
dkim_collect_input = !!dkim_verify_ctx;
-#ifdef PDKIM_DEBUG
-if (dkim_collect_input)
- pdkim_set_debug_stream(dkim_verify_ctx, debug_file);
-#endif
}
"overlong public key record]");
break;
- case PDKIM_VERIFY_INVALID_PUBKEY_PARSING:
+ case PDKIM_VERIFY_INVALID_PUBKEY_DNSRECORD:
+ case PDKIM_VERIFY_INVALID_PUBKEY_IMPORT:
logmsg = string_append(logmsg, &size, &ptr, 1,
"syntax error in public key record]");
break;
{
case PDKIM_VERIFY_INVALID_PUBKEY_UNAVAILABLE:
return US"pubkey_unavailable";
- case PDKIM_VERIFY_INVALID_PUBKEY_PARSING: return US"pubkey_syntax";
+ case PDKIM_VERIFY_INVALID_PUBKEY_DNSRECORD:return US"pubkey_dns_syntax";
+ case PDKIM_VERIFY_INVALID_PUBKEY_IMPORT: return US"pubkey_der_syntax";
case PDKIM_VERIFY_FAIL_BODY: return US"bodyhash_mismatch";
case PDKIM_VERIFY_FAIL_MESSAGE: return US"signature_incorrect";
}
dkim_private_key_expanded = big_buffer;
}
- ctx = pdkim_init_sign(PDKIM_INPUT_SMTP,
- (char *) dkim_signing_domain,
+ ctx = pdkim_init_sign( (char *) dkim_signing_domain,
(char *) dkim_signing_selector,
- (char *) dkim_private_key_expanded);
-#ifdef PDKIM_DEBUG
- pdkim_set_debug_stream(ctx, debug_file);
-#endif
+ (char *) dkim_private_key_expanded,
+ PDKIM_ALGO_RSA_SHA256);
pdkim_set_optional(ctx,
(char *) dkim_sign_headers_expanded,
NULL,
pdkim_canon,
- pdkim_canon, -1, PDKIM_ALGO_RSA_SHA256, 0, 0);
+ pdkim_canon, -1, 0, 0);
lseek(dkim_fd, 0, SEEK_SET);