From 5702392f73e679fd9ed9dd912cf4c9dc613c4d71 Mon Sep 17 00:00:00 2001
From: Hubert Kario <hkario@redhat.com>
Date: Fri, 6 Aug 2021 13:39:32 +0200
Subject: [PATCH] add tests for PBKDF2 with SHA-3

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16237)
---
 .../30-test_evp_data/evpkdf_pbkdf2.txt        | 32 +++++++++++++++++++
 .../30-test_evp_data/evppbe_pbkdf2.txt        | 28 ++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt b/test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt
index 3f597240721..3658397518a 100644
--- a/test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt
@@ -130,6 +130,38 @@ Ctrl.iter = iter:4096
 Ctrl.digest = digest:sha512
 Output = 9d9e9c4cd21fe4be24d5b8244c759665
 
+KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
+Ctrl.pass = pass:password
+Ctrl.salt = salt:salt
+Ctrl.iter = iter:4096
+Ctrl.digest = digest:sha3-224
+Output = 691292bc3683d7d41ea2910f5b3eed23
+
+KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
+Ctrl.pass = pass:password
+Ctrl.salt = salt:salt
+Ctrl.iter = iter:4096
+Ctrl.digest = digest:sha3-256
+Output = 778b6e237a0f49621549ff70d218d208
+
+KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
+Ctrl.pass = pass:password
+Ctrl.salt = salt:salt
+Ctrl.iter = iter:4096
+Ctrl.digest = digest:sha3-384
+Output = 9a5f1e45e8b83f1b259ba72d11c59087
+
+KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
+Ctrl.pass = pass:password
+Ctrl.salt = salt:salt
+Ctrl.iter = iter:4096
+Ctrl.digest = digest:sha3-512
+Output = 2bfaf2d5ceb6d10f5e262cd902488cfd
+
 Title = PBKDF2 tests for empty inputs
 
 KDF = PBKDF2
diff --git a/test/recipes/30-test_evp_data/evppbe_pbkdf2.txt b/test/recipes/30-test_evp_data/evppbe_pbkdf2.txt
index 3304179ecde..ecf1d25ae5a 100644
--- a/test/recipes/30-test_evp_data/evppbe_pbkdf2.txt
+++ b/test/recipes/30-test_evp_data/evppbe_pbkdf2.txt
@@ -118,6 +118,34 @@ iter = 4096
 MD = sha512
 Key = 9d9e9c4cd21fe4be24d5b8244c759665
 
+PBE = pbkdf2
+Password = "password"
+Salt = "salt"
+iter = 4096
+MD = sha3-224
+Key = 691292bc3683d7d41ea2910f5b3eed23
+
+PBE = pbkdf2
+Password = "password"
+Salt = "salt"
+iter = 4096
+MD = sha3-256
+Key = 778b6e237a0f49621549ff70d218d208
+
+PBE = pbkdf2
+Password = "password"
+Salt = "salt"
+iter = 4096
+MD = sha3-384
+Key = 9a5f1e45e8b83f1b259ba72d11c59087
+
+PBE = pbkdf2
+Password = "password"
+Salt = "salt"
+iter = 4096
+MD = sha3-512
+Key = 2bfaf2d5ceb6d10f5e262cd902488cfd
+
 Title = PBKDF2 tests for empty and NULL inputs
 
 PBE = pbkdf2
-- 
2.47.2