From: Jeremy Harris Date: Sat, 10 Aug 2019 16:55:16 +0000 (+0100) Subject: constify X-Git-Tag: exim-4.93-RC0~109 X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=fc2ba7b9fae5992dd76f721f283714a6d2ea137d constify --- diff --git a/src/src/dkim.c b/src/src/dkim.c index dd999ff5b..8bb2efbf0 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -41,7 +41,7 @@ static const uschar * dkim_collect_error = NULL; */ uschar * -dkim_exim_query_dns_txt(uschar * name) +dkim_exim_query_dns_txt(const uschar * name) { /*XXX need to always alloc the dnsa, from tainted mem. Then, we hope, the answers will be tainted */ diff --git a/src/src/functions.h b/src/src/functions.h index 060278959..de03bb8d0 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -186,7 +186,7 @@ extern void delivery_re_exec(int); extern BOOL directory_make(const uschar *, const uschar *, int, BOOL); #ifndef DISABLE_DKIM -extern uschar *dkim_exim_query_dns_txt(uschar *); +extern uschar *dkim_exim_query_dns_txt(const uschar *); extern void dkim_exim_sign_init(void); extern BOOL dkim_transport_write_message(transport_ctx *, diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c index 239532bb6..f10f20627 100644 --- a/src/src/pdkim/pdkim.c +++ b/src/src/pdkim/pdkim.c @@ -1861,7 +1861,7 @@ return ctx->flags & PDKIM_MODE_SIGN || verify_pass /* -------------------------------------------------------------------------- */ DLLEXPORT pdkim_ctx * -pdkim_init_verify(uschar * (*dns_txt_callback)(uschar *), BOOL dot_stuffing) +pdkim_init_verify(uschar * (*dns_txt_callback)(const uschar *), BOOL dot_stuffing) { pdkim_ctx * ctx; @@ -2018,7 +2018,7 @@ return b; void pdkim_init_context(pdkim_ctx * ctx, BOOL dot_stuffed, - uschar * (*dns_txt_callback)(uschar *)) + uschar * (*dns_txt_callback)(const uschar *)) { memset(ctx, 0, sizeof(pdkim_ctx)); ctx->flags = dot_stuffed ? PDKIM_MODE_SIGN | PDKIM_DOT_TERM : PDKIM_MODE_SIGN; diff --git a/src/src/pdkim/pdkim.h b/src/src/pdkim/pdkim.h index 029387549..b2f586ca1 100644 --- a/src/src/pdkim/pdkim.h +++ b/src/src/pdkim/pdkim.h @@ -280,7 +280,7 @@ typedef struct pdkim_ctx { pdkim_bodyhash *bodyhash; /* Callback for dns/txt query method (verification only) */ - uschar * (*dns_txt_callback)(uschar *); + uschar * (*dns_txt_callback)(const uschar *); /* Coder's little helpers */ gstring *cur_header; @@ -313,7 +313,7 @@ extern "C" { void pdkim_init (void); -void pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(uschar *)); +void pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(const uschar *)); DLLEXPORT pdkim_signature *pdkim_init_sign (pdkim_ctx *, @@ -321,7 +321,7 @@ pdkim_signature *pdkim_init_sign (pdkim_ctx *, const uschar **); DLLEXPORT -pdkim_ctx *pdkim_init_verify (uschar * (*)(uschar *), BOOL); +pdkim_ctx *pdkim_init_verify (uschar * (*)(const uschar *), BOOL); DLLEXPORT void pdkim_set_optional (pdkim_signature *, char *, char *,int, int,