DKIM: Project coding standards

1 files changed, 1601 insertions, 1393 deletions

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 94328f7ee..4b48664df 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "../mytypes.h"
 #include "pdkim.h"
 #include "pdkim-rsa.h"
 
@@ -129,203 +130,256 @@ const char *pdkim_verify_ext_status_str(int ext_status) {
 /* -------------------------------------------------------------------------- */
 /* Print debugging functions */
 #ifdef PDKIM_DEBUG
-void pdkim_quoteprint(FILE *stream, const char *data, int len, int lf) {
-  int i;
-  const unsigned char *p = (const unsigned char *)data;
-
-  for (i=0;i<len;i++) {
-    const int c = p[i];
-    switch (c) {
-      case ' ' : fprintf(stream,"{SP}"); break;
-      case '\t': fprintf(stream,"{TB}"); break;
-      case '\r': fprintf(stream,"{CR}"); break;
-      case '\n': fprintf(stream,"{LF}"); break;
-      case '{' : fprintf(stream,"{BO}"); break;
-      case '}' : fprintf(stream,"{BC}"); break;
-      default:
-        if ( (c < 32) || (c > 127) )
-          fprintf(stream,"{%02x}",c);
-        else
-          fputc(c,stream);
+void
+pdkim_quoteprint(FILE *stream, const char *data, int len, int lf)
+{
+int i;
+const unsigned char *p = (const unsigned char *)data;
+
+for (i = 0; i<len; i++)
+  {
+  const int c = p[i];
+  switch (c)
+    {
+    case ' ' : fprintf(stream,"{SP}"); break;
+    case '\t': fprintf(stream,"{TB}"); break;
+    case '\r': fprintf(stream,"{CR}"); break;
+    case '\n': fprintf(stream,"{LF}"); break;
+    case '{' : fprintf(stream,"{BO}"); break;
+    case '}' : fprintf(stream,"{BC}"); break;
+    default:
+      if ( (c < 32) || (c > 127) )
+	fprintf(stream,"{%02x}",c);
+      else
+	fputc(c,stream);
       break;
     }
   }
-  if (lf)
-    fputc('\n',stream);
+if (lf)
+  fputc('\n',stream);
 }
-void pdkim_hexprint(FILE *stream, const char *data, int len, int lf) {
-  int i;
-  const unsigned char *p = (const unsigned char *)data;
 
-  for (i=0;i<len;i++) {
-    const int c = p[i];
-    fprintf(stream,"%02x",c);
+void
+pdkim_hexprint(FILE *stream, const char *data, int len, int lf)
+{
+int i;
+const unsigned char *p = (const unsigned char *)data;
+
+for (i =0 ; i<len; i++)
+  {
+  const int c = p[i];
+  fprintf(stream,"%02x",c);
   }
-  if (lf)
-    fputc('\n',stream);
+if (lf)
+  fputc('\n',stream);
 }
 #endif
 
 
 /* -------------------------------------------------------------------------- */
 /* Simple string list implementation for convinience */
-pdkim_stringlist *pdkim_append_stringlist(pdkim_stringlist *base, char *str) {
-  pdkim_stringlist *new_entry = malloc(sizeof(pdkim_stringlist));
-  if (new_entry == NULL) return NULL;
-  memset(new_entry,0,sizeof(pdkim_stringlist));
-  new_entry->value = strdup(str);
-  if (new_entry->value == NULL) return NULL;
-  if (base != NULL) {
-    pdkim_stringlist *last = base;
-    while (last->next != NULL) { last = last->next; }
-    last->next = new_entry;
-    return base;
-  }
-  else return new_entry;
-}
-pdkim_stringlist *pdkim_prepend_stringlist(pdkim_stringlist *base, char *str) {
-  pdkim_stringlist *new_entry = malloc(sizeof(pdkim_stringlist));
-  if (new_entry == NULL) return NULL;
-  memset(new_entry,0,sizeof(pdkim_stringlist));
-  new_entry->value = strdup(str);
-  if (new_entry->value == NULL) return NULL;
-  if (base != NULL) {
-    new_entry->next = base;
+pdkim_stringlist *
+pdkim_append_stringlist(pdkim_stringlist *base, char *str)
+{
+pdkim_stringlist *new_entry = malloc(sizeof(pdkim_stringlist));
+
+if (!new_entry) return NULL;
+memset(new_entry,0,sizeof(pdkim_stringlist));
+if (!(new_entry->value = strdup(str))) return NULL;
+if (base)
+  {
+  pdkim_stringlist *last = base;
+  while (last->next != NULL) { last = last->next; }
+  last->next = new_entry;
+  return base;
   }
+else
   return new_entry;
 }
 
+pdkim_stringlist *
+pdkim_prepend_stringlist(pdkim_stringlist *base, char *str)
+{
+pdkim_stringlist *new_entry = malloc(sizeof(pdkim_stringlist));
+
+if (!new_entry) return NULL;
+memset(new_entry,0,sizeof(pdkim_stringlist));
+if (!(new_entry->value = strdup(str))) return NULL;
+if (base)
+  new_entry->next = base;
+return new_entry;
+}
+
 
 /* -------------------------------------------------------------------------- */
 /* A small "growing string" implementation to escape malloc/realloc hell */
-pdkim_str *pdkim_strnew (const char *cstr) {
-  unsigned int len = cstr?strlen(cstr):0;
-  pdkim_str *p = malloc(sizeof(pdkim_str));
-  if (p == NULL) return NULL;
-  memset(p,0,sizeof(pdkim_str));
-  p->str = malloc(len+1);
-  if (p->str == NULL) {
-    free(p);
-    return NULL;
+
+pdkim_str *
+pdkim_strnew (const char *cstr)
+{
+unsigned int len = cstr ? strlen(cstr) : 0;
+pdkim_str *p = malloc(sizeof(pdkim_str));
+
+if (!p) return NULL;
+memset(p,0,sizeof(pdkim_str));
+if (!(p->str = malloc(len+1)))
+  {
+  free(p);
+  return NULL;
   }
-  p->allocated=(len+1);
-  p->len=len;
-  if (cstr) strcpy(p->str,cstr);
-  else p->str[p->len] = '\0';
-  return p;
+p->allocated = len+1;
+p->len = len;
+if (cstr)
+  strcpy(p->str,cstr);
+else
+  p->str[p->len] = '\0';
+return p;
 }
-char *pdkim_strncat(pdkim_str *str, const char *data, int len) {
-  if ((str->allocated - str->len) < (len+1)) {
-    /* Extend the buffer */
-    int num_frags = ((len+1)/PDKIM_STR_ALLOC_FRAG)+1;
-    char *n = realloc(str->str,
-                      (str->allocated+(num_frags*PDKIM_STR_ALLOC_FRAG)));
-    if (n == NULL) return NULL;
-    str->str = n;
-    str->allocated += (num_frags*PDKIM_STR_ALLOC_FRAG);
+
+char *
+pdkim_strncat(pdkim_str *str, const char *data, int len)
+{
+if ((str->allocated - str->len) < (len+1))
+  {
+  /* Extend the buffer */
+  int num_frags = ((len+1)/PDKIM_STR_ALLOC_FRAG)+1;
+  char *n = realloc(str->str,
+		    (str->allocated+(num_frags*PDKIM_STR_ALLOC_FRAG)));
+  if (n == NULL) return NULL;
+  str->str = n;
+  str->allocated += (num_frags*PDKIM_STR_ALLOC_FRAG);
   }
-  strncpy(&(str->str[str->len]),data,len);
-  str->len+=len;
-  str->str[str->len] = '\0';
-  return str->str;
+strncpy(&(str->str[str->len]), data, len);
+str->len += len;
+str->str[str->len] = '\0';
+return str->str;
 }
-char *pdkim_strcat(pdkim_str *str, const char *cstr) {
-  return pdkim_strncat(str, cstr, strlen(cstr));
+
+char *
+pdkim_strcat(pdkim_str *str, const char *cstr)
+{
+return pdkim_strncat(str, cstr, strlen(cstr));
 }
 
-char *pdkim_numcat(pdkim_str *str, unsigned long num) {
-  char minibuf[20];
-  snprintf(minibuf,20,"%lu",num);
-  return pdkim_strcat(str,minibuf);
+char *
+pdkim_numcat(pdkim_str *str, unsigned long num)
+{
+char minibuf[20];
+snprintf(minibuf,20,"%lu",num);
+return pdkim_strcat(str,minibuf);
 }
-char *pdkim_strtrim(pdkim_str *str) {
-  char *p = str->str;
-  char *q = str->str;
-  while ( (*p != '\0') && ((*p == '\t') || (*p == ' ')) ) p++;
-  while (*p != '\0') {*q = *p; q++; p++;}
+
+char *
+pdkim_strtrim(pdkim_str *str)
+{
+char *p = str->str;
+char *q = str->str;
+while ( (*p != '\0') && ((*p == '\t') || (*p == ' ')) ) p++;
+while (*p != '\0') {*q = *p; q++; p++;}
+*q = '\0';
+while ( (q != str->str) && ( (*q == '\0') || (*q == '\t') || (*q == ' ') ) )
+  {
   *q = '\0';
-  while ( (q != str->str) && ( (*q == '\0') || (*q == '\t') || (*q == ' ') ) ) {
-    *q = '\0';
-    q--;
+  q--;
   }
-  str->len = strlen(str->str);
-  return str->str;
+str->len = strlen(str->str);
+return str->str;
 }
-char *pdkim_strclear(pdkim_str *str) {
-  str->str[0] = '\0';
-  str->len = 0;
-  return str->str;
+
+char *
+pdkim_strclear(pdkim_str *str)
+{
+str->str[0] = '\0';
+str->len = 0;
+return str->str;
 }
-void pdkim_strfree(pdkim_str *str) {
-  if (str == NULL) return;
-  if (str->str != NULL) free(str->str);
-  free(str);
+
+void
+pdkim_strfree(pdkim_str *str)
+{
+if (!str) return;
+if (str->str) free(str->str);
+free(str);
 }
 
 
 
 /* -------------------------------------------------------------------------- */
-void pdkim_free_pubkey(pdkim_pubkey *pub) {
-  if (pub) {
-    if (pub->version        != NULL) free(pub->version);
-    if (pub->granularity    != NULL) free(pub->granularity);
-    if (pub->hashes         != NULL) free(pub->hashes);
-    if (pub->keytype        != NULL) free(pub->keytype);
-    if (pub->srvtype        != NULL) free(pub->srvtype);
-    if (pub->notes          != NULL) free(pub->notes);
-    if (pub->key            != NULL) free(pub->key);
-    free(pub);
+
+void
+pdkim_free_pubkey(pdkim_pubkey *pub)
+{
+if (pub)
+  {
+  if (pub->version    ) free(pub->version);
+  if (pub->granularity) free(pub->granularity);
+  if (pub->hashes     ) free(pub->hashes);
+  if (pub->keytype    ) free(pub->keytype);
+  if (pub->srvtype    ) free(pub->srvtype);
+  if (pub->notes      ) free(pub->notes);
+  if (pub->key        ) free(pub->key);
+  free(pub);
   }
 }
 
 
 /* -------------------------------------------------------------------------- */
-void pdkim_free_sig(pdkim_signature *sig) {
-  if (sig) {
-    pdkim_signature *next = (pdkim_signature *)sig->next;
-
-    pdkim_stringlist *e = sig->headers;
-    while(e != NULL) {
-      pdkim_stringlist *c = e;
-      if (e->value != NULL) free(e->value);
-      e = e->next;
-      free(c);
+
+void
+pdkim_free_sig(pdkim_signature *sig)
+{
+if (sig)
+  {
+  pdkim_signature *next = (pdkim_signature *)sig->next;
+
+  pdkim_stringlist *e = sig->headers;
+  while(e)
+    {
+    pdkim_stringlist *c = e;
+    if (e->value) free(e->value);
+    e = e->next;
+    free(c);
     }
 
-    if (sig->sigdata          != NULL) free(sig->sigdata);
-    if (sig->bodyhash         != NULL) free(sig->bodyhash);
-    if (sig->selector         != NULL) free(sig->selector);
-    if (sig->domain           != NULL) free(sig->domain);
-    if (sig->identity         != NULL) free(sig->identity);
-    if (sig->headernames      != NULL) free(sig->headernames);
-    if (sig->copiedheaders    != NULL) free(sig->copiedheaders);
-    if (sig->rsa_privkey      != NULL) free(sig->rsa_privkey);
-    if (sig->sign_headers     != NULL) free(sig->sign_headers);
-    if (sig->signature_header != NULL) free(sig->signature_header);
-    if (sig->sha1_body        != NULL) free(sig->sha1_body);
-    if (sig->sha2_body        != NULL) free(sig->sha2_body);
-
-    if (sig->pubkey != NULL) pdkim_free_pubkey(sig->pubkey);
-
-    free(sig);
-    if (next != NULL) pdkim_free_sig(next);
+  if (sig->sigdata         ) free(sig->sigdata);
+  if (sig->bodyhash        ) free(sig->bodyhash);
+  if (sig->selector        ) free(sig->selector);
+  if (sig->domain          ) free(sig->domain);
+  if (sig->identity        ) free(sig->identity);
+  if (sig->headernames     ) free(sig->headernames);
+  if (sig->copiedheaders   ) free(sig->copiedheaders);
+  if (sig->rsa_privkey     ) free(sig->rsa_privkey);
+  if (sig->sign_headers    ) free(sig->sign_headers);
+  if (sig->signature_header) free(sig->signature_header);
+  if (sig->sha1_body       ) free(sig->sha1_body);
+  if (sig->sha2_body       ) free(sig->sha2_body);
+
+  if (sig->pubkey) pdkim_free_pubkey(sig->pubkey);
+
+  free(sig);
+  if (next) pdkim_free_sig(next);
   }
 }
 
 
 /* -------------------------------------------------------------------------- */
-DLLEXPORT void pdkim_free_ctx(pdkim_ctx *ctx) {
-  if (ctx) {
-    pdkim_stringlist *e = ctx->headers;
-    while(e != NULL) {
-      pdkim_stringlist *c = e;
-      if (e->value != NULL) free(e->value);
-      e = e->next;
-      free(c);
+
+DLLEXPORT void
+pdkim_free_ctx(pdkim_ctx *ctx)
+{
+if (ctx)
+  {
+  pdkim_stringlist *e = ctx->headers;
+  while(e)
+    {
+    pdkim_stringlist *c = e;
+    if (e->value) free(e->value);
+    e = e->next;
+    free(c);
     }
-    pdkim_free_sig(ctx->sig);
-    pdkim_strfree(ctx->cur_header);
-    free(ctx);
+  pdkim_free_sig(ctx->sig);
+  pdkim_strfree(ctx->cur_header);
+  free(ctx);
   }
 }
 
@@ -335,188 +389,219 @@ DLLEXPORT void pdkim_free_ctx(pdkim_ctx *ctx) {
    the passed colon-separated "list", starting at entry
    "start". Returns the position of the header name in
    the list. */
-int header_name_match(const char *header,
+
+int
+header_name_match(const char *header,
                       char       *tick,
-                      int         do_tick) {
-  char *hname;
-  char *lcopy;
-  char *p;
-  char *q;
-  int rc = PDKIM_FAIL;
-
-  /* Get header name */
-  char *hcolon = strchr(header,':');
-  if (hcolon == NULL) return rc; /* This isn't a header */
-  hname = malloc((hcolon-header)+1);
-  if (hname == NULL) return PDKIM_ERR_OOM;
-  memset(hname,0,(hcolon-header)+1);
-  strncpy(hname,header,(hcolon-header));
-
-  /* Copy tick-off list locally, so we can punch zeroes into it */
-  lcopy = strdup(tick);
-  if (lcopy == NULL) {
-    free(hname);
-    return PDKIM_ERR_OOM;
+                      int         do_tick)
+{
+char *hname;
+char *lcopy;
+char *p;
+char *q;
+int rc = PDKIM_FAIL;
+
+/* Get header name */
+char *hcolon = strchr(header,':');
+
+if (!hcolon) return rc; /* This isn't a header */
+
+if (!(hname = malloc((hcolon-header)+1)))
+  return PDKIM_ERR_OOM;
+memset(hname,0,(hcolon-header)+1);
+strncpy(hname,header,(hcolon-header));
+
+/* Copy tick-off list locally, so we can punch zeroes into it */
+if (!(lcopy = strdup(tick)))
+  {
+  free(hname);
+  return PDKIM_ERR_OOM;
   }
-  p = lcopy;
-  q = strchr(p,':');
-  while (q != NULL) {
-    *q = '\0';
+p = lcopy;
+q = strchr(p,':');
+while (q)
+  {
+  *q = '\0';
 
-    if (strcasecmp(p,hname) == 0) {
-      rc = PDKIM_OK;
-      /* Invalidate header name instance in tick-off list */
-      if (do_tick) tick[p-lcopy] = '_';
-      goto BAIL;
+  if (strcasecmp(p,hname) == 0)
+    {
+    rc = PDKIM_OK;
+    /* Invalidate header name instance in tick-off list */
+    if (do_tick) tick[p-lcopy] = '_';
+    goto BAIL;
     }
 
-    p = q+1;
-    q = strchr(p,':');
+  p = q+1;
+  q = strchr(p,':');
   }
 
-  if (strcasecmp(p,hname) == 0) {
-    rc = PDKIM_OK;
-    /* Invalidate header name instance in tick-off list */
-    if (do_tick) tick[p-lcopy] = '_';
+if (strcasecmp(p,hname) == 0)
+  {
+  rc = PDKIM_OK;
+  /* Invalidate header name instance in tick-off list */
+  if (do_tick) tick[p-lcopy] = '_';
   }
 
-  BAIL:
-  free(hname);
-  free(lcopy);
-  return rc;
+BAIL:
+free(hname);
+free(lcopy);
+return rc;
 }
 
 
 /* -------------------------------------------------------------------------- */
 /* Performs "relaxed" canonicalization of a header. The returned pointer needs
    to be free()d. */
-char *pdkim_relax_header (char *header, int crlf) {
-  int past_field_name = 0;
-  int seen_wsp = 0;
-  char *p = header;
-  char *q;
-  char *relaxed = malloc(strlen(header)+3);
-  if (relaxed == NULL) return NULL;
-  q = relaxed;
-  while (*p != '\0') {
-    int c = *p;
-    /* Ignore CR & LF */
-    if ( (c == '\r') || (c == '\n') ) {
-      p++;
+
+char *
+pdkim_relax_header (char *header, int crlf)
+{
+BOOL past_field_name = FALSE;
+BOOL seen_wsp = FALSE;
+char *p;
+char *q;
+char *relaxed = malloc(strlen(header)+3);
+
+if (!relaxed) return NULL;
+
+q = relaxed;
+for (p = header; *p != '\0'; p++)
+  {
+  int c = *p;
+  /* Ignore CR & LF */
+  if (c == '\r' || c == '\n')
+    continue;
+  if (c == '\t' || c == ' ')
+    {
+    if (seen_wsp)
       continue;
+    c = ' ';			/* Turns WSP into SP */
+    seen_wsp = TRUE;
     }
-    if ( (c == '\t') || (c == ' ') ) {
-      c = ' '; /* Turns WSP into SP */
-      if (seen_wsp) {
-        p++;
-        continue;
-      }
-      else seen_wsp = 1;
-    }
-    else {
-      if ( (!past_field_name) && (c == ':') ) {
-        if (seen_wsp) q--;   /* This removes WSP before the colon */
-        seen_wsp = 1;        /* This removes WSP after the colon */
-        past_field_name = 1;
+  else
+    if (!past_field_name && c == ':')
+      {
+      if (seen_wsp) q--;	/* This removes WSP before the colon */
+      seen_wsp = TRUE;		/* This removes WSP after the colon */
+      past_field_name = TRUE;
       }
-      else seen_wsp = 0;
-    }
-    /* Lowercase header name */
-    if (!past_field_name) c = tolower(c);
-    *q = c;
-    p++;
-    q++;
+    else
+      seen_wsp = FALSE;
+
+  /* Lowercase header name */
+  if (!past_field_name) c = tolower(c);
+  *q++ = c;
   }
-  if ((q>relaxed) && (*(q-1) == ' ')) q--; /* Squash eventual trailing SP */
-  *q = '\0';
-  if (crlf) strcat(relaxed,"\r\n");
-  return relaxed;
+
+if (q > relaxed && q[-1] == ' ') q--; /* Squash eventual trailing SP */
+*q = '\0';
+
+if (crlf) strcat(relaxed,"\r\n");
+return relaxed;
 }
 
 
 /* -------------------------------------------------------------------------- */
 #define PDKIM_QP_ERROR_DECODE -1
-char *pdkim_decode_qp_char(char *qp_p, int *c) {
-  char *initial_pos = qp_p;
-
-  /* Advance one char */
-  qp_p++;
-
-  /* Check for two hex digits and decode them */
-  if (isxdigit(*qp_p) && isxdigit(qp_p[1])) {
-    /* Do hex conversion */
-    if (isdigit(*qp_p)) {*c = *qp_p - '0';}
-    else {*c = toupper(*qp_p) - 'A' + 10;}
-    *c <<= 4;
-    if (isdigit(qp_p[1])) {*c |= qp_p[1] - '0';}
-    else {*c |= toupper(qp_p[1]) - 'A' + 10;}
-    return qp_p + 2;
+
+char *
+pdkim_decode_qp_char(char *qp_p, int *c)
+{
+char *initial_pos = qp_p;
+
+/* Advance one char */
+qp_p++;
+
+/* Check for two hex digits and decode them */
+if (isxdigit(*qp_p) && isxdigit(qp_p[1]))
+  {
+  /* 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;
+  return qp_p + 2;
   }
 
-  /* Illegal char here */
-  *c = PDKIM_QP_ERROR_DECODE;
-  return initial_pos;
+/* Illegal char here */
+*c = PDKIM_QP_ERROR_DECODE;
+return initial_pos;
 }
 
 
 /* -------------------------------------------------------------------------- */
-char *pdkim_decode_qp(char *str) {
-  int nchar = 0;
-  char *q;
-  char *p = str;
-  char *n = malloc(strlen(p)+1);
-  if (n == NULL) return NULL;
-  *n = '\0';
-  q = n;
-  while (*p != '\0') {
-    if (*p == '=') {
-      p = pdkim_decode_qp_char(p,&nchar);
-      if (nchar >= 0) {
-        *q = nchar;
-        q++;
-        continue;
+
+char *
+pdkim_decode_qp(char *str)
+{
+int nchar = 0;
+char *q;
+char *p = str;
+char *n = malloc(strlen(p)+1);
+
+if (!n) return NULL;
+
+*n = '\0';
+q = n;
+while (*p != '\0')
+  {
+  if (*p == '=')
+    {
+    p = pdkim_decode_qp_char(p, &nchar);
+    if (nchar >= 0)
+      {
+      *q++ = nchar;
+      continue;
       }
     }
-    else {
-      *q = *p;
-      q++;
-    }
-    p++;
+  else
+    *q++ = *p;
+  p++;
   }
-  *q = '\0';
-  return n;
+*q = '\0';
+return n;
 }
 
 
 /* -------------------------------------------------------------------------- */
-char *pdkim_decode_base64(char *str, int *num_decoded) {
-  int dlen = 0;
-  char *res;
-
-  base64_decode(NULL, &dlen, (unsigned char *)str, strlen(str));
-  res = malloc(dlen+1);
-  if (res == NULL) return NULL;
-  if (base64_decode((unsigned char *)res,&dlen,(unsigned char *)str,strlen(str)) != 0) {
-    free(res);
-    return NULL;
+
+char *
+pdkim_decode_base64(char *str, int *num_decoded)
+{
+int dlen = 0;
+char *res;
+
+base64_decode(NULL, &dlen, (unsigned char *)str, strlen(str));
+
+if (!(res = malloc(dlen+1)))
+   return NULL;
+if (base64_decode((unsigned char *)res, &dlen, (unsigned char *)str, strlen(str)) != 0)
+  {
+  free(res);
+  return NULL;
   }
-  if (num_decoded != NULL) *num_decoded = dlen;
-  return res;
+
+if (num_decoded) *num_decoded = dlen;
+return res;
 }
 
+
 /* -------------------------------------------------------------------------- */
-char *pdkim_encode_base64(char *str, int num) {
-  int dlen = 0;
-  char *res;
-
-  base64_encode(NULL, &dlen, (unsigned char *)str, num);
-  res = malloc(dlen+1);
-  if (res == NULL) return NULL;
-  if (base64_encode((unsigned char *)res,&dlen,(unsigned char *)str,num) != 0) {
-    free(res);
-    return NULL;
+
+char *
+pdkim_encode_base64(char *str, int num)
+{
+int dlen = 0;
+char *res;
+
+base64_encode(NULL, &dlen, (unsigned char *)str, num);
+
+if (!(res = malloc(dlen+1)))
+  return NULL;
+if (base64_encode((unsigned char *)res, &dlen, (unsigned char *)str, num) != 0)
+  {
+  free(res);
+  return NULL;
   }
-  return res;
+return res;
 }
 
 
@@ -524,700 +609,752 @@ char *pdkim_encode_base64(char *str, int num) {
 #define PDKIM_HDR_LIMBO 0
 #define PDKIM_HDR_TAG   1
 #define PDKIM_HDR_VALUE 2
-pdkim_signature *pdkim_parse_sig_header(pdkim_ctx *ctx, char *raw_hdr) {
-  pdkim_signature *sig ;
-  char *p,*q;
-  pdkim_str *cur_tag = NULL;
-  pdkim_str *cur_val = NULL;
-  int past_hname = 0;
-  int in_b_val = 0;
-  int where = PDKIM_HDR_LIMBO;
-  int i;
-
-  sig = malloc(sizeof(pdkim_signature));
-  if (sig == NULL) return NULL;
-  memset(sig,0,sizeof(pdkim_signature));
-  sig->bodylength = -1;
-
-  sig->rawsig_no_b_val = malloc(strlen(raw_hdr)+1);
-  if (sig->rawsig_no_b_val == NULL) {
-    free(sig);
-    return NULL;
+
+pdkim_signature *
+pdkim_parse_sig_header(pdkim_ctx *ctx, char *raw_hdr)
+{
+pdkim_signature *sig ;
+char *p,*q;
+pdkim_str *cur_tag = NULL;
+pdkim_str *cur_val = NULL;
+BOOL past_hname = FALSE;
+BOOL in_b_val = FALSE;
+int where = PDKIM_HDR_LIMBO;
+int i;
+
+if (!(sig = malloc(sizeof(pdkim_signature)))) return NULL;
+memset(sig,0,sizeof(pdkim_signature));
+sig->bodylength = -1;
+
+if (!(sig->rawsig_no_b_val = malloc(strlen(raw_hdr)+1)))
+  {
+  free(sig);
+  return NULL;
   }
 
-  p = raw_hdr;
-  q = sig->rawsig_no_b_val;
+q = sig->rawsig_no_b_val;
 
-  while (1) {
+for (p = raw_hdr; ; p++)
+  {
+  char c = *p;
 
-    /* Ignore FWS */
-    if ( (*p == '\r') || (*p == '\n') )
-      goto NEXT_CHAR;
+  /* Ignore FWS */
+  if (c == '\r' || c == '\n')
+    goto NEXT_CHAR;
 
-    /* Fast-forward through header name */
-    if (!past_hname) {
-      if (*p == ':') past_hname = 1;
-      goto NEXT_CHAR;
+  /* Fast-forward through header name */
+  if (!past_hname)
+    {
+    if (c == ':') past_hname = TRUE;
+    goto NEXT_CHAR;
     }
 
-    if (where == PDKIM_HDR_LIMBO) {
-      /* In limbo, just wait for a tag-char to appear */
-      if (!((*p >= 'a') && (*p <= 'z')))
-        goto NEXT_CHAR;
+  if (where == PDKIM_HDR_LIMBO)
+    {
+    /* In limbo, just wait for a tag-char to appear */
+    if (!(c >= 'a' && c <= 'z'))
+      goto NEXT_CHAR;
 
-      where = PDKIM_HDR_TAG;
+    where = PDKIM_HDR_TAG;
     }
 
-    if (where == PDKIM_HDR_TAG) {
-      if (cur_tag == NULL)
-        cur_tag = pdkim_strnew(NULL);
+  if (where == PDKIM_HDR_TAG)
+    {
+    if (!cur_tag)
+      cur_tag = pdkim_strnew(NULL);
 
-      if ((*p >= 'a') && (*p <= 'z'))
-        pdkim_strncat(cur_tag,p,1);
+    if (c >= 'a' && c <= 'z')
+      pdkim_strncat(cur_tag, p, 1);
 
-      if (*p == '=') {
-        if (strcmp(cur_tag->str,"b") == 0) {
-          *q = '='; q++;
-          in_b_val = 1;
-        }
-        where = PDKIM_HDR_VALUE;
-        goto NEXT_CHAR;
+    if (c == '=')
+      {
+      if (strcmp(cur_tag->str, "b") == 0)
+        {
+	*q = '='; q++;
+	in_b_val = TRUE;
+	}
+      where = PDKIM_HDR_VALUE;
+      goto NEXT_CHAR;
       }
     }
 
-    if (where == PDKIM_HDR_VALUE) {
-      if (cur_val == NULL)
-        cur_val = pdkim_strnew(NULL);
-
-      if ( (*p == '\r') || (*p == '\n') || (*p == ' ') || (*p == '\t') )
-        goto NEXT_CHAR;
-
-      if ( (*p == ';') || (*p == '\0') ) {
-        if (cur_tag->len > 0) {
-          pdkim_strtrim(cur_val);
-          #ifdef PDKIM_DEBUG
-          if (ctx->debug_stream)
-            fprintf(ctx->debug_stream, " %s=%s\n", cur_tag->str, cur_val->str);
-          #endif
-          switch (cur_tag->str[0]) {
-            case 'b':
-              switch (cur_tag->str[1]) {
-                case 'h':
-                  sig->bodyhash = pdkim_decode_base64(cur_val->str,&(sig->bodyhash_len));
-                break;
-                default:
-                  sig->sigdata = pdkim_decode_base64(cur_val->str,&(sig->sigdata_len));
-                break;
-              }
-            break;
-            case 'v':
-              if (strcmp(cur_val->str,PDKIM_SIGNATURE_VERSION) == 0) {
-                /* We only support version 1, and that is currently the
-                   only version there is. */
-                sig->version = 1;
-              }
-            break;
-            case 'a':
-              i = 0;
-              while (pdkim_algos[i] != NULL) {
-                if (strcmp(cur_val->str,pdkim_algos[i]) == 0 ) {
-                  sig->algo = i;
-                  break;
-                }
-                i++;
-              }
-            break;
-            case 'c':
-              i = 0;
-              while (pdkim_combined_canons[i].str != NULL) {
-                if (strcmp(cur_val->str,pdkim_combined_canons[i].str) == 0 ) {
-                  sig->canon_headers = pdkim_combined_canons[i].canon_headers;
-                  sig->canon_body    = pdkim_combined_canons[i].canon_body;
-                  break;
-                }
-                i++;
-              }
-            break;
-            case 'q':
-              i = 0;
-              while (pdkim_querymethods[i] != NULL) {
-                if (strcmp(cur_val->str,pdkim_querymethods[i]) == 0 ) {
-                  sig->querymethod = i;
-                  break;
-                }
-                i++;
-              }
-            break;
-            case 's':
-              sig->selector = strdup(cur_val->str);
-            break;
-            case 'd':
-              sig->domain = strdup(cur_val->str);
-            break;
-            case 'i':
-              sig->identity = pdkim_decode_qp(cur_val->str);
-            break;
-            case 't':
-              sig->created = strtoul(cur_val->str,NULL,10);
-            break;
-            case 'x':
-              sig->expires = strtoul(cur_val->str,NULL,10);
-            break;
-            case 'l':
-              sig->bodylength = strtol(cur_val->str,NULL,10);
-            break;
-            case 'h':
-              sig->headernames = strdup(cur_val->str);
-            break;
-            case 'z':
-              sig->copiedheaders = pdkim_decode_qp(cur_val->str);
-            break;
-            default:
-              #ifdef PDKIM_DEBUG
-              if (ctx->debug_stream)
-                fprintf(ctx->debug_stream, " Unknown tag encountered\n");
-              #endif
-            break;
-          }
-        }
-        pdkim_strclear(cur_tag);
-        pdkim_strclear(cur_val);
-        in_b_val = 0;
-        where = PDKIM_HDR_LIMBO;
-        goto NEXT_CHAR;
+  if (where == PDKIM_HDR_VALUE)
+    {
+    if (!cur_val)
+      cur_val = pdkim_strnew(NULL);
+
+    if (c == '\r' || c == '\n' || c == ' ' || c == '\t')
+      goto NEXT_CHAR;
+
+    if (c == ';' || c == '\0')
+      {
+      if (cur_tag->len > 0)
+        {
+	pdkim_strtrim(cur_val);
+
+#ifdef PDKIM_DEBUG
+	if (ctx->debug_stream)
+	  fprintf(ctx->debug_stream, " %s=%s\n", cur_tag->str, cur_val->str);
+#endif
+
+	switch (cur_tag->str[0])
+	  {
+	  case 'b':
+	    if (cur_tag->str[1] == 'h')
+	      sig->bodyhash = pdkim_decode_base64(cur_val->str,
+		  &sig->bodyhash_len);
+	    else
+	      sig->sigdata = pdkim_decode_base64(cur_val->str,
+		  &sig->sigdata_len);
+	    break;
+	  case 'v':
+	      /* We only support version 1, and that is currently the
+		 only version there is. */
+	    if (strcmp(cur_val->str, PDKIM_SIGNATURE_VERSION) == 0)
+	      sig->version = 1;
+	    break;
+	  case 'a':
+	    for (i = 0; pdkim_algos[i]; i++)
+	      if (strcmp(cur_val->str, pdkim_algos[i]) == 0)
+	        {
+		sig->algo = i;
+		break;
+		}
+	    break;
+	  case 'c':
+	    for (i = 0; pdkim_combined_canons[i].str; i++)
+	      if (strcmp(cur_val->str, pdkim_combined_canons[i].str) == 0)
+	        {
+		sig->canon_headers = pdkim_combined_canons[i].canon_headers;
+		sig->canon_body    = pdkim_combined_canons[i].canon_body;
+		break;
+		}
+	    break;
+	  case 'q':
+	    for (i = 0; pdkim_querymethods[i]; i++)
+	      if (strcmp(cur_val->str, pdkim_querymethods[i]) == 0)
+	        {
+		sig->querymethod = i;
+		break;
+		}
+	    break;
+	  case 's':
+	    sig->selector = strdup(cur_val->str); break;
+	  case 'd':
+	    sig->domain = strdup(cur_val->str); break;
+	  case 'i':
+	    sig->identity = pdkim_decode_qp(cur_val->str); break;
+	  case 't':
+	    sig->created = strtoul(cur_val->str, NULL, 10); break;
+	  case 'x':
+	    sig->expires = strtoul(cur_val->str, NULL, 10); break;
+	  case 'l':
+	    sig->bodylength = strtol(cur_val->str, NULL, 10); break;
+	  case 'h':
+	    sig->headernames = strdup(cur_val->str); break;
+	  case 'z':
+	    sig->copiedheaders = pdkim_decode_qp(cur_val->str); break;
+	  default:
+#ifdef PDKIM_DEBUG
+	    if (ctx->debug_stream)
+	      fprintf(ctx->debug_stream, " Unknown tag encountered\n");
+#endif
+	    break;
+	  }
+	}
+      pdkim_strclear(cur_tag);
+      pdkim_strclear(cur_val);
+      in_b_val = FALSE;
+      where = PDKIM_HDR_LIMBO;
       }
-      else pdkim_strncat(cur_val,p,1);
+    else
+      pdkim_strncat(cur_val, p, 1);
     }
 
-    NEXT_CHAR:
-    if (*p == '\0') break;
+NEXT_CHAR:
+  if (c == '\0')
+    break;
 
-    if (!in_b_val) {
-      *q = *p;
-      q++;
-    }
-    p++;
+  if (!in_b_val)
+    *q++ = c;
   }
 
-  /* Make sure the most important bits are there. */
-  if (!(sig->domain      && (*(sig->domain)      != '\0') &&
-        sig->selector    && (*(sig->selector)    != '\0') &&
-        sig->headernames && (*(sig->headernames) != '\0') &&
-        sig->bodyhash    &&
-        sig->sigdata     &&
-        sig->version)) {
-    pdkim_free_sig(sig);
-    return NULL;
+/* Make sure the most important bits are there. */
+if (!(sig->domain      && (*(sig->domain)      != '\0') &&
+      sig->selector    && (*(sig->selector)    != '\0') &&
+      sig->headernames && (*(sig->headernames) != '\0') &&
+      sig->bodyhash    &&
+      sig->sigdata     &&
+      sig->version))
+  {
+  pdkim_free_sig(sig);
+  return NULL;
   }
 
-  *q = '\0';
-  /* Chomp raw header. The final newline must not be added to the signature. */
-  q--;
-  while( (q > sig->rawsig_no_b_val) && ((*q == '\r') || (*q == '\n')) ) {
-    *q = '\0'; q--;
-  }
+*q = '\0';
+/* Chomp raw header. The final newline must not be added to the signature. */
+q--;
+while (q > sig->rawsig_no_b_val  && (*q == '\r' || *q == '\n'))
+  *q = '\0'; q--;	/*XXX questionable code layout; possible bug */
 
-  #ifdef PDKIM_DEBUG
-  if (ctx->debug_stream) {
-    fprintf(ctx->debug_stream,
-            "PDKIM >> Raw signature w/o b= tag value >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-    pdkim_quoteprint(ctx->debug_stream,
-                     sig->rawsig_no_b_val,
-                     strlen(sig->rawsig_no_b_val), 1);
-    fprintf(ctx->debug_stream,
-            "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#ifdef PDKIM_DEBUG
+if (ctx->debug_stream)
+  {
+  fprintf(ctx->debug_stream,
+	  "PDKIM >> Raw signature w/o b= tag value >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+  pdkim_quoteprint(ctx->debug_stream,
+		   sig->rawsig_no_b_val,
+		   strlen(sig->rawsig_no_b_val), 1);
+  fprintf(ctx->debug_stream,
+	  "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
   }
-  #endif
+#endif
 
-  sig->sha1_body = malloc(sizeof(sha1_context));
-  if (sig->sha1_body == NULL) {
-    pdkim_free_sig(sig);
-    return NULL;
-  }
-  sig->sha2_body = malloc(sizeof(sha2_context));
-  if (sig->sha2_body == NULL) {
-    pdkim_free_sig(sig);
-    return NULL;
+if (  !(sig->sha1_body = malloc(sizeof(sha1_context)))
+   || !(sig->sha2_body = malloc(sizeof(sha2_context)))
+   )
+  {
+  pdkim_free_sig(sig);
+  return NULL;
   }
 
-  sha1_starts(sig->sha1_body);
-  sha2_starts(sig->sha2_body,0);
+sha1_starts(sig->sha1_body);
+sha2_starts(sig->sha2_body, 0);
 
-  return sig;
+return sig;
 }
 
 
 /* -------------------------------------------------------------------------- */
-pdkim_pubkey *pdkim_parse_pubkey_record(pdkim_ctx *ctx, char *raw_record) {
-  pdkim_pubkey *pub ;
-  char *p;
-  pdkim_str *cur_tag = NULL;
-  pdkim_str *cur_val = NULL;
-  int where = PDKIM_HDR_LIMBO;
 
-  pub = malloc(sizeof(pdkim_pubkey));
-  if (pub == NULL) return NULL;
-  memset(pub,0,sizeof(pdkim_pubkey));
+pdkim_pubkey *
+pdkim_parse_pubkey_record(pdkim_ctx *ctx, char *raw_record)
+{
+pdkim_pubkey *pub;
+char *p;
+pdkim_str *cur_tag = NULL;
+pdkim_str *cur_val = NULL;
+int where = PDKIM_HDR_LIMBO;
 
-  p = raw_record;
+if (!(pub = malloc(sizeof(pdkim_pubkey)))) return NULL;
+memset(pub,0,sizeof(pdkim_pubkey));
 
-  while (1) {
+for (p = raw_record; ; p++)
+  {
+  char c = *p;
 
-    /* Ignore FWS */
-    if ( (*p == '\r') || (*p == '\n') )
-      goto NEXT_CHAR;
+  /* Ignore FWS */
+  if (c == '\r' || c == '\n')
+    goto NEXT_CHAR;
 
-    if (where == PDKIM_HDR_LIMBO) {
-      /* In limbo, just wait for a tag-char to appear */
-      if (!((*p >= 'a') && (*p <= 'z')))
-        goto NEXT_CHAR;
+  if (where == PDKIM_HDR_LIMBO)
+    {
+    /* In limbo, just wait for a tag-char to appear */
+    if (!(c >= 'a' && c <= 'z'))
+      goto NEXT_CHAR;
 
-      where = PDKIM_HDR_TAG;
+    where = PDKIM_HDR_TAG;
     }
 
-    if (where == PDKIM_HDR_TAG) {
-      if (cur_tag == NULL)
-        cur_tag = pdkim_strnew(NULL);
+  if (where == PDKIM_HDR_TAG)
+    {
+    if (!cur_tag)
+      cur_tag = pdkim_strnew(NULL);
 
-      if ((*p >= 'a') && (*p <= 'z'))
-        pdkim_strncat(cur_tag,p,1);
+    if (c >= 'a' && c <= 'z')
+      pdkim_strncat(cur_tag, p, 1);
 
-      if (*p == '=') {
-        where = PDKIM_HDR_VALUE;
-        goto NEXT_CHAR;
+    if (c == '=')
+      {
+      where = PDKIM_HDR_VALUE;
+      goto NEXT_CHAR;
       }
     }
 
-    if (where == PDKIM_HDR_VALUE) {
-      if (cur_val == NULL)
-        cur_val = pdkim_strnew(NULL);
-
-      if ( (*p == '\r') || (*p == '\n') )
-        goto NEXT_CHAR;
-
-      if ( (*p == ';') || (*p == '\0') ) {
-        if (cur_tag->len > 0) {
-          pdkim_strtrim(cur_val);
-          #ifdef PDKIM_DEBUG
-          if (ctx->debug_stream)
-            fprintf(ctx->debug_stream, " %s=%s\n", cur_tag->str, cur_val->str);
-          #endif
-          switch (cur_tag->str[0]) {
-            case 'v':
-              /* This tag isn't evaluated because:
-                 - We only support version DKIM1.
-                 - Which is the default for this value (set below)
-                 - Other versions are currently not specified.      */
-            break;
-            case 'h':
-              pub->hashes = strdup(cur_val->str);
-            break;
-            case 'g':
-              pub->granularity = strdup(cur_val->str);
-            break;
-            case 'n':
-              pub->notes = pdkim_decode_qp(cur_val->str);
-            break;
-            case 'p':
-              pub->key = pdkim_decode_base64(cur_val->str,&(pub->key_len));
-            break;
-            case 'k':
-              pub->hashes = strdup(cur_val->str);
-            break;
-            case 's':
-              pub->srvtype = strdup(cur_val->str);
-            break;
-            case 't':
-              if (strchr(cur_val->str,'y') != NULL) pub->testing = 1;
-              if (strchr(cur_val->str,'s') != NULL) pub->no_subdomaining = 1;
-            break;
-            default:
-              #ifdef PDKIM_DEBUG
-              if (ctx->debug_stream)
-                fprintf(ctx->debug_stream, " Unknown tag encountered\n");
-              #endif
-            break;
-          }
-        }
-        pdkim_strclear(cur_tag);
-        pdkim_strclear(cur_val);
-        where = PDKIM_HDR_LIMBO;
-        goto NEXT_CHAR;
+  if (where == PDKIM_HDR_VALUE)
+    {
+    if (!cur_val)
+      cur_val = pdkim_strnew(NULL);
+
+    if (c == '\r' || c == '\n')
+      goto NEXT_CHAR;
+
+    if (c == ';' || c == '\0')
+      {
+      if (cur_tag->len > 0)
+        {
+	pdkim_strtrim(cur_val);
+#ifdef PDKIM_DEBUG
+	if (ctx->debug_stream)
+	  fprintf(ctx->debug_stream, " %s=%s\n", cur_tag->str, cur_val->str);
+#endif
+
+	switch (cur_tag->str[0])
+	  {
+	  case 'v':
+	    /* This tag isn't evaluated because:
+	       - We only support version DKIM1.
+	       - Which is the default for this value (set below)
+	       - Other versions are currently not specified.      */
+	    break;
+	  case 'h':
+	    pub->hashes = strdup(cur_val->str); break;
+	  case 'g':
+	    pub->granularity = strdup(cur_val->str); break;
+	  case 'n':
+	    pub->notes = pdkim_decode_qp(cur_val->str); break;
+	  case 'p':
+	    pub->key = pdkim_decode_base64(cur_val->str, &(pub->key_len)); break;
+	  case 'k':
+	    pub->hashes = strdup(cur_val->str); break;
+	  case 's':
+	    pub->srvtype = strdup(cur_val->str); break;
+	  case 't':
+	    if (strchr(cur_val->str,'y') != NULL) pub->testing = 1;
+	    if (strchr(cur_val->str,'s') != NULL) pub->no_subdomaining = 1;
+	    break;
+	  default:
+#ifdef PDKIM_DEBUG
+	    if (ctx->debug_stream)
+	      fprintf(ctx->debug_stream, " Unknown tag encountered\n");
+#endif
+	    break;
+	  }
+	}
+      pdkim_strclear(cur_tag);
+      pdkim_strclear(cur_val);
+      where = PDKIM_HDR_LIMBO;
       }
-      else pdkim_strncat(cur_val,p,1);
+    else
+      pdkim_strncat(cur_val, p, 1);
     }
 
-    NEXT_CHAR:
-    if (*p == '\0') break;
-    p++;
+NEXT_CHAR:
+  if (c == '\0') break;
   }
 
-  /* Set fallback defaults */
-  if (pub->version     == NULL) pub->version     = strdup(PDKIM_PUB_RECORD_VERSION);
-  if (pub->granularity == NULL) pub->granularity = strdup("*");
-  if (pub->keytype     == NULL) pub->keytype     = strdup("rsa");
-  if (pub->srvtype     == NULL) pub->srvtype     = strdup("*");
-
-  /* p= is required */
-  if (pub->key == NULL) {
-    pdkim_free_pubkey(pub);
-    return NULL;
-  }
+/* Set fallback defaults */
+if (!pub->version    ) pub->version     = strdup(PDKIM_PUB_RECORD_VERSION);
+if (!pub->granularity) pub->granularity = strdup("*");
+if (!pub->keytype    ) pub->keytype     = strdup("rsa");
+if (!pub->srvtype    ) pub->srvtype     = strdup("*");
 
+/* p= is required */
+if (pub->key)
   return pub;
+
+pdkim_free_pubkey(pub);
+return NULL;
 }
 
 
 /* -------------------------------------------------------------------------- */
-int pdkim_update_bodyhash(pdkim_ctx *ctx, const char *data, int len) {
-  pdkim_signature *sig = ctx->sig;
-  /* Cache relaxed version of data */
-  char *relaxed_data = NULL;
-  int   relaxed_len  = 0;
-
-  /* Traverse all signatures, updating their hashes. */
-  while (sig != NULL) {
-    /* Defaults to simple canon (no further treatment necessary) */
-    const char *canon_data = data;
-    int         canon_len = len;
-
-    if (sig->canon_body == PDKIM_CANON_RELAXED) {
-      /* Relax the line if not done already */
-      if (relaxed_data == NULL) {
-        int seen_wsp = 0;
-        const char *p = data;
-        int q = 0;
-        relaxed_data = malloc(len+1);
-        if (relaxed_data == NULL) return PDKIM_ERR_OOM;
-        while (*p != '\0') {
-          char c = *p;
-          if (c == '\r') {
-            if ( (q > 0) && (relaxed_data[q-1] == ' ') ) q--;
-          }
-          else if ( (c == '\t') || (c == ' ') ) {
-            c = ' '; /* Turns WSP into SP */
-            if (seen_wsp) {
-              p++;
-              continue;
-            }
-            else seen_wsp = 1;
-          }
-          else seen_wsp = 0;
-          relaxed_data[q++] = c;
-          p++;
-        }
-        relaxed_data[q] = '\0';
-        relaxed_len = q;
+
+int
+pdkim_update_bodyhash(pdkim_ctx *ctx, const char *data, int len)
+{
+pdkim_signature *sig = ctx->sig;
+/* Cache relaxed version of data */
+char *relaxed_data = NULL;
+int   relaxed_len  = 0;
+
+/* Traverse all signatures, updating their hashes. */
+while (sig)
+  {
+  /* Defaults to simple canon (no further treatment necessary) */
+  const char *canon_data = data;
+  int         canon_len = len;
+
+  if (sig->canon_body == PDKIM_CANON_RELAXED)
+    {
+    /* Relax the line if not done already */
+    if (!relaxed_data)
+      {
+      BOOL seen_wsp = FALSE;
+      const char *p;
+      int q = 0;
+
+      if (!(relaxed_data = malloc(len+1)))
+	return PDKIM_ERR_OOM;
+
+      for (p = data; *p; p++)
+        {
+	char c = *p;
+	if (c == '\r')
+	  {
+	  if (q > 0 && relaxed_data[q-1] == ' ')
+	    q--;
+	  }
+	else if (c == '\t' || c == ' ')
+	  {
+	  c = ' '; /* Turns WSP into SP */
+	  if (seen_wsp)
+	    continue;
+	  seen_wsp = TRUE;
+	  }
+	else
+	  seen_wsp = FALSE;
+	relaxed_data[q++] = c;
+	}
+      relaxed_data[q] = '\0';
+      relaxed_len = q;
       }
-      canon_data = relaxed_data;
-      canon_len  = relaxed_len;
+    canon_data = relaxed_data;
+    canon_len  = relaxed_len;
     }
 
-    /* Make sure we don't exceed the to-be-signed body length */
-    if ((sig->bodylength >= 0) &&
-        ((sig->signed_body_bytes+(unsigned long)canon_len) > sig->bodylength))
-      canon_len = (sig->bodylength - sig->signed_body_bytes);
+  /* Make sure we don't exceed the to-be-signed body length */
+  if (  sig->bodylength >= 0
+     && sig->signed_body_bytes + (unsigned long)canon_len > sig->bodylength
+     )
+    canon_len = sig->bodylength - sig->signed_body_bytes;
 
-    if (canon_len > 0) {
-      if (sig->algo == PDKIM_ALGO_RSA_SHA1)
-        sha1_update(sig->sha1_body,(unsigned char *)canon_data,canon_len);
-      else
-        sha2_update(sig->sha2_body,(unsigned char *)canon_data,canon_len);
-      sig->signed_body_bytes += canon_len;
+  if (canon_len > 0)
+    {
+    if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+      sha1_update(sig->sha1_body,(unsigned char *)canon_data,canon_len);
+    else
+      sha2_update(sig->sha2_body,(unsigned char *)canon_data,canon_len);
+
+    sig->signed_body_bytes += canon_len;
 #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream!=NULL)
-        pdkim_quoteprint(ctx->debug_stream,canon_data,canon_len,1);
+    if (ctx->debug_stream)
+      pdkim_quoteprint(ctx->debug_stream, canon_data, canon_len, 1);
 #endif
     }
 
-    sig = sig->next;
+  sig = sig->next;
   }
 
-  if (relaxed_data != NULL) free(relaxed_data);
-  return PDKIM_OK;
+if (relaxed_data) free(relaxed_data);
+return PDKIM_OK;
 }
 
 
 /* -------------------------------------------------------------------------- */
-int pdkim_finish_bodyhash(pdkim_ctx *ctx) {
-  pdkim_signature *sig = ctx->sig;
 
-  /* Traverse all signatures */
-  while (sig != NULL) {
+int
+pdkim_finish_bodyhash(pdkim_ctx *ctx)
+{
+pdkim_signature *sig = ctx->sig;
 
-    /* Finish hashes */
-    unsigned char bh[32]; /* SHA-256 = 32 Bytes,  SHA-1 = 20 Bytes */
-    if (sig->algo == PDKIM_ALGO_RSA_SHA1)
-      sha1_finish(sig->sha1_body,bh);
-    else
-      sha2_finish(sig->sha2_body,bh);
-
-    #ifdef PDKIM_DEBUG
-    if (ctx->debug_stream) {
-      fprintf(ctx->debug_stream, "PDKIM [%s] Body bytes hashed: %lu\n",
-        sig->domain, sig->signed_body_bytes);
-      fprintf(ctx->debug_stream, "PDKIM [%s] bh  computed: ", sig->domain);
-      pdkim_hexprint(ctx->debug_stream, (char *)bh,
-                     (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32,1);
+/* Traverse all signatures */
+while (sig)
+  {					/* Finish hashes */
+  unsigned char bh[32]; /* SHA-256 = 32 Bytes,  SHA-1 = 20 Bytes */
+
+  if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+    sha1_finish(sig->sha1_body,bh);
+  else
+    sha2_finish(sig->sha2_body,bh);
+
+#ifdef PDKIM_DEBUG
+  if (ctx->debug_stream)
+    {
+    fprintf(ctx->debug_stream, "PDKIM [%s] Body bytes hashed: %lu\n",
+      sig->domain, sig->signed_body_bytes);
+    fprintf(ctx->debug_stream, "PDKIM [%s] bh  computed: ", sig->domain);
+    pdkim_hexprint(ctx->debug_stream, (char *)bh,
+		   (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32,1);
     }
-    #endif
-
-    /* SIGNING -------------------------------------------------------------- */
-    if (ctx->mode == PDKIM_MODE_SIGN) {
-      sig->bodyhash_len = (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32;
-      sig->bodyhash = malloc(sig->bodyhash_len);
-      if (sig->bodyhash == NULL) return PDKIM_ERR_OOM;
-      memcpy(sig->bodyhash,bh,sig->bodyhash_len);
-
-      /* If bodylength limit is set, and we have received less bytes
-         than the requested amount, effectively remove the limit tag. */
-      if (sig->signed_body_bytes < sig->bodylength) sig->bodylength = -1;
+#endif
+
+  /* SIGNING -------------------------------------------------------------- */
+  if (ctx->mode == PDKIM_MODE_SIGN)
+    {
+    sig->bodyhash_len = (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32;
+
+    if (!(sig->bodyhash = malloc(sig->bodyhash_len)))
+      return PDKIM_ERR_OOM;
+    memcpy(sig->bodyhash, bh, sig->bodyhash_len);
+
+    /* If bodylength limit is set, and we have received less bytes
+       than the requested amount, effectively remove the limit tag. */
+    if (sig->signed_body_bytes < sig->bodylength)
+      sig->bodylength = -1;
     }
-    /* VERIFICATION --------------------------------------------------------- */
-    else {
-      /* Compare bodyhash */
-      if (memcmp(bh,sig->bodyhash,
-                 (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32) == 0) {
-        #ifdef PDKIM_DEBUG
-        if (ctx->debug_stream)
-          fprintf(ctx->debug_stream, "PDKIM [%s] Body hash verified OK\n",
-                  sig->domain);
-        #endif
+
+  /* VERIFICATION --------------------------------------------------------- */
+  else
+    {
+    /* Compare bodyhash */
+    if (memcmp(bh, sig->bodyhash,
+	       (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32) == 0)
+      {
+#ifdef PDKIM_DEBUG
+      if (ctx->debug_stream)
+	fprintf(ctx->debug_stream, "PDKIM [%s] Body hash verified OK\n",
+		sig->domain);
+#endif
       }
-      else {
-        #ifdef PDKIM_DEBUG
-        if (ctx->debug_stream) {
-          fprintf(ctx->debug_stream, "PDKIM [%s] bh signature: ", sig->domain);
-          pdkim_hexprint(ctx->debug_stream, sig->bodyhash,
-                           (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32,1);
-          fprintf(ctx->debug_stream, "PDKIM [%s] Body hash did NOT verify\n",
-                  sig->domain);
-        }
-        #endif
-        sig->verify_status     = PDKIM_VERIFY_FAIL;
-        sig->verify_ext_status = PDKIM_VERIFY_FAIL_BODY;
+    else
+      {
+#ifdef PDKIM_DEBUG
+      if (ctx->debug_stream)
+        {
+	fprintf(ctx->debug_stream, "PDKIM [%s] bh signature: ", sig->domain);
+	pdkim_hexprint(ctx->debug_stream, sig->bodyhash,
+			 (sig->algo == PDKIM_ALGO_RSA_SHA1)?20:32,1);
+	fprintf(ctx->debug_stream, "PDKIM [%s] Body hash did NOT verify\n",
+		sig->domain);
+	}
+#endif
+      sig->verify_status     = PDKIM_VERIFY_FAIL;
+      sig->verify_ext_status = PDKIM_VERIFY_FAIL_BODY;
       }
     }
 
-    sig = sig->next;
+  sig = sig->next;
   }
 
-  return PDKIM_OK;
+return PDKIM_OK;
 }
 
 
 
 /* -------------------------------------------------------------------------- */
 /* Callback from pdkim_feed below for processing complete body lines */
-int pdkim_bodyline_complete(pdkim_ctx *ctx) {
-  char *p = ctx->linebuf;
-  int   n = ctx->linebuf_offset;
-
-  /* Ignore extra data if we've seen the end-of-data marker */
-  if (ctx->seen_eod) goto BAIL;
-
-  /* We've always got one extra byte to stuff a zero ... */
-  ctx->linebuf[(ctx->linebuf_offset)] = '\0';
-
-  if (ctx->input_mode == PDKIM_INPUT_SMTP) {
-    /* Terminate on EOD marker */
-    if (memcmp(p,".\r\n",3) == 0) {
-      /* In simple body mode, if any empty lines were buffered,
-      replace with one. rfc 4871 3.4.3 */
-      if (ctx->sig && ctx->sig->canon_body == PDKIM_CANON_SIMPLE
-	 && ctx->num_buffered_crlf > 0)
-	pdkim_update_bodyhash(ctx,"\r\n",2);
-
-      ctx->seen_eod = 1;
-      goto BAIL;
+
+int
+pdkim_bodyline_complete(pdkim_ctx *ctx)
+{
+char *p = ctx->linebuf;
+int   n = ctx->linebuf_offset;
+
+/* Ignore extra data if we've seen the end-of-data marker */
+if (ctx->seen_eod) goto BAIL;
+
+/* We've always got one extra byte to stuff a zero ... */
+ctx->linebuf[(ctx->linebuf_offset)] = '\0';
+
+if (ctx->input_mode == PDKIM_INPUT_SMTP)
+  {
+  /* Terminate on EOD marker */
+  if (memcmp(p, ".\r\n", 3) == 0)
+    {
+    /* In simple body mode, if any empty lines were buffered,
+    replace with one. rfc 4871 3.4.3 */
+    if (  ctx->sig && ctx->sig->canon_body == PDKIM_CANON_SIMPLE
+       && ctx->num_buffered_crlf > 0
+       )
+      pdkim_update_bodyhash(ctx, "\r\n",2);
+
+    ctx->seen_eod = 1;
+    goto BAIL;
     }
-    /* Unstuff dots */
-    if (memcmp(p,"..",2) == 0) {
-      p++;
-      n--;
+  /* Unstuff dots */
+  if (memcmp(p, "..", 2) == 0)
+    {
+    p++;
+    n--;
     }
   }
 
-  /* Empty lines need to be buffered until we find a non-empty line */
-  if (memcmp(p,"\r\n",2) == 0) {
-    ctx->num_buffered_crlf++;
-    goto BAIL;
+/* Empty lines need to be buffered until we find a non-empty line */
+if (memcmp(p, "\r\n", 2) == 0)
+  {
+  ctx->num_buffered_crlf++;
+  goto BAIL;
   }
 
-  if (  ctx->sig
-     && ctx->sig->canon_body == PDKIM_CANON_RELAXED) {
-    /* Lines with just spaces need to be buffered too */
-    char *check = p;
-    while(memcmp(check,"\r\n",2) != 0) {
-      char c = *check;
+if (  ctx->sig
+   && ctx->sig->canon_body == PDKIM_CANON_RELAXED
+   )
+  {
+  /* Lines with just spaces need to be buffered too */
+  char *check = p;
+  while (memcmp(check, "\r\n", 2) != 0)
+    {
+    char c = *check;
 
-      if (c != '\t' && c != ' ')
-	goto PROCESS;
-      check++;
+    if (c != '\t' && c != ' ')
+      goto PROCESS;
+    check++;
     }
 
-    ctx->num_buffered_crlf++;
-    goto BAIL;
-  }
+  ctx->num_buffered_crlf++;
+  goto BAIL;
+}
 
-  PROCESS:
-  /* At this point, we have a non-empty line, so release the buffered ones. */
-  while (ctx->num_buffered_crlf) {
-    pdkim_update_bodyhash(ctx,"\r\n",2);
-    ctx->num_buffered_crlf--;
+PROCESS:
+/* At this point, we have a non-empty line, so release the buffered ones. */
+while (ctx->num_buffered_crlf)
+  {
+  pdkim_update_bodyhash(ctx, "\r\n", 2);
+  ctx->num_buffered_crlf--;
   }
 
-  pdkim_update_bodyhash(ctx,p,n);
+pdkim_update_bodyhash(ctx, p, n);
 
-  BAIL:
-  ctx->linebuf_offset = 0;
-  return PDKIM_OK;
+BAIL:
+ctx->linebuf_offset = 0;
+return PDKIM_OK;
 }
 
 
 /* -------------------------------------------------------------------------- */
 /* Callback from pdkim_feed below for processing complete headers */
 #define DKIM_SIGNATURE_HEADERNAME "DKIM-Signature:"
-int pdkim_header_complete(pdkim_ctx *ctx) {
-  pdkim_signature *sig = ctx->sig;
-
-  /* Special case: The last header can have an extra \r appended */
-  if ( (ctx->cur_header->len > 1) &&
-       (ctx->cur_header->str[(ctx->cur_header->len)-1] == '\r') ) {
-    ctx->cur_header->str[(ctx->cur_header->len)-1] = '\0';
-    ctx->cur_header->len--;
+
+int
+pdkim_header_complete(pdkim_ctx *ctx)
+{
+pdkim_signature *sig = ctx->sig;
+
+/* Special case: The last header can have an extra \r appended */
+if ( (ctx->cur_header->len > 1) &&
+     (ctx->cur_header->str[(ctx->cur_header->len)-1] == '\r') )
+  {
+  ctx->cur_header->str[(ctx->cur_header->len)-1] = '\0';
+  ctx->cur_header->len--;
   }
 
-  ctx->num_headers++;
-  if (ctx->num_headers > PDKIM_MAX_HEADERS) goto BAIL;
+ctx->num_headers++;
+if (ctx->num_headers > PDKIM_MAX_HEADERS) goto BAIL;
 
-  /* SIGNING -------------------------------------------------------------- */
-  if (ctx->mode == PDKIM_MODE_SIGN) {
-    /* Traverse all signatures */
-    while (sig != NULL) {
+/* SIGNING -------------------------------------------------------------- */
+if (ctx->mode == PDKIM_MODE_SIGN)
+  for ( ; sig; sig = sig->next)			/* Traverse all signatures */
+    if (header_name_match(ctx->cur_header->str,
+			  sig->sign_headers?
+			    sig->sign_headers:
+			    PDKIM_DEFAULT_SIGN_HEADERS, 0) == PDKIM_OK)
+      {
       pdkim_stringlist *list;
 
-      if (header_name_match(ctx->cur_header->str,
-                            sig->sign_headers?
-                              sig->sign_headers:
-                              PDKIM_DEFAULT_SIGN_HEADERS, 0) != PDKIM_OK) goto NEXT_SIG;
-
       /* Add header to the signed headers list (in reverse order) */
-      list = pdkim_prepend_stringlist(sig->headers,
-                                      ctx->cur_header->str);
-      if (list == NULL) return PDKIM_ERR_OOM;
+      if (!(list = pdkim_prepend_stringlist(sig->headers,
+				    ctx->cur_header->str)))
+	return PDKIM_ERR_OOM;
       sig->headers = list;
+      }
 
-      NEXT_SIG:
-      sig = sig->next;
-    }
-  }
+/* DKIM-Signature: headers are added to the verification list */
+if (ctx->mode == PDKIM_MODE_VERIFY)
+  {
+  if (strncasecmp(ctx->cur_header->str,
+		  DKIM_SIGNATURE_HEADERNAME,
+		  strlen(DKIM_SIGNATURE_HEADERNAME)) == 0)
+    {
+    pdkim_signature *new_sig;
 
-  /* DKIM-Signature: headers are added to the verification list */
-  if (ctx->mode == PDKIM_MODE_VERIFY) {
-    if (strncasecmp(ctx->cur_header->str,
-                    DKIM_SIGNATURE_HEADERNAME,
-                    strlen(DKIM_SIGNATURE_HEADERNAME)) == 0) {
-      pdkim_signature *new_sig;
-      /* Create and chain new signature block */
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream)
-        fprintf(ctx->debug_stream,
-          "PDKIM >> Found sig, trying to parse >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-      #endif
-      new_sig = pdkim_parse_sig_header(ctx, ctx->cur_header->str);
-      if (new_sig != NULL) {
-        pdkim_signature *last_sig = ctx->sig;
-        if (last_sig == NULL) {
-          ctx->sig = new_sig;
-        }
-        else {
-          while (last_sig->next != NULL) { last_sig = last_sig->next; }
-          last_sig->next = new_sig;
-        }
-      }
-      else {
-        #ifdef PDKIM_DEBUG
-        if (ctx->debug_stream) {
-          fprintf(ctx->debug_stream,"Error while parsing signature header\n");
-          fprintf(ctx->debug_stream,
-            "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-        }
-        #endif
+    /* Create and chain new signature block */
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      fprintf(ctx->debug_stream,
+	"PDKIM >> Found sig, trying to parse >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+#endif
+
+    if ((new_sig = pdkim_parse_sig_header(ctx, ctx->cur_header->str)))
+      {
+      pdkim_signature *last_sig = ctx->sig;
+      if (!last_sig)
+	ctx->sig = new_sig;
+      else
+        {
+	while (last_sig->next) last_sig = last_sig->next;
+	last_sig->next = new_sig;
+	}
       }
+    else
+#ifdef PDKIM_DEBUG
+      if (ctx->debug_stream)
+        {
+	fprintf(ctx->debug_stream,"Error while parsing signature header\n");
+	fprintf(ctx->debug_stream,
+	  "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+	}
+#endif
     }
-    /* every other header is stored for signature verification */
-    else {
-      pdkim_stringlist *list;
 
-      list = pdkim_prepend_stringlist(ctx->headers,
-                                      ctx->cur_header->str);
-      if (list == NULL) return PDKIM_ERR_OOM;
-      ctx->headers = list;
+  /* every other header is stored for signature verification */
+  else
+    {
+    pdkim_stringlist *list;
+
+    if (!(list = pdkim_prepend_stringlist(ctx->headers,
+				    ctx->cur_header->str)))
+      return PDKIM_ERR_OOM;
+    ctx->headers = list;
     }
   }
 
-  BAIL:
-  pdkim_strclear(ctx->cur_header); /* Re-use existing pdkim_str */
-  return PDKIM_OK;
+BAIL:
+pdkim_strclear(ctx->cur_header); /* Re-use existing pdkim_str */
+return PDKIM_OK;
 }
 
 
 
 /* -------------------------------------------------------------------------- */
 #define HEADER_BUFFER_FRAG_SIZE 256
-DLLEXPORT int pdkim_feed (pdkim_ctx *ctx,
-                char *data,
-                int   len) {
-  int p;
-  for (p=0;p<len;p++) {
-    char c = data[p];
-    if (ctx->past_headers) {
-      /* Processing body byte */
-      ctx->linebuf[(ctx->linebuf_offset)++] = c;
-      if (c == '\n') {
-        int rc = pdkim_bodyline_complete(ctx); /* End of line */
-        if (rc != PDKIM_OK) return rc;
+
+DLLEXPORT int
+pdkim_feed (pdkim_ctx *ctx, char *data, int len)
+{
+int p;
+
+for (p = 0; p<len; p++)
+  {
+  char c = data[p];
+
+  if (ctx->past_headers)
+    {
+    /* Processing body byte */
+    ctx->linebuf[(ctx->linebuf_offset)++] = c;
+    if (c == '\n')
+      {
+      int rc = pdkim_bodyline_complete(ctx); /* End of line */
+      if (rc != PDKIM_OK) return rc;
       }
-      if (ctx->linebuf_offset == (PDKIM_MAX_BODY_LINE_LEN-1))
-        return PDKIM_ERR_LONG_LINE;
+    if (ctx->linebuf_offset == (PDKIM_MAX_BODY_LINE_LEN-1))
+      return PDKIM_ERR_LONG_LINE;
     }
-    else {
-      /* Processing header byte */
-      if (c != '\r') {
-        if (c == '\n') {
-          if (ctx->seen_lf) {
-            int rc = pdkim_header_complete(ctx); /* Seen last header line */
-            if (rc != PDKIM_OK) return rc;
-            ctx->past_headers = 1;
-            ctx->seen_lf = 0;
+  else
+    {
+    /* Processing header byte */
+    if (c != '\r')
+      {
+      if (c == '\n')
+        {
+	if (ctx->seen_lf)
+	  {
+	  int rc = pdkim_header_complete(ctx); /* Seen last header line */
+	  if (rc != PDKIM_OK) return rc;
+
+	  ctx->past_headers = 1;
+	  ctx->seen_lf = 0;
 #ifdef PDKIM_DEBUG
-            if (ctx->debug_stream)
-              fprintf(ctx->debug_stream,
-                "PDKIM >> Hashed body data, canonicalized >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+	  if (ctx->debug_stream)
+	    fprintf(ctx->debug_stream,
+	      "PDKIM >> Hashed body data, canonicalized >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
 #endif
-            continue;
-          }
-          else ctx->seen_lf = 1;
-        }
-        else if (ctx->seen_lf) {
-          if (! ((c == '\t') || (c == ' '))) {
-            int rc = pdkim_header_complete(ctx); /* End of header */
-            if (rc != PDKIM_OK) return rc;
-          }
-          ctx->seen_lf = 0;
-        }
+	  continue;
+	  }
+	else
+	  ctx->seen_lf = 1;
+	}
+      else if (ctx->seen_lf)
+        {
+	if (!(c == '\t' || c == ' '))
+	  {
+	  int rc = pdkim_header_complete(ctx); /* End of header */
+	  if (rc != PDKIM_OK) return rc;
+	  }
+	ctx->seen_lf = 0;
+	}
       }
-      if (ctx->cur_header == NULL) {
-        ctx->cur_header = pdkim_strnew(NULL);
-        if (ctx->cur_header == NULL) return PDKIM_ERR_OOM;
-      }
-      if (ctx->cur_header->len < PDKIM_MAX_HEADER_LEN)
-        if (pdkim_strncat(ctx->cur_header,&data[p],1) == NULL)
-          return PDKIM_ERR_OOM;
+
+    if (!ctx->cur_header)
+      if (!(ctx->cur_header = pdkim_strnew(NULL)))
+	return PDKIM_ERR_OOM;
+
+    if (ctx->cur_header->len < PDKIM_MAX_HEADER_LEN)
+      if (!pdkim_strncat(ctx->cur_header, &data[p], 1))
+	return PDKIM_ERR_OOM;
     }
   }
-  return PDKIM_OK;
+return PDKIM_OK;
 }
 
 /*
@@ -1241,664 +1378,725 @@ DLLEXPORT int pdkim_feed (pdkim_ctx *ctx,
  * names loinger than 78, or bogus col. Input is assumed to be free of line breaks.
  */
 
-static char *pdkim_headcat(int *col, pdkim_str *str, const char*pad,const char *intro, const char *payload ) {
-  size_t l;
-  if( pad)
+static char *
+pdkim_headcat(int *col, pdkim_str *str, const char * pad,
+  const char *intro, const char *payload)
+{
+size_t l;
+
+if (pad)
   {
-    l = strlen(pad);
-    if( *col + l > 78 )
+  l = strlen(pad);
+  if (*col + l > 78)
     {
-      pdkim_strcat(str, "\r\n\t");
-      *col=1;
+    pdkim_strcat(str, "\r\n\t");
+    *col = 1;
     }
-    pdkim_strncat(str, pad,l);
-    *col +=l;
+  pdkim_strncat(str, pad, l);
+  *col += l;
   }
 
-  l=(pad?1:0) + (intro?strlen(intro):0 );
+l = (pad?1:0) + (intro?strlen(intro):0);
 
-  if( *col + l > 78 )
+if (*col + l > 78)
   { /*can't fit intro - start a new line to make room.*/
-    pdkim_strcat(str, "\r\n\t");
-    *col=1;
-    l= intro?strlen(intro):0;
+  pdkim_strcat(str, "\r\n\t");
+  *col = 1;
+  l = intro?strlen(intro):0;
   }
 
-  l += payload ? strlen(payload):0 ;
+l += payload ? strlen(payload):0 ;
 
-  while(l>77)
+while (l>77)
   { /* this fragment will not fit on a single line */
-    if( pad )
+  if (pad)
     {
-      pdkim_strcat(str, " ");
-      *col +=1;
-      pad=NULL; // only want this once
-      l--;
+    pdkim_strcat(str, " ");
+    *col += 1;
+    pad = NULL; /* only want this once */
+    l--;
     }
-    if( intro )
+
+  if (intro)
     {
-      size_t sl=strlen(intro);
-      pdkim_strncat(str, intro,sl);
-      *col +=sl;
-      l-=sl;
-      intro=NULL; // only want this once
+    size_t sl = strlen(intro);
+
+    pdkim_strncat(str, intro,sl);
+    *col += sl;
+    l -= sl;
+    intro = NULL; /* only want this once */
     }
-    if(payload)
+
+  if (payload)
     {
-      size_t sl=strlen(payload);
-      size_t chomp = *col+sl < 77 ? sl : 78-*col;
-      pdkim_strncat(str, payload,chomp);
-      *col +=chomp;
-      payload+=chomp;
-      l-=chomp-1;
+    size_t sl = strlen(payload);
+    size_t chomp = *col+sl < 77 ? sl : 78-*col;
+
+    pdkim_strncat(str, payload,chomp);
+    *col += chomp;
+    payload += chomp;
+    l -= chomp-1;
     }
-    // the while precondition tells us it didn't fit.
-    pdkim_strcat(str, "\r\n\t");
-    *col=1;
+
+  /* the while precondition tells us it didn't fit. */
+  pdkim_strcat(str, "\r\n\t");
+  *col = 1;
   }
-  if( *col + l > 78 )
+
+if (*col + l > 78)
   {
-    pdkim_strcat(str, "\r\n\t");
-    *col=1;
-    pad=NULL;
+  pdkim_strcat(str, "\r\n\t");
+  *col = 1;
+  pad = NULL;
   }
 
-  if( pad )
+if (pad)
   {
-    pdkim_strcat(str, " ");
-    *col +=1;
-    pad=NULL;
+  pdkim_strcat(str, " ");
+  *col += 1;
+  pad = NULL;
   }
 
-  if( intro )
+if (intro)
   {
-    size_t sl=strlen(intro);
-    pdkim_strncat(str, intro,sl);
-    *col +=sl;
-    l-=sl;
-    intro=NULL;
+  size_t sl = strlen(intro);
+
+  pdkim_strncat(str, intro, sl);
+  *col += sl;
+  l -= sl;
+  intro = NULL;
   }
-  if(payload)
+
+if (payload)
   {
-    size_t sl=strlen(payload);
-    pdkim_strncat(str, payload,sl);
-    *col +=sl;
+  size_t sl = strlen(payload);
+
+  pdkim_strncat(str, payload, sl);
+  *col += sl;
   }
 
-  return str->str;
+return str->str;
 }
 
+
 /* -------------------------------------------------------------------------- */
-char *pdkim_create_header(pdkim_signature *sig, int final) {
-  char *rc = NULL;
-  char *base64_bh = NULL;
-  char *base64_b  = NULL;
-  int col=0;
-  pdkim_str *hdr = pdkim_strnew("DKIM-Signature: v="PDKIM_SIGNATURE_VERSION);
-  if (hdr == NULL) return NULL;
-  pdkim_str *canon_all = pdkim_strnew(pdkim_canons[sig->canon_headers]);
-  if (canon_all == NULL) goto BAIL;
-
-  base64_bh = pdkim_encode_base64(sig->bodyhash, sig->bodyhash_len);
-  if (base64_bh == NULL) goto BAIL;
-
-  col=strlen(hdr->str);
-
-  /* Required and static bits */
-  if (
-        pdkim_headcat(&col,hdr,";","a=",pdkim_algos[sig->algo]) &&
-        pdkim_headcat(&col,hdr,";","q=",pdkim_querymethods[sig->querymethod])  &&
-          pdkim_strcat(canon_all,"/")                           &&
-          pdkim_strcat(canon_all,pdkim_canons[sig->canon_body]) &&
-        pdkim_headcat(&col,hdr,";","c=",canon_all->str)         &&
-        pdkim_headcat(&col,hdr,";","d=",sig->domain)            &&
-        pdkim_headcat(&col,hdr,";","s=",sig->selector)
-     ) {
-    /* list of eader names can be split between items. */
+
+char *
+pdkim_create_header(pdkim_signature *sig, int final)
+{
+char *rc = NULL;
+char *base64_bh = NULL;
+char *base64_b  = NULL;
+int col = 0;
+pdkim_str *hdr;
+pdkim_str *canon_all;
+
+if (!(hdr = pdkim_strnew("DKIM-Signature: v="PDKIM_SIGNATURE_VERSION)))
+  return NULL;
+
+if (!(canon_all = pdkim_strnew(pdkim_canons[sig->canon_headers])))
+  goto BAIL;
+
+if (!(base64_bh = pdkim_encode_base64(sig->bodyhash, sig->bodyhash_len)))
+  goto BAIL;
+
+col = strlen(hdr->str);
+
+/* Required and static bits */
+if (
+      pdkim_headcat(&col,hdr,";","a=",pdkim_algos[sig->algo]) &&
+      pdkim_headcat(&col,hdr,";","q=",pdkim_querymethods[sig->querymethod])  &&
+	pdkim_strcat(canon_all,"/")                           &&
+	pdkim_strcat(canon_all,pdkim_canons[sig->canon_body]) &&
+      pdkim_headcat(&col,hdr,";","c=",canon_all->str)         &&
+      pdkim_headcat(&col,hdr,";","d=",sig->domain)            &&
+      pdkim_headcat(&col,hdr,";","s=",sig->selector)
+   )
+  {
+  /* list of eader names can be split between items. */
     {
-      char *n=strdup(sig->headernames);
-      char *f=n;
-      char *i="h=";
-      char *s=";";
-      if(!n) goto BAIL;
-      while (*n)
+    char *n = strdup(sig->headernames);
+    char *f = n;
+    char *i = "h=";
+    char *s = ";";
+
+    if (!n) goto BAIL;
+    while (*n)
       {
-          char *c=strchr(n,':');
-          if(c) *c='\0';
-          if(!i)
-          {
-            if (!pdkim_headcat(&col,hdr,NULL,NULL,":"))
-            {
-              free(f);
-              goto BAIL;
-            }
-          }
-          if( !pdkim_headcat(&col,hdr,s,i,n))
-          {
-            free(f);
-            goto BAIL;
-          }
-          if(c) n=c+1 ; else break;
-          s=NULL;
-          i=NULL;
-      }
-      free(f);
-    }
-    if(!pdkim_headcat(&col,hdr,";","bh=",base64_bh))
-        goto BAIL;
+      char *c = strchr(n,':');
 
-    /* Optional bits */
-    if (sig->identity != NULL) {
-      if(!pdkim_headcat(&col,hdr,";","i=",sig->identity)){
-        goto BAIL;
-      }
-    }
+      if (c) *c ='\0';
 
-    if (sig->created > 0) {
-      char minibuf[20];
-      snprintf(minibuf,20,"%lu",sig->created);
-      if(!pdkim_headcat(&col,hdr,";","t=",minibuf)) {
-        goto BAIL;
-      }
-    }
-    if (sig->expires > 0) {
-      char minibuf[20];
-      snprintf(minibuf,20,"%lu",sig->expires);
-      if(!pdkim_headcat(&col,hdr,";","x=",minibuf)) {
-        goto BAIL;
-      }
-    }
-    if (sig->bodylength >= 0) {
-      char minibuf[20];
-      snprintf(minibuf,20,"%lu",sig->bodylength);
-      if(!pdkim_headcat(&col,hdr,";","l=",minibuf)) {
-        goto BAIL;
+      if (!i)
+	if (!pdkim_headcat(&col,hdr,NULL,NULL,":"))
+	  {
+	  free(f);
+	  goto BAIL;
+	  }
+
+      if (!pdkim_headcat(&col,hdr,s,i,n))
+	{
+	free(f);
+	goto BAIL;
+	}
+
+      if (!c)
+        break;
+
+      n = c+1;
+      s = NULL;
+      i = NULL;
       }
+    free(f);
     }
 
-    /* Preliminary or final version? */
-    if (final) {
-      base64_b = pdkim_encode_base64(sig->sigdata, sig->sigdata_len);
-      if (base64_b == NULL) goto BAIL;
-      if(!pdkim_headcat(&col,hdr,";","b=",base64_b)) goto BAIL;
+  if(!pdkim_headcat(&col, hdr, ";", "bh=", base64_bh))
+    goto BAIL;
+
+  /* Optional bits */
+  if (sig->identity)
+    if(!pdkim_headcat(&col, hdr, ";", "i=", sig->identity))
+      goto BAIL;
+
+  if (sig->created > 0)
+    {
+    char minibuf[20];
+
+    snprintf(minibuf,20,"%lu",sig->created);
+    if(!pdkim_headcat(&col, hdr, ";", "t=", minibuf))
+      goto BAIL;
+  }
+
+  if (sig->expires > 0)
+    {
+    char minibuf[20];
+
+    snprintf(minibuf,20,"%lu",sig->expires);
+    if(!pdkim_headcat(&col, hdr, ";", "x=", minibuf))
+      goto BAIL;
     }
-    else {
-      if(!pdkim_headcat(&col,hdr,";","b=","")) goto BAIL;
+
+  if (sig->bodylength >= 0)
+    {
+    char minibuf[20];
+
+    snprintf(minibuf,20,"%lu",sig->bodylength);
+    if(!pdkim_headcat(&col, hdr, ";", "l=", minibuf))
+      goto BAIL;
     }
 
-    /* add trailing semicolon: I'm not sure if this is actually needed */
-    if(!pdkim_headcat(&col,hdr,NULL,";","")) goto BAIL;
+  /* Preliminary or final version? */
+  if (final)
+    {
+    if (!(base64_b = pdkim_encode_base64(sig->sigdata, sig->sigdata_len)))
+      goto BAIL;
+    if (!pdkim_headcat(&col, hdr, ";", "b=", base64_b))
+      goto BAIL;
+  }
+  else 
+    if(!pdkim_headcat(&col, hdr, ";", "b=", ""))
+      goto BAIL;
 
-    goto DONE;
+  /* add trailing semicolon: I'm not sure if this is actually needed */
+  if (!pdkim_headcat(&col,hdr,NULL,";",""))
+    goto BAIL;
   }
 
-  DONE:
-  rc = strdup(hdr->str);
+rc = strdup(hdr->str);
 
-  BAIL:
-  pdkim_strfree(hdr);
-  if (canon_all != NULL) pdkim_strfree(canon_all);
-  if (base64_bh != NULL) free(base64_bh);
-  if (base64_b  != NULL) free(base64_b);
-  return rc;
+BAIL:
+pdkim_strfree(hdr);
+if (canon_all) pdkim_strfree(canon_all);
+if (base64_bh) free(base64_bh);
+if (base64_b ) free(base64_b);
+return rc;
 }
 
 
 /* -------------------------------------------------------------------------- */
-DLLEXPORT int pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatures) {
-  pdkim_signature *sig = ctx->sig;
-  pdkim_str *headernames = NULL;             /* Collected signed header names */
-
-  /* Check if we must still flush a (partial) header. If that is the
-     case, the message has no body, and we must compute a body hash
-     out of '<CR><LF>' */
-  if (ctx->cur_header && ctx->cur_header->len) {
-    int rc = pdkim_header_complete(ctx);
-    if (rc != PDKIM_OK) return rc;
-    pdkim_update_bodyhash(ctx,"\r\n",2);
+
+DLLEXPORT int
+pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatures)
+{
+pdkim_signature *sig = ctx->sig;
+pdkim_str *headernames = NULL;             /* Collected signed header names */
+
+/* Check if we must still flush a (partial) header. If that is the
+   case, the message has no body, and we must compute a body hash
+   out of '<CR><LF>' */
+if (ctx->cur_header && ctx->cur_header->len)
+  {
+  int rc = pdkim_header_complete(ctx);
+  if (rc != PDKIM_OK) return rc;
+  pdkim_update_bodyhash(ctx, "\r\n", 2);
   }
-  else {
-    /* For non-smtp input, check if there's an unfinished line in the
-       body line buffer. If that is the case, we must add a CRLF to the
-       hash to properly terminate the message. */
-    if ((ctx->input_mode == PDKIM_INPUT_NORMAL) && ctx->linebuf_offset) {
-      pdkim_update_bodyhash(ctx, ctx->linebuf, ctx->linebuf_offset);
-      pdkim_update_bodyhash(ctx,"\r\n",2);
+else
+  {
+  /* For non-smtp input, check if there's an unfinished line in the
+     body line buffer. If that is the case, we must add a CRLF to the
+     hash to properly terminate the message. */
+  if ((ctx->input_mode == PDKIM_INPUT_NORMAL) && ctx->linebuf_offset)
+    {
+    pdkim_update_bodyhash(ctx, ctx->linebuf, ctx->linebuf_offset);
+    pdkim_update_bodyhash(ctx, "\r\n", 2);
     }
-    #ifdef PDKIM_DEBUG
-    if (ctx->debug_stream)
-      fprintf(ctx->debug_stream,
-        "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-    #endif
+#ifdef PDKIM_DEBUG
+  if (ctx->debug_stream)
+    fprintf(ctx->debug_stream,
+      "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#endif
   }
 
-  /* Build (and/or evaluate) body hash */
-  if (pdkim_finish_bodyhash(ctx) != PDKIM_OK) return PDKIM_ERR_OOM;
+/* Build (and/or evaluate) body hash */
+if (pdkim_finish_bodyhash(ctx) != PDKIM_OK)
+  return PDKIM_ERR_OOM;
 
-  /* SIGNING -------------------------------------------------------------- */
-  if (ctx->mode == PDKIM_MODE_SIGN) {
-    headernames = pdkim_strnew(NULL);
-    if (headernames == NULL) return PDKIM_ERR_OOM;
-  }
-  /* ---------------------------------------------------------------------- */
+/* SIGNING -------------------------------------------------------------- */
+if (ctx->mode == PDKIM_MODE_SIGN)
+  if (!(headernames = pdkim_strnew(NULL)))
+    return PDKIM_ERR_OOM;
+/* ---------------------------------------------------------------------- */
 
-  while (sig != NULL) {
-    sha1_context sha1_headers;
-    sha2_context sha2_headers;
-    char *sig_hdr;
-    char headerhash[32];
+while (sig)
+  {
+  sha1_context sha1_headers;
+  sha2_context sha2_headers;
+  char *sig_hdr;
+  char headerhash[32];
 
-    if (sig->algo == PDKIM_ALGO_RSA_SHA1)
-      sha1_starts(&sha1_headers);
-    else
-      sha2_starts(&sha2_headers,0);
+  if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+    sha1_starts(&sha1_headers);
+  else
+    sha2_starts(&sha2_headers,0);
 
-    #ifdef PDKIM_DEBUG
-    if (ctx->debug_stream)
-      fprintf(ctx->debug_stream,
-              "PDKIM >> Hashed header data, canonicalized, in sequence >>>>>>>>>>>>>>\n");
-    #endif
-
-    /* SIGNING ---------------------------------------------------------------- */
-    /* When signing, walk through our header list and add them to the hash. As we
-       go, construct a list of the header's names to use for the h= parameter. */
-    if (ctx->mode == PDKIM_MODE_SIGN) {
-      pdkim_stringlist *p = sig->headers;
-      while (p != NULL) {
-        char *rh = NULL;
-        /* Collect header names (Note: colon presence is guaranteed here) */
-        char *q = strchr(p->value,':');
-        if (pdkim_strncat(headernames, p->value,
-                          (q-(p->value))+((p->next==NULL)?0:1)) == NULL)
-          return PDKIM_ERR_OOM;
-
-        if (sig->canon_headers == PDKIM_CANON_RELAXED)
-          rh = pdkim_relax_header(p->value,1); /* cook header for relaxed canon */
-        else
-          rh = strdup(p->value);               /* just copy it for simple canon */
-
-        if (rh == NULL) return PDKIM_ERR_OOM;
-
-        /* Feed header to the hash algorithm */
-        if (sig->algo == PDKIM_ALGO_RSA_SHA1)
-          sha1_update(&(sha1_headers),(unsigned char *)rh,strlen(rh));
-        else
-          sha2_update(&(sha2_headers),(unsigned char *)rh,strlen(rh));
-        #ifdef PDKIM_DEBUG
-        if (ctx->debug_stream)
-          pdkim_quoteprint(ctx->debug_stream, rh, strlen(rh), 1);
-        #endif
-        free(rh);
-        p = p->next;
+#ifdef PDKIM_DEBUG
+  if (ctx->debug_stream)
+    fprintf(ctx->debug_stream,
+	    "PDKIM >> Hashed header data, canonicalized, in sequence >>>>>>>>>>>>>>\n");
+#endif
+
+  /* SIGNING ---------------------------------------------------------------- */
+  /* When signing, walk through our header list and add them to the hash. As we
+     go, construct a list of the header's names to use for the h= parameter. */
+
+  if (ctx->mode == PDKIM_MODE_SIGN)
+    {
+    pdkim_stringlist *p;
+
+    for (p = sig->headers; p; p = p->next)
+      {
+      char *rh = NULL;
+      /* Collect header names (Note: colon presence is guaranteed here) */
+      char *q = strchr(p->value,':');
+
+      if (!(pdkim_strncat(headernames, p->value,
+			(q-(p->value)) + (p->next ? 1 : 0))))
+	return PDKIM_ERR_OOM;
+
+      rh = sig->canon_headers == PDKIM_CANON_RELAXED
+	? pdkim_relax_header(p->value,1) /* cook header for relaxed canon */
+	: strdup(p->value);              /* just copy it for simple canon */
+      if (!rh)
+	return PDKIM_ERR_OOM;
+
+      /* Feed header to the hash algorithm */
+      if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+	sha1_update(&(sha1_headers), (unsigned char *)rh, strlen(rh));
+      else
+	sha2_update(&(sha2_headers), (unsigned char *)rh, strlen(rh));
+
+#ifdef PDKIM_DEBUG
+      if (ctx->debug_stream)
+	pdkim_quoteprint(ctx->debug_stream, rh, strlen(rh), 1);
+#endif
+      free(rh);
       }
     }
-    /* VERIFICATION ----------------------------------------------------------- */
-    /* When verifying, walk through the header name list in the h= parameter and
-       add the headers to the hash in that order. */
-    else {
-      char *b = strdup(sig->headernames);
-      char *p = b;
-      char *q = NULL;
-      pdkim_stringlist *hdrs = ctx->headers;
-
-      if (b == NULL) return PDKIM_ERR_OOM;
-
-      /* clear tags */
-      while (hdrs != NULL) {
-        hdrs->tag = 0;
-        hdrs = hdrs->next;
-      }
 
-      while(1) {
-        hdrs = ctx->headers;
-        q = strchr(p,':');
-        if (q != NULL) *q = '\0';
-        while (hdrs != NULL) {
-          if ( (hdrs->tag == 0) &&
-               (strncasecmp(hdrs->value,p,strlen(p)) == 0) &&
-               ((hdrs->value)[strlen(p)] == ':') ) {
-            char *rh = NULL;
-            if (sig->canon_headers == PDKIM_CANON_RELAXED)
-              rh = pdkim_relax_header(hdrs->value,1); /* cook header for relaxed canon */
-            else
-              rh = strdup(hdrs->value);               /* just copy it for simple canon */
-            if (rh == NULL) return PDKIM_ERR_OOM;
-            /* Feed header to the hash algorithm */
-            if (sig->algo == PDKIM_ALGO_RSA_SHA1)
-              sha1_update(&(sha1_headers),(unsigned char *)rh,strlen(rh));
-            else
-              sha2_update(&(sha2_headers),(unsigned char *)rh,strlen(rh));
-            #ifdef PDKIM_DEBUG
-            if (ctx->debug_stream)
-              pdkim_quoteprint(ctx->debug_stream, rh, strlen(rh), 1);
-            #endif
-            free(rh);
-            hdrs->tag = 1;
-            break;
-          }
-          hdrs = hdrs->next;
-        }
-        if (q == NULL) break;
-        p = q+1;
+  /* VERIFICATION ----------------------------------------------------------- */
+  /* When verifying, walk through the header name list in the h= parameter and
+     add the headers to the hash in that order. */
+  else
+    {
+    char *b = strdup(sig->headernames);
+    char *p = b;
+    char *q = NULL;
+    pdkim_stringlist *hdrs;
+
+    if (!b) return PDKIM_ERR_OOM;
+
+    /* clear tags */
+    for (hdrs = ctx->headers; hdrs; hdrs = hdrs->next)
+      hdrs->tag = 0;
+
+    while(1)
+      {
+      if ((q = strchr(p,':')))
+	*q = '\0';
+
+      for (hdrs = ctx->headers; hdrs; hdrs = hdrs->next)
+	if (  hdrs->tag == 0
+	   && strncasecmp(hdrs->value,p,strlen(p)) == 0
+	   && (hdrs->value)[strlen(p)] == ':'
+	   )
+	  {
+	  char *rh;
+
+	  rh = sig->canon_headers == PDKIM_CANON_RELAXED
+	    ? pdkim_relax_header(hdrs->value,1)  /* cook header for relaxed canon */
+	    : strdup(hdrs->value);               /* just copy it for simple canon */
+	  if (!rh)
+	    return PDKIM_ERR_OOM;
+
+	  /* Feed header to the hash algorithm */
+	  if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+	    sha1_update(&(sha1_headers), (unsigned char *)rh, strlen(rh));
+	  else
+	    sha2_update(&(sha2_headers), (unsigned char *)rh, strlen(rh));
+
+#ifdef PDKIM_DEBUG
+	  if (ctx->debug_stream)
+	    pdkim_quoteprint(ctx->debug_stream, rh, strlen(rh), 1);
+#endif
+	  free(rh);
+	  hdrs->tag = 1;
+	  break;
+	  }
+
+      if (!q) break;
+      p = q+1;
       }
-      free(b);
+    free(b);
     }
 
-    #ifdef PDKIM_DEBUG
-    if (ctx->debug_stream)
-      fprintf(ctx->debug_stream,
-              "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-    #endif
+#ifdef PDKIM_DEBUG
+  if (ctx->debug_stream)
+    fprintf(ctx->debug_stream,
+	    "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#endif
 
-    /* SIGNING ---------------------------------------------------------------- */
-    if (ctx->mode == PDKIM_MODE_SIGN) {
-      /* Copy headernames to signature struct */
-      sig->headernames = strdup(headernames->str);
-      pdkim_strfree(headernames);
+  /* SIGNING ---------------------------------------------------------------- */
+  if (ctx->mode == PDKIM_MODE_SIGN)
+    {
+    /* Copy headernames to signature struct */
+    sig->headernames = strdup(headernames->str);
+    pdkim_strfree(headernames);
 
-      /* Create signature header with b= omitted */
-      sig_hdr = pdkim_create_header(ctx->sig,0);
-    }
-    /* VERIFICATION ----------------------------------------------------------- */
-    else {
-      sig_hdr = strdup(sig->rawsig_no_b_val);
+    /* Create signature header with b= omitted */
+    sig_hdr = pdkim_create_header(ctx->sig, 0);
     }
-    /* ------------------------------------------------------------------------ */
 
-    if (sig_hdr == NULL) return PDKIM_ERR_OOM;
+  /* VERIFICATION ----------------------------------------------------------- */
+  else
+    sig_hdr = strdup(sig->rawsig_no_b_val);
+  /* ------------------------------------------------------------------------ */
+
+  if (!sig_hdr)
+    return PDKIM_ERR_OOM;
 
-    /* Relax header if necessary */
-    if (sig->canon_headers == PDKIM_CANON_RELAXED) {
-      char *relaxed_hdr = pdkim_relax_header(sig_hdr,0);
-      free(sig_hdr);
-      if (relaxed_hdr == NULL) return PDKIM_ERR_OOM;
-      sig_hdr = relaxed_hdr;
+  /* Relax header if necessary */
+  if (sig->canon_headers == PDKIM_CANON_RELAXED)
+    {
+    char *relaxed_hdr = pdkim_relax_header(sig_hdr, 0);
+
+    free(sig_hdr);
+    if (!relaxed_hdr)
+      return PDKIM_ERR_OOM;
+    sig_hdr = relaxed_hdr;
     }
 
-    #ifdef PDKIM_DEBUG
-    if (ctx->debug_stream) {
-      fprintf(ctx->debug_stream,
-              "PDKIM >> Signed DKIM-Signature header, canonicalized >>>>>>>>>>>>>>>>>\n");
-      pdkim_quoteprint(ctx->debug_stream, sig_hdr, strlen(sig_hdr), 1);
-      fprintf(ctx->debug_stream,
-              "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#ifdef PDKIM_DEBUG
+  if (ctx->debug_stream)
+    {
+    fprintf(ctx->debug_stream,
+	    "PDKIM >> Signed DKIM-Signature header, canonicalized >>>>>>>>>>>>>>>>>\n");
+    pdkim_quoteprint(ctx->debug_stream, sig_hdr, strlen(sig_hdr), 1);
+    fprintf(ctx->debug_stream,
+	    "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
     }
-    #endif
-
-    /* Finalize header hash */
-    if (sig->algo == PDKIM_ALGO_RSA_SHA1) {
-      sha1_update(&(sha1_headers),(unsigned char *)sig_hdr,strlen(sig_hdr));
-      sha1_finish(&(sha1_headers),(unsigned char *)headerhash);
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream, "PDKIM [%s] hh computed: ", sig->domain);
-        pdkim_hexprint(ctx->debug_stream, headerhash, 20, 1);
+#endif
+
+  /* Finalize header hash */
+  if (sig->algo == PDKIM_ALGO_RSA_SHA1)
+    {
+    sha1_update(&(sha1_headers), (unsigned char *)sig_hdr, strlen(sig_hdr));
+    sha1_finish(&(sha1_headers), (unsigned char *)headerhash);
+
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      {
+      fprintf(ctx->debug_stream, "PDKIM [%s] hh computed: ", sig->domain);
+      pdkim_hexprint(ctx->debug_stream, headerhash, 20, 1);
       }
-      #endif
+#endif
     }
-    else {
-      sha2_update(&(sha2_headers),(unsigned char *)sig_hdr,strlen(sig_hdr));
-      sha2_finish(&(sha2_headers),(unsigned char *)headerhash);
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream, "PDKIM [%s] hh computed: ", sig->domain);
-        pdkim_hexprint(ctx->debug_stream, headerhash, 32, 1);
+  else
+    {
+    sha2_update(&(sha2_headers), (unsigned char *)sig_hdr, strlen(sig_hdr));
+    sha2_finish(&(sha2_headers), (unsigned char *)headerhash);
+
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      {
+      fprintf(ctx->debug_stream, "PDKIM [%s] hh computed: ", sig->domain);
+      pdkim_hexprint(ctx->debug_stream, headerhash, 32, 1);
       }
-      #endif
+#endif
     }
 
-    free(sig_hdr);
+  free(sig_hdr);
 
-    /* SIGNING ---------------------------------------------------------------- */
-    if (ctx->mode == PDKIM_MODE_SIGN) {
-      rsa_context rsa;
+  /* SIGNING ---------------------------------------------------------------- */
+  if (ctx->mode == PDKIM_MODE_SIGN)
+    {
+    rsa_context rsa;
 
-      rsa_init(&rsa,RSA_PKCS_V15,0);
+    rsa_init(&rsa, RSA_PKCS_V15, 0);
 
-      /* Perform private key operation */
-      if (rsa_parse_key(&rsa, (unsigned char *)sig->rsa_privkey,
-                        strlen(sig->rsa_privkey), NULL, 0) != 0) {
-        return PDKIM_ERR_RSA_PRIVKEY;
-      }
+    /* Perform private key operation */
+    if (rsa_parse_key(&rsa, (unsigned char *)sig->rsa_privkey,
+		      strlen(sig->rsa_privkey), NULL, 0) != 0)
+      return PDKIM_ERR_RSA_PRIVKEY;
 
-      sig->sigdata_len = mpi_size(&(rsa.N));
-      sig->sigdata = malloc(sig->sigdata_len);
-      if (sig->sigdata == NULL) return PDKIM_ERR_OOM;
-
-      if (rsa_pkcs1_sign( &rsa, RSA_PRIVATE,
-                          ((sig->algo == PDKIM_ALGO_RSA_SHA1)?
-                             SIG_RSA_SHA1:SIG_RSA_SHA256),
-                          0,
-                          (unsigned char *)headerhash,
-                          (unsigned char *)sig->sigdata ) != 0) {
-        return PDKIM_ERR_RSA_SIGNING;
-      }
+    sig->sigdata_len = mpi_size(&(rsa.N));
+    if (!(sig->sigdata = malloc(sig->sigdata_len)))
+      return PDKIM_ERR_OOM;
+
+    if (rsa_pkcs1_sign( &rsa, RSA_PRIVATE,
+			((sig->algo == PDKIM_ALGO_RSA_SHA1)?
+			   SIG_RSA_SHA1:SIG_RSA_SHA256),
+			0,
+			(unsigned char *)headerhash,
+			(unsigned char *)sig->sigdata ) != 0)
+      return PDKIM_ERR_RSA_SIGNING;
 
-      rsa_free(&rsa);
+    rsa_free(&rsa);
 
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream, "PDKIM [%s] b computed: ",
-                sig->domain);
-        pdkim_hexprint(ctx->debug_stream, sig->sigdata, sig->sigdata_len, 1);
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      {
+      fprintf(ctx->debug_stream, "PDKIM [%s] b computed: ", sig->domain);
+      pdkim_hexprint(ctx->debug_stream, sig->sigdata, sig->sigdata_len, 1);
       }
-      #endif
+#endif
 
-      sig->signature_header = pdkim_create_header(ctx->sig,1);
-      if (sig->signature_header == NULL) return PDKIM_ERR_OOM;
+    if (!(sig->signature_header = pdkim_create_header(ctx->sig,1)))
+      return PDKIM_ERR_OOM;
     }
-    /* VERIFICATION ----------------------------------------------------------- */
-    else {
-      rsa_context rsa;
-      char *dns_txt_name, *dns_txt_reply;
-
-      rsa_init(&rsa,RSA_PKCS_V15,0);
-
-      dns_txt_name  = malloc(PDKIM_DNS_TXT_MAX_NAMELEN);
-      if (dns_txt_name == NULL) return PDKIM_ERR_OOM;
-      dns_txt_reply = malloc(PDKIM_DNS_TXT_MAX_RECLEN);
-      if (dns_txt_reply == NULL) {
-        free(dns_txt_name);
-        return PDKIM_ERR_OOM;
-      }
-      memset(dns_txt_reply,0,PDKIM_DNS_TXT_MAX_RECLEN);
-      memset(dns_txt_name ,0,PDKIM_DNS_TXT_MAX_NAMELEN);
-
-      if (snprintf(dns_txt_name,PDKIM_DNS_TXT_MAX_NAMELEN,
-                   "%s._domainkey.%s.",
-                   sig->selector,sig->domain) >= PDKIM_DNS_TXT_MAX_NAMELEN) {
-        sig->verify_status =      PDKIM_VERIFY_INVALID;
-        sig->verify_ext_status =  PDKIM_VERIFY_INVALID_BUFFER_SIZE;
-        goto NEXT_VERIFY;
-      }
 
-      if ((ctx->dns_txt_callback(dns_txt_name, dns_txt_reply) != PDKIM_OK) ||
-          (dns_txt_reply[0] == '\0')) {
-        sig->verify_status =      PDKIM_VERIFY_INVALID;
-        sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_UNAVAILABLE;
-        goto NEXT_VERIFY;
+  /* VERIFICATION ----------------------------------------------------------- */
+  else
+    {
+    rsa_context rsa;
+    char *dns_txt_name, *dns_txt_reply;
+
+    rsa_init(&rsa, RSA_PKCS_V15, 0);
+
+    if (!(dns_txt_name  = malloc(PDKIM_DNS_TXT_MAX_NAMELEN)))
+      return PDKIM_ERR_OOM;
+
+    if (!(dns_txt_reply = malloc(PDKIM_DNS_TXT_MAX_RECLEN)))
+      {
+      free(dns_txt_name);
+      return PDKIM_ERR_OOM;
       }
 
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream,
-                "PDKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-        fprintf(ctx->debug_stream," Raw record: ");
-        pdkim_quoteprint(ctx->debug_stream, dns_txt_reply, strlen(dns_txt_reply), 1);
+    memset(dns_txt_reply, 0, PDKIM_DNS_TXT_MAX_RECLEN);
+    memset(dns_txt_name , 0, PDKIM_DNS_TXT_MAX_NAMELEN);
+
+    if (snprintf(dns_txt_name,PDKIM_DNS_TXT_MAX_NAMELEN,
+		 "%s._domainkey.%s.",
+		 sig->selector,sig->domain) >= PDKIM_DNS_TXT_MAX_NAMELEN)
+      {
+      sig->verify_status =      PDKIM_VERIFY_INVALID;
+      sig->verify_ext_status =  PDKIM_VERIFY_INVALID_BUFFER_SIZE;
+      goto NEXT_VERIFY;
       }
-      #endif
-
-      sig->pubkey = pdkim_parse_pubkey_record(ctx,dns_txt_reply);
-      if (sig->pubkey == NULL) {
-        sig->verify_status =      PDKIM_VERIFY_INVALID;
-        sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_PARSING;
-        #ifdef PDKIM_DEBUG
-        if (ctx->debug_stream) {
-          fprintf(ctx->debug_stream," Error while parsing public key record\n");
-          fprintf(ctx->debug_stream,
-            "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-        }
-        #endif
-        goto NEXT_VERIFY;
+
+    if (  ctx->dns_txt_callback(dns_txt_name, dns_txt_reply) != PDKIM_OK 
+       || dns_txt_reply[0] == '\0')
+      {
+      sig->verify_status =      PDKIM_VERIFY_INVALID;
+      sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_UNAVAILABLE;
+      goto NEXT_VERIFY;
       }
 
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream,
-          "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      {
+      fprintf(ctx->debug_stream,
+	      "PDKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+      fprintf(ctx->debug_stream," Raw record: ");
+      pdkim_quoteprint(ctx->debug_stream, dns_txt_reply, strlen(dns_txt_reply), 1);
       }
-      #endif
-
-      if (rsa_parse_public_key(&rsa,
-                              (unsigned char *)sig->pubkey->key,
-                               sig->pubkey->key_len) != 0) {
-        sig->verify_status =      PDKIM_VERIFY_INVALID;
-        sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_PARSING;
-        goto NEXT_VERIFY;
+#endif
+
+    if (!(sig->pubkey = pdkim_parse_pubkey_record(ctx,dns_txt_reply)))
+      {
+      sig->verify_status =      PDKIM_VERIFY_INVALID;
+      sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_PARSING;
+
+#ifdef PDKIM_DEBUG
+      if (ctx->debug_stream)
+        {
+	fprintf(ctx->debug_stream," Error while parsing public key record\n");
+	fprintf(ctx->debug_stream,
+	  "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+	}
+#endif
+      goto NEXT_VERIFY;
       }
 
-      /* Check the signature */
-      if (rsa_pkcs1_verify(&rsa,
-                        RSA_PUBLIC,
-                        ((sig->algo == PDKIM_ALGO_RSA_SHA1)?
-                             SIG_RSA_SHA1:SIG_RSA_SHA256),
-                        0,
-                        (unsigned char *)headerhash,
-                        (unsigned char *)sig->sigdata) != 0) {
-        sig->verify_status =      PDKIM_VERIFY_FAIL;
-        sig->verify_ext_status =  PDKIM_VERIFY_FAIL_MESSAGE;
-        goto NEXT_VERIFY;
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      fprintf(ctx->debug_stream,
+	"PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+#endif
+
+    if (rsa_parse_public_key(&rsa,
+			    (unsigned char *)sig->pubkey->key,
+			     sig->pubkey->key_len) != 0)
+      {
+      sig->verify_status =      PDKIM_VERIFY_INVALID;
+      sig->verify_ext_status =  PDKIM_VERIFY_INVALID_PUBKEY_PARSING;
+      goto NEXT_VERIFY;
       }
 
-      /* We have a winner! (if bodydhash was correct earlier) */
-      if (sig->verify_status == PDKIM_VERIFY_NONE) {
-        sig->verify_status = PDKIM_VERIFY_PASS;
+    /* Check the signature */
+    if (rsa_pkcs1_verify(&rsa,
+		      RSA_PUBLIC,
+		      ((sig->algo == PDKIM_ALGO_RSA_SHA1)?
+			   SIG_RSA_SHA1:SIG_RSA_SHA256),
+		      0,
+		      (unsigned char *)headerhash,
+		      (unsigned char *)sig->sigdata) != 0)
+      {
+      sig->verify_status =      PDKIM_VERIFY_FAIL;
+      sig->verify_ext_status =  PDKIM_VERIFY_FAIL_MESSAGE;
+      goto NEXT_VERIFY;
       }
 
-      NEXT_VERIFY:
-
-      #ifdef PDKIM_DEBUG
-      if (ctx->debug_stream) {
-        fprintf(ctx->debug_stream, "PDKIM [%s] signature status: %s",
-                sig->domain, pdkim_verify_status_str(sig->verify_status));
-        if (sig->verify_ext_status > 0) {
-          fprintf(ctx->debug_stream, " (%s)\n",
-                  pdkim_verify_ext_status_str(sig->verify_ext_status));
-        }
-        else {
-          fprintf(ctx->debug_stream, "\n");
-        }
+    /* We have a winner! (if bodydhash was correct earlier) */
+    if (sig->verify_status == PDKIM_VERIFY_NONE)
+      sig->verify_status = PDKIM_VERIFY_PASS;
+
+NEXT_VERIFY:
+
+#ifdef PDKIM_DEBUG
+    if (ctx->debug_stream)
+      {
+      fprintf(ctx->debug_stream, "PDKIM [%s] signature status: %s",
+	      sig->domain, pdkim_verify_status_str(sig->verify_status));
+      if (sig->verify_ext_status > 0)
+	fprintf(ctx->debug_stream, " (%s)\n",
+		pdkim_verify_ext_status_str(sig->verify_ext_status));
+      else
+	fprintf(ctx->debug_stream, "\n");
       }
-      #endif
+#endif
 
-      rsa_free(&rsa);
-      free(dns_txt_name);
-      free(dns_txt_reply);
+    rsa_free(&rsa);
+    free(dns_txt_name);
+    free(dns_txt_reply);
     }
 
-    sig = sig->next;
+  sig = sig->next;
   }
 
-  /* If requested, set return pointer to signature(s) */
-  if (return_signatures != NULL) {
-    *return_signatures = ctx->sig;
-  }
+/* If requested, set return pointer to signature(s) */
+if (return_signatures)
+  *return_signatures = ctx->sig;
 
-  return PDKIM_OK;
+return PDKIM_OK;
 }
 
 
 /* -------------------------------------------------------------------------- */
-DLLEXPORT pdkim_ctx *pdkim_init_verify(int input_mode,
-                             int(*dns_txt_callback)(char *, char *)
-                             ) {
-  pdkim_ctx *ctx = malloc(sizeof(pdkim_ctx));
-  if (ctx == NULL) return NULL;
-  memset(ctx,0,sizeof(pdkim_ctx));
-
-  ctx->linebuf = malloc(PDKIM_MAX_BODY_LINE_LEN);
-  if (ctx->linebuf == NULL) {
-    free(ctx);
-    return NULL;
+
+DLLEXPORT pdkim_ctx *
+pdkim_init_verify(int input_mode, int(*dns_txt_callback)(char *, char *))
+{
+pdkim_ctx *ctx = malloc(sizeof(pdkim_ctx));
+
+if (!ctx)
+  return NULL;
+memset(ctx,0,sizeof(pdkim_ctx));
+
+if (!(ctx->linebuf = malloc(PDKIM_MAX_BODY_LINE_LEN)))
+  {
+  free(ctx);
+  return NULL;
   }
 
-  ctx->mode = PDKIM_MODE_VERIFY;
-  ctx->input_mode = input_mode;
-  ctx->dns_txt_callback = dns_txt_callback;
+ctx->mode = PDKIM_MODE_VERIFY;
+ctx->input_mode = input_mode;
+ctx->dns_txt_callback = dns_txt_callback;
 
-  return ctx;
+return ctx;
 }
 
 
 /* -------------------------------------------------------------------------- */
-DLLEXPORT pdkim_ctx *pdkim_init_sign(int input_mode,
-                           char *domain,
-                           char *selector,
-                           char *rsa_privkey) {
-  pdkim_ctx *ctx;
-  pdkim_signature *sig;
-
-  if (!domain || !selector || !rsa_privkey) return NULL;
-
-  ctx = malloc(sizeof(pdkim_ctx));
-  if (ctx == NULL) return NULL;
-  memset(ctx,0,sizeof(pdkim_ctx));
-
-  ctx->linebuf = malloc(PDKIM_MAX_BODY_LINE_LEN);
-  if (ctx->linebuf == NULL) {
-    free(ctx);
-    return NULL;
-  }
 
-  sig = malloc(sizeof(pdkim_signature));
-  if (sig == NULL) {
-    free(ctx->linebuf);
-    free(ctx);
-    return NULL;
-  }
-  memset(sig,0,sizeof(pdkim_signature));
-  sig->bodylength = -1;
+DLLEXPORT pdkim_ctx *
+pdkim_init_sign(int input_mode, char *domain, char *selector, char *rsa_privkey)
+{
+pdkim_ctx *ctx;
+pdkim_signature *sig;
 
-  ctx->mode = PDKIM_MODE_SIGN;
-  ctx->input_mode = input_mode;
-  ctx->sig = sig;
+if (!domain || !selector || !rsa_privkey)
+  return NULL;
 
-  ctx->sig->domain = strdup(domain);
-  ctx->sig->selector = strdup(selector);
-  ctx->sig->rsa_privkey = strdup(rsa_privkey);
+if (!(ctx = malloc(sizeof(pdkim_ctx))))
+  return NULL;
+memset(ctx,0,sizeof(pdkim_ctx));
 
-  if (!ctx->sig->domain || !ctx->sig->selector || !ctx->sig->rsa_privkey) {
-    pdkim_free_ctx(ctx);
-    return NULL;
+if (!(ctx->linebuf = malloc(PDKIM_MAX_BODY_LINE_LEN)))
+  {
+  free(ctx);
+  return NULL;
   }
 
-  ctx->sig->sha1_body = malloc(sizeof(sha1_context));
-  if (ctx->sig->sha1_body == NULL) {
-    pdkim_free_ctx(ctx);
-    return NULL;
+if (!(sig = malloc(sizeof(pdkim_signature))))
+  {
+  free(ctx->linebuf);
+  free(ctx);
+  return NULL;
   }
-  sha1_starts(ctx->sig->sha1_body);
+memset(sig,0,sizeof(pdkim_signature));
 
-  ctx->sig->sha2_body = malloc(sizeof(sha2_context));
-  if (ctx->sig->sha2_body == NULL) {
-    pdkim_free_ctx(ctx);
-    return NULL;
-  }
-  sha2_starts(ctx->sig->sha2_body,0);
+sig->bodylength = -1;
 
-  return ctx;
-}
+ctx->mode = PDKIM_MODE_SIGN;
+ctx->input_mode = input_mode;
+ctx->sig = sig;
 
-#ifdef PDKIM_DEBUG
-/* -------------------------------------------------------------------------- */
-DLLEXPORT void pdkim_set_debug_stream(pdkim_ctx *ctx,
-                            FILE *debug_stream) {
-  ctx->debug_stream = debug_stream;
+ctx->sig->domain = strdup(domain);
+ctx->sig->selector = strdup(selector);
+ctx->sig->rsa_privkey = strdup(rsa_privkey);
+
+if (!ctx->sig->domain || !ctx->sig->selector || !ctx->sig->rsa_privkey)
+  goto BAIL;
+
+if (!(ctx->sig->sha1_body = malloc(sizeof(sha1_context))))
+  goto BAIL;
+sha1_starts(ctx->sig->sha1_body);
+
+if (!(ctx->sig->sha2_body = malloc(sizeof(sha2_context))))
+  goto BAIL;
+sha2_starts(ctx->sig->sha2_body,0);
+
+return ctx;
+
+BAIL:
+  pdkim_free_ctx(ctx);
+  return NULL;
 }
-#endif
 
 /* -------------------------------------------------------------------------- */
-DLLEXPORT int pdkim_set_optional(pdkim_ctx *ctx,
+
+DLLEXPORT int
+pdkim_set_optional(pdkim_ctx *ctx,
                        char *sign_headers,
                        char *identity,
                        int canon_headers,
@@ -1906,24 +2104,34 @@ DLLEXPORT int pdkim_set_optional(pdkim_ctx *ctx,
                        long bodylength,
                        int algo,
                        unsigned long created,
-                       unsigned long expires) {
+                       unsigned long expires)
+{
 
-  if (identity != NULL) {
-    ctx->sig->identity = strdup(identity);
-    if (ctx->sig->identity == NULL) return PDKIM_ERR_OOM;
-  }
+if (identity)
+  if (!(ctx->sig->identity = strdup(identity)))
+    return PDKIM_ERR_OOM;
 
-  if (sign_headers != NULL) {
-    ctx->sig->sign_headers = strdup(sign_headers);
-    if (ctx->sig->sign_headers == NULL) return PDKIM_ERR_OOM;
-  }
+if (sign_headers)
+  if (!(ctx->sig->sign_headers = strdup(sign_headers)))
+    return PDKIM_ERR_OOM;
 
-  ctx->sig->canon_headers = canon_headers;
-  ctx->sig->canon_body = canon_body;
-  ctx->sig->bodylength = bodylength;
-  ctx->sig->algo = algo;
-  ctx->sig->created = created;
-  ctx->sig->expires = expires;
+ctx->sig->canon_headers = canon_headers;
+ctx->sig->canon_body = canon_body;
+ctx->sig->bodylength = bodylength;
+ctx->sig->algo = algo;
+ctx->sig->created = created;
+ctx->sig->expires = expires;
 
-  return PDKIM_OK;
+return PDKIM_OK;
 }
+
+/* -------------------------------------------------------------------------- */
+
+#ifdef PDKIM_DEBUG
+DLLEXPORT void
+pdkim_set_debug_stream(pdkim_ctx *ctx, FILE *debug_stream)
+{
+ctx->debug_stream = debug_stream;
+}
+#endif
+