From aef97781e76f5b2fe1ed100bd5fa8c448aa807fc Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 2 Sep 2024 09:53:13 -0700
Subject: [PATCH] argon2id test vectors

---
 docs/development/test-vectors.rst             |  3 +
 docs/spelling_wordlist.txt                    |  2 +
 vectors/cryptography_vectors/KDF/argon2id.txt | 62 +++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 vectors/cryptography_vectors/KDF/argon2id.txt

diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index ff34844699b3..dcbc93edf89f 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -963,6 +963,8 @@ Key derivation functions
 * X9.63 KDF from `NIST CAVP`_.
 * SP 800-108 Counter Mode KDF (HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,
   HMAC-SHA384, HMAC-SHA512) from `NIST CAVP`_.
+* argon2id from :rfc:`9106`, OpenSSL's `evpkdf_argon2.txt`_, and the
+  argon2 command line application.
 
 Key wrapping
 ~~~~~~~~~~~~
@@ -1108,4 +1110,5 @@ header format (substituting the correct information):
 .. _`dkg's additional OCB3 vectors`: https://gitlab.com/dkg/ocb-test-vectors
 .. _`OpenSSL's OCB vectors`: https://github.com/openssl/openssl/commit/2f19ab18a29cf9c82cdd68bc8c7e5be5061b19be
 .. _`badkeys`: https://github.com/vcsjones/badkeys/tree/50f1cc5f8d13bf3a2046d689f6452decb15d9c3c
+.. _`evpkdf_argon2.txt`: https://github.com/openssl/openssl/blob/01f4b44e075a796d62d3b007a80c5c04d0e77bfb/test/recipes/30-test_evp_data/evpkdf_argon2.txt
 .. _`OpenSSL's RFC 6979 test vectors`: https://github.com/openssl/openssl/blob/01690a7ff36c4d18c48b301cdf375c954105a1d9/test/recipes/30-test_evp_data/evppkey_ecdsa_rfc6979.txt
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index 2cf3167b1dbc..6a0282266821 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -1,6 +1,8 @@
 AArch
 accessor
 affine
+argon2
+argon2id
 Authenticator
 authenticator
 backend
diff --git a/vectors/cryptography_vectors/KDF/argon2id.txt b/vectors/cryptography_vectors/KDF/argon2id.txt
new file mode 100644
index 000000000000..035e2a53ceb0
--- /dev/null
+++ b/vectors/cryptography_vectors/KDF/argon2id.txt
@@ -0,0 +1,62 @@
+# Test vectors from RFC 9106,
+# https://github.com/openssl/openssl/blob/01f4b44e075a796d62d3b007a80c5c04d0e77bfb/test/recipes/30-test_evp_data/evpkdf_argon2.txt
+# and the argon2 CLI tool. Adapted for the pyca/cryptography NIST loaders
+
+COUNT = 0
+length = 32
+lanes = 4
+iter = 3
+memcost = 32
+secret = 0303030303030303
+pass = 0101010101010101010101010101010101010101010101010101010101010101
+salt = 02020202020202020202020202020202
+ad = 040404040404040404040404
+output = 0d640df58d78766c08c037a34a8b53c9d01ef0452d75b65eb52520e96b01e659
+
+COUNT = 1
+length = 32
+lanes = 4
+iter = 3
+memcost = 32
+pass =
+salt = 02020202020202020202020202020202
+output = 0a34f1abde67086c82e785eaf17c68382259a264f4e61b91cd2763cb75ac189a
+
+COUNT = 2
+length = 32
+lanes = 4
+iter = 3
+memcost = 32
+pass = 0101010101010101010101010101010101010101010101010101010101010101
+salt = 02020202020202020202020202020202
+output = 03aab965c12001c9d7d0d2de33192c0494b684bb148196d73c1df1acaf6d0c2e
+
+# echo -n "password" | argon2 pycasalt -id -t 1 -k 131072 -p 2 -l 64
+COUNT = 3
+length = 64
+lanes = 2
+iter = 1
+memcost = 131072
+salt = 7079636173616c74
+pass = 70617373776f7264
+output = e9e42714a15947f6ce1fdabbb667dfc9fd1af7c473f021cc3402506bfa7750533f33aa44e3aebcf336680f4a2bdc371758574ad48470f05a9ee2ffd70c150b4c
+
+# echo -n "password" | argon2 pycasalt -id -t 4 -k 50 -p 4 -l 8
+COUNT = 4
+length = 8
+lanes = 4
+iter = 4
+memcost = 50
+salt = 7079636173616c74
+pass = 70617373776f7264
+output = e469b777841e543f
+
+# echo -n "password" | argon2 pycasalt -id -t 1 -k 8 -p 1 -l 4
+COUNT = 5
+length = 4
+lanes = 1
+iter = 1
+memcost = 8
+salt = 7079636173616c74
+pass = 70617373776f7264
+output = 009c7809
\ No newline at end of file