From 562783df013dbea104a10a0427e4255d3a897c66 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Fri, 19 Jul 2019 17:24:28 +0200
Subject: [PATCH] Fix armor checksum mismatch error message with
 allow_unauthenticated_stream

---
 src/packet/packet.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/packet/packet.js b/src/packet/packet.js
index 5ba8b388..11a62695 100644
--- a/src/packet/packet.js
+++ b/src/packet/packet.js
@@ -140,6 +140,7 @@ export default {
   read: async function(input, streaming, callback) {
     const reader = stream.getReader(input);
     let writer;
+    let callbackReturned;
     try {
       const peekedBytes = await reader.peekBytes(2);
       // some sanity checks
@@ -168,7 +169,6 @@ export default {
 
       const supportsStreaming = this.supportsStreaming(tag);
       let packet = null;
-      let callbackReturned;
       if (streaming && supportsStreaming) {
         const transform = new TransformStream();
         writer = stream.getWriter(transform.writable);
@@ -295,7 +295,6 @@ export default {
       if (writer) {
         await writer.ready;
         await writer.close();
-        await callbackReturned;
       } else {
         packet = util.concatUint8Array(packet);
         await callback({ tag, packet });
@@ -309,6 +308,9 @@ export default {
         throw e;
       }
     } finally {
+      if (writer) {
+        await callbackReturned;
+      }
       reader.releaseLock();
     }
   }