From 6988fdfee1b057c5e16a0180137c410adc1ffd44 Mon Sep 17 00:00:00 2001
From: cpupower <cpupower@users.noreply.github.com>
Date: Thu, 25 Jun 2020 12:53:27 +0200
Subject: [PATCH] Fix stream-encrypting+signing a message using the Worker
 (#1112)

- Include fromStream property when cloning a Message
- Restore fromStream property in packetlistCloneToMessage
---
 src/packet/clone.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/packet/clone.js b/src/packet/clone.js
index fa572cdc..a9f0333c 100644
--- a/src/packet/clone.js
+++ b/src/packet/clone.js
@@ -63,7 +63,7 @@ export function clonePackets(options) {
   if (options.message) {
     //could be either a Message or CleartextMessage object
     if (options.message instanceof Message) {
-      options.message = options.message.packets;
+      options.message = { packets: options.message.packets, fromStream: options.message.fromStream };
     } else if (options.message instanceof CleartextMessage) {
       options.message = { text: options.message.text, signature: options.message.signature.packets };
     }
@@ -151,8 +151,10 @@ function packetlistCloneToKey(clone) {
 }
 
 function packetlistCloneToMessage(clone) {
-  const packetlist = List.fromStructuredClone(clone);
-  return new Message(packetlist);
+  const packetlist = List.fromStructuredClone(clone.packets);
+  const message = new Message(packetlist);
+  message.fromStream = clone.fromStream;
+  return message;
 }
 
 function packetlistCloneToCleartextMessage(clone) {