DKIM: fix quoted-printable decode

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 1a7e3d41f4ce3661207d14a87bc82a15d4b74fc2..d9fbb8e8bca23bd6f4981f3c312e0620f94d6b16 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -494,7 +494,7 @@ return relaxed;
 /* -------------------------------------------------------------------------- */
 #define PDKIM_QP_ERROR_DECODE -1
 
 /* -------------------------------------------------------------------------- */
 #define PDKIM_QP_ERROR_DECODE -1
 

-char *
+static char *

 pdkim_decode_qp_char(char *qp_p, int *c)
 {
 char *initial_pos = qp_p;
 pdkim_decode_qp_char(char *qp_p, int *c)
 {
 char *initial_pos = qp_p;


@@ -507,7 +507,7 @@ if (isxdigit(*qp_p) && isxdigit(qp_p[1]))
   {
   /* Do hex conversion */
   *c = (isdigit(*qp_p) ? *qp_p - '0' : toupper(*qp_p) - 'A' + 10) << 4;
   {
   /* Do hex conversion */
   *c = (isdigit(*qp_p) ? *qp_p - '0' : toupper(*qp_p) - 'A' + 10) << 4;

-  *c != isdigit(qp_p[1]) ? qp_p[1] - '0' : toupper(qp_p[1]) - 'A' + 10;
+  *c |= isdigit(qp_p[1]) ? qp_p[1] - '0' : toupper(qp_p[1]) - 'A' + 10;

   return qp_p + 2;
   }
 
   return qp_p + 2;
   }