From 1c7ed9af7e983cf53e8205ba7caad75f056f3099 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Thu, 12 Jul 2018 19:41:14 +0200
Subject: [PATCH] fix bug found by valgrind: init symmetric-decryption with
 correct blocksize

---
 libs/netpgp/src/crypto.c       | 2 +-
 libs/netpgp/src/packet-parse.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/netpgp/src/crypto.c b/libs/netpgp/src/crypto.c
index 0c782456..3f0f8b29 100644
--- a/libs/netpgp/src/crypto.c
+++ b/libs/netpgp/src/crypto.c
@@ -628,7 +628,7 @@ pgp_decrypt_buf(pgp_io_t *io,
 	/* tidy up */
 	pgp_writer_close(parse->cbinfo.output);
 	pgp_output_delete(parse->cbinfo.output);
-	if (!parse->cbinfo.gotpass) {
+	if (!parse->cbinfo.gotpass) { // EDIT BY MR
 		pgp_memory_free(outmem);
 		outmem = NULL; /* if we didn't get the passphrase, return NULL */
 	}
diff --git a/libs/netpgp/src/packet-parse.c b/libs/netpgp/src/packet-parse.c
index 67da8144..9e522a76 100644
--- a/libs/netpgp/src/packet-parse.c
+++ b/libs/netpgp/src/packet-parse.c
@@ -3287,7 +3287,7 @@ static int parse_sk_sesskey(pgp_region_t *region, pgp_stream_t *stream)
 		}
 
 		/* decrypt the read data */
-		iv = calloc(1, stream->decrypt.blocksize); if( iv == NULL ) { goto cleanup; }
+		iv = calloc(1, ci.blocksize); if( iv == NULL ) { goto cleanup; } // EDIT BY MR
 		ci.set_iv(&ci, iv);
 		free(iv);
 		iv = NULL;