commit 540f552a32590212423563677e3d8729aea672f2
from: Martijn van Duren <martijn@openbsd.org>
date: Sat Apr  6 14:39:03 2019 UTC

Fix off by one

commit - 748e39c76deda5bcf20323b4c6955a72ae9e980f
commit + 540f552a32590212423563677e3d8729aea672f2
blob - 497a6fc271b6e420c35e969f80aef458d947930b
blob + 84ae502a8dc90c927355adbbd164362cc0c0399e
--- main.c
+++ main.c
@@ -344,7 +344,6 @@ dkim_dataline(char *type, int version, struct timespec
 			smtp_filter_dataline(session->reqid, session->token,
 			    "%s", tmp);
 		}
-		dkim_session_free(session);
 	} else
 		dkim_parse_body(session, line);
 }
@@ -660,7 +659,7 @@ dkim_signature_normalize(struct dkim_session *session)
 				return 0;
 			memmove(sig + checkpoint + 3,
 			    sig + checkpoint + skip,
-			    *headerlen - skip - checkpoint);
+			    *headerlen - skip - checkpoint + 1);
 			sig[checkpoint + 1] = '\r';
 			sig[checkpoint + 2] = '\n';
 			sig[checkpoint + 3] = '\t';