Fix PEM parsing and hex dump off-by-one

Author: JeremiahM37

src/wp_dec_pem2der.c

@@ -158,7 +158,7 @@ static int wp_pem2der_convert(const char* data, word32 len, DerBuffer** pDer,
 
     /* Skip '-----BEGIN <name>-----\n'. */
     base64Data = data + 16 + nameLen + 1;
-    base64Len = len - 16 + nameLen + 1;
+    base64Len = len - (16 + nameLen + 1);
     footer = XSTRSTR(base64Data, "-----END ");
     if (footer == NULL) {
         info->consumed = len;

src/wp_logging.c

@@ -444,7 +444,7 @@ void WOLFPROV_BUFFER(int component, const unsigned char* buffer,
         }
 
         XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "| ");
-        bufidx++;
+        bufidx += 2;
 
         for (i = 0; i < WOLFPROV_LINE_LEN; i++) {
             if (i < buflen) {