PBKDF2 updates to conform to SP800-132

[thirdparty/openssl.git] / test / recipes / 30-test_evp_data / evpkdf.txt

diff --git a/test/recipes/30-test_evp_data/evpkdf.txt b/test/recipes/30-test_evp_data/evpkdf.txt
index 7100c21f494434cb464886aca8a73901840db0ae..991c57427a0181f2ecb4c86778dfbdc5cc57ed4c 100644 (file)
--- a/test/recipes/30-test_evp_data/evpkdf.txt
+++ b/test/recipes/30-test_evp_data/evpkdf.txt
@@ -306,6 +306,7 @@ Result = INTERNAL_ERROR
 Title = PBKDF2 tests
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1
@@ -313,6 +314,7 @@ Ctrl.digest = digest:sha1
 Output = 0c60c80f961f0e71f3a9b524af6012062fe037a6
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1
@@ -320,6 +322,7 @@ Ctrl.digest = digest:sha256
 Output = 120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1
@@ -327,6 +330,7 @@ Ctrl.digest = digest:sha512
 Output = 867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252c02d470a285a0501bad999bfe943c08f050235d7d68b1da55e63f73b60a57fce
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:2
@@ -334,6 +338,7 @@ Ctrl.digest = digest:sha1
 Output = ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:2
@@ -341,6 +346,7 @@ Ctrl.digest = digest:sha256
 Output = ae4d0c95af6b46d32d0adff928f06dd02a303f8ef3c251dfd6e2d85a95474c43
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:2
@@ -348,6 +354,7 @@ Ctrl.digest = digest:sha512
 Output = e1d9c16aa681708a45f5c7c4e215ceb66e011a2e9f0040713f18aefdb866d53cf76cab2868a39b9f7840edce4fef5a82be67335c77a6068e04112754f27ccf4e
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:4096
@@ -355,6 +362,7 @@ Ctrl.digest = digest:sha1
 Output = 4b007901b765489abead49d926f721d065a429c1
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:4096
@@ -362,6 +370,7 @@ Ctrl.digest = digest:sha256
 Output = c5e478d59288c841aa530db6845c4c8d962893a001ce4e11a4963873aa98134a
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:password
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:4096
@@ -390,6 +399,7 @@ Ctrl.digest = digest:sha512
 Output = 8c0511f4c6e597c6ac6315d8f0362e225f3c501495ba23b868c005174dc4ee71115b59f9e60cd9532fa33e0f75aefe30225c583a186cd82bd4daea9724a3d3b8
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.hexpass = hexpass:7061737300776f7264
 Ctrl.hexsalt = hexsalt:7361006c74
 Ctrl.iter = iter:4096
@@ -397,6 +407,7 @@ Ctrl.digest = digest:sha1
 Output = 56fa6aa75548099dcc37d7f03425e0c3
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.hexpass = hexpass:7061737300776f7264
 Ctrl.hexsalt = hexsalt:7361006c74
 Ctrl.iter = iter:4096
@@ -404,6 +415,7 @@ Ctrl.digest = digest:sha256
 Output = 89b69d0516f829893c696226650a8687
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.hexpass = hexpass:7061737300776f7264
 Ctrl.hexsalt = hexsalt:7361006c74
 Ctrl.iter = iter:4096
@@ -413,6 +425,7 @@ Output = 9d9e9c4cd21fe4be24d5b8244c759665
 Title = PBKDF2 tests for empty inputs
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1
@@ -420,6 +433,7 @@ Ctrl.digest = digest:sha1
 Output = a33dddc30478185515311f8752895d36ea4363a2
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1
@@ -427,6 +441,7 @@ Ctrl.digest = digest:sha256
 Output = f135c27993baf98773c5cdb40a5706ce6a345cde
 
 KDF = PBKDF2
+Ctrl.pkcs5 = pkcs5:1
 Ctrl.pass = pass:
 Ctrl.salt = salt:salt
 Ctrl.iter = iter:1