From 5a37d0ccf2d6d310f754504ef2efd5af61446116 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Wed, 17 Jul 2024 15:11:19 +0200 Subject: [PATCH 1/3] Document origin of Argon2 test vectors --- .../java/org/bouncycastle/openpgp/test/Argon2S2KTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java index 4062aa5266..3cc4739a20 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java +++ b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java @@ -42,7 +42,7 @@ public class Argon2S2KTest static final String TEST_MSG_PASSWORD = "password"; - // Test message from the crypto-refresh-05 document + // https://www.rfc-editor.org/rfc/rfc9580.html#name-v4-skesk-using-argon2-with- static final String TEST_MSG_AES128 = "-----BEGIN PGP MESSAGE-----\n" + "Comment: Encrypted using AES with 128-bit key\n" + "Comment: Session key: 01FE16BBACFD1E7B78EF3B865187374F\n" + @@ -53,7 +53,7 @@ public class Argon2S2KTest "=uIks\n" + "-----END PGP MESSAGE-----"; - // Test message from the crypto-refresh-05 document + // https://www.rfc-editor.org/rfc/rfc9580.html#name-v4-skesk-using-argon2-with-a private static final String TEST_MSG_AES192 = "-----BEGIN PGP MESSAGE-----\n" + "Comment: Encrypted using AES with 192-bit key\n" + "Comment: Session key: 27006DAE68E509022CE45A14E569E91001C2955AF8DFE194\n" + @@ -64,7 +64,7 @@ public class Argon2S2KTest "=n8Ma\n" + "-----END PGP MESSAGE-----"; - // Test message from the crypto-refresh-05 document + // https://www.rfc-editor.org/rfc/rfc9580.html#name-v4-skesk-using-argon2-with-ae private static final String TEST_MSG_AES256 = "-----BEGIN PGP MESSAGE-----\n" + "Comment: Encrypted using AES with 192-bit key\n" + "Comment: Session key: 27006DAE68E509022CE45A14E569E91001C2955AF8DFE194\n" + From 9647d91fa6801bd9e06db448f90e1f9cdb85e3a1 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Wed, 17 Jul 2024 15:11:43 +0200 Subject: [PATCH 2/3] Replace Argon2/AES256 test vector with proper one --- .../bouncycastle/openpgp/test/Argon2S2KTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java index 3cc4739a20..5ab7d4b7db 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java +++ b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java @@ -66,14 +66,14 @@ public class Argon2S2KTest // https://www.rfc-editor.org/rfc/rfc9580.html#name-v4-skesk-using-argon2-with-ae private static final String TEST_MSG_AES256 = "-----BEGIN PGP MESSAGE-----\n" + - "Comment: Encrypted using AES with 192-bit key\n" + - "Comment: Session key: 27006DAE68E509022CE45A14E569E91001C2955AF8DFE194\n" + - "\n" + - "wy8ECAThTKxHFTRZGKli3KNH4UP4AQQVhzLJ2va3FG8/pmpIPd/H/mdoVS5VBLLw\n" + - "F9I+AdJ1Sw56PRYiKZjCvHg+2bnq02s33AJJoyBexBI4QKATFRkyez2gldJldRys\n" + - "LVg77Mwwfgl2n/d572WciAM=\n" + - "=n8Ma\n" + - "-----END PGP MESSAGE-----"; + "Comment: Encrypted using AES with 256-bit key\n" + + "Comment: Session key: BBEDA55B9AAE63DAC45D4F49D89DACF4AF37FEF...\n" + + "Comment: Session key: ...C13BAB2F1F8E18FB74580D8B0\n" + + "\n" + + "wzcECQS4eJUgIG/3mcaILEJFpmJ8AQQVnZ9l7KtagdClm9UaQ/Z6M/5roklSGpGu\n" + + "623YmaXezGj80j4B+Ku1sgTdJo87X1Wrup7l0wJypZls21Uwd67m9koF60eefH/K\n" + + "95D1usliXOEm8ayQJQmZrjf6K6v9PWwqMQ==\n" + + "-----END PGP MESSAGE-----"; static final String TEST_MSG_PLAIN = "Hello, world!"; From d5a348c34d3292bf61d7994dd06409c8307c1221 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 8 Aug 2024 13:20:32 +0200 Subject: [PATCH 3/3] Remove unused test vectors --- .../java/org/bouncycastle/openpgp/test/Argon2S2KTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java index 5ab7d4b7db..80a4642573 100644 --- a/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java +++ b/pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java @@ -7,17 +7,12 @@ import java.io.OutputStream; import java.security.SecureRandom; import java.util.Date; -import java.util.Iterator; import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.bcpg.ArmoredOutputStream; -import org.bouncycastle.bcpg.BCPGInputStream; import org.bouncycastle.bcpg.BCPGOutputStream; -import org.bouncycastle.bcpg.HashAlgorithmTags; import org.bouncycastle.bcpg.S2K; import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.bcpg.SymmetricKeyEncSessionPacket; -import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; import org.bouncycastle.openpgp.PGPEncryptedDataList; import org.bouncycastle.openpgp.PGPException;