From f33d833b37ce80cfbb0ce745d4fae09256b7113e Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Thu, 7 Nov 2024 13:09:23 +0100
Subject: [PATCH] Update hash algorithm preferences order

---
 src/key/factory.js  | 7 +++----
 test/general/key.js | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/key/factory.js b/src/key/factory.js
index 68cdfb95..955802a3 100644
--- a/src/key/factory.js
+++ b/src/key/factory.js
@@ -214,11 +214,10 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options, conf
       });
     }
     signatureProperties.preferredHashAlgorithms = createPreferredAlgos([
-      // prefer fast asm.js implementations (SHA-256)
-      enums.hash.sha256,
       enums.hash.sha512,
-      enums.hash.sha3_256,
-      enums.hash.sha3_512
+      enums.hash.sha256,
+      enums.hash.sha3_512,
+      enums.hash.sha3_256
     ], config.preferredHashAlgorithm);
     signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([
       enums.compression.uncompressed,
diff --git a/test/general/key.js b/test/general/key.js
index ff94ecab..94caa480 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -2261,7 +2261,7 @@ function versionSpecificTests() {
         ]);
       }
       const hash = openpgp.enums.hash;
-      expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha512, hash.sha256, hash.sha3_256, hash.sha3_512]);
+      expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]);
       const compr = openpgp.enums.compression;
       expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]);
 
@@ -2316,7 +2316,7 @@ function versionSpecificTests() {
         ]);
       }
       const hash = openpgp.enums.hash;
-      expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]);
+      expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]);
       const compr = openpgp.enums.compression;
       expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed, compr.zip]);