Fix 2-phase, in-order queue run delivery order

[exim.git] / src / src / pdkim / signing.c

diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index 8876f617cd969673d780fc557af9a8ebe0f18a04..b4754c1a1022fdb9bed69b1d8bbb37835af269af 100644 (file)
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -1,7 +1,7 @@
 /*
  *  PDKIM - a RFC4871 (DKIM) implementation
 /*
  *  PDKIM - a RFC4871 (DKIM) implementation

- *  Copyright (c) The Exim Maintainers 1995 - 2022
- *  SPDX-License-Identifier: GPL-2.0-only
+ *  Copyright (c) The Exim Maintainers 1995 - 2023
+ *  SPDX-License-Identifier: GPL-2.0-or-later

  *
  *  signing/verification interface
  */
  *
  *  signing/verification interface
  */


@@ -308,7 +308,7 @@ makes sure that important subsystems are initialized. */
 if (!gcry_check_version (GCRYPT_VERSION))
   {
   fputs ("libgcrypt version mismatch\n", stderr);
 if (!gcry_check_version (GCRYPT_VERSION))
   {
   fputs ("libgcrypt version mismatch\n", stderr);

-  exit (2);
+  exim_exit(2);

   }
 
 /* We don't want to see any warnings, e.g. because we have not yet
   }
 
 /* We don't want to see any warnings, e.g. because we have not yet


@@ -419,7 +419,7 @@ if (  !(s1 = Ustrstr(CS privkey_pem, "-----BEGIN RSA PRIVATE KEY-----"))
 
 *s2 = '\0';
 
 
 *s2 = '\0';
 

-if ((rc = b64decode(s1, &der.data) < 0))
+if ((rc = b64decode(s1, &der.data, s1) < 0))

   return US"Bad PEM-DER b64 decode";
 der.len = rc;
 
   return US"Bad PEM-DER b64 decode";
 der.len = rc;