From 4faa84daa050a60ac6ab643c6d7a5cd78b6bdb37 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Thu, 1 Nov 2018 15:40:04 +0100
Subject: [PATCH] Inline iterated S2K loop

---
 src/type/s2k.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/type/s2k.js b/src/type/s2k.js
index 0e5745f6..8864a6b8 100644
--- a/src/type/s2k.js
+++ b/src/type/s2k.js
@@ -161,15 +161,13 @@ S2K.prototype.produce_key = async function (passphrase, numBytes) {
       case 'iterated': {
         const count = s2k.get_count();
         const data = util.concatUint8Array([s2k.salt, passphrase]);
-        let isp = new Array(Math.ceil(count / data.length));
-
-        isp = util.concatUint8Array(isp.fill(data));
-
-        if (isp.length > count) {
-          isp = isp.subarray(0, count);
+        const datalen = data.length;
+        const isp = new Uint8Array(prefix.length + count + datalen);
+        isp.set(prefix);
+        for (let pos = prefix.length; pos < count; pos += datalen) {
+          isp.set(data, pos);
         }
-
-        return crypto.hash.digest(algorithm, util.concatUint8Array([prefix, isp]));
+        return crypto.hash.digest(algorithm, isp.subarray(0, prefix.length + count));
       }
       case 'gnu':
         throw new Error("GNU s2k type not supported.");