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
DKIM: fix errorcheck in signing, lilbgcrypt version. Bug 2450
[exim.git]
/
src
/
src
/
pdkim
/
signing.c
diff --git
a/src/src/pdkim/signing.c
b/src/src/pdkim/signing.c
index de64ee4280ec104840b5f8e0a7b7ec834288f32b..102e7bf5152738128eb6ac4b8b68df07e6ccecd9 100644
(file)
--- a/
src/src/pdkim/signing.c
+++ b/
src/src/pdkim/signing.c
@@
-412,8
+412,9
@@
if ( !(s1 = Ustrstr(CS privkey_pem, "-----BEGIN RSA PRIVATE KEY-----"))
*s2 = '\0';
*s2 = '\0';
-if ((
der.len = b64decode(s1, &der.data)) < 0
)
+if ((
rc = b64decode(s1, &der.data) < 0)
)
return US"Bad PEM-DER b64 decode";
return US"Bad PEM-DER b64 decode";
+der.len = rc;
/* untangle asn.1 */
/* untangle asn.1 */
@@
-712,7
+713,7
@@
Return: NULL for success, or an error string */
const uschar *
exim_dkim_signing_init(const uschar * privkey_pem, es_ctx * sign_ctx)
{
const uschar *
exim_dkim_signing_init(const uschar * privkey_pem, es_ctx * sign_ctx)
{
-BIO * bp = BIO_new_mem_buf(privkey_pem, -1);
+BIO * bp = BIO_new_mem_buf(
(void *)
privkey_pem, -1);
if (!(sign_ctx->key = PEM_read_bio_PrivateKey(bp, NULL, NULL, NULL)))
return string_sprintf("privkey PEM-block import: %s",
if (!(sign_ctx->key = PEM_read_bio_PrivateKey(bp, NULL, NULL, NULL)))
return string_sprintf("privkey PEM-block import: %s",