diff options
| -rw-r--r-- | src/src/pdkim/pdkim.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c index 4320ecd49..36e666fd9 100644 --- a/src/src/pdkim/pdkim.c +++ b/src/src/pdkim/pdkim.c @@ -107,7 +107,7 @@ pdkim_combined_canon_entry pdkim_combined_canons[] = { }; -static blob lineending = {.data = US"\r\n", .len = 2}; +static const blob lineending = {.data = US"\r\n", .len = 2}; /* -------------------------------------------------------------------------- */ uschar * @@ -720,9 +720,9 @@ return NULL; If we have to relax the data for this sig, return our copy of it. */ static blob * -pdkim_update_ctx_bodyhash(pdkim_bodyhash * b, const blob const * orig_data, blob * relaxed_data) +pdkim_update_ctx_bodyhash(pdkim_bodyhash * b, const blob * orig_data, blob * relaxed_data) { -const blob const * canon_data = orig_data; +const blob * canon_data = orig_data; size_t left; /* Defaults to simple canon (no further treatment necessary) */ @@ -771,9 +771,9 @@ if (b->canon_method == PDKIM_CANON_RELAXED) /* Make sure we don't exceed the to-be-signed body length */ left = canon_data->len; if ( b->bodylength >= 0 - && b->signed_body_bytes + left > b->bodylength + && left > (unsigned long)b->bodylength - b->signed_body_bytes ) - left = b->bodylength - b->signed_body_bytes; + left = (unsigned long)b->bodylength - b->signed_body_bytes; if (left > 0) { |