diff options
| author | Pauli <pauli@openssl.org> | 2023-06-07 09:45:15 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-06-08 11:43:10 +0200 |
| commit | 45fefe172aa630686561e5a3cfcb25262db23edc (patch) | |
| tree | d78e2f76e70d082b35692bf19c47d159c7c7172a /test | |
| parent | 2c4124a3a1373036141ee8f07fdd5806cab12aeb (diff) | |
kdf test: restrict the version of the FIPS provider
Concatenation tests are provider version specific, limit them to supporting
versions.
Fixes #21134
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21140)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt | 1 | ||||
| -rw-r--r-- | test/recipes/30-test_evp_data/evpkdf_ss.txt | 1 | ||||
| -rw-r--r-- | test/recipes/30-test_evp_data/evpkdf_x963.txt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt b/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt index bfa797a53a..04cef6f7e8 100644 --- a/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt +++ b/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt @@ -1842,6 +1842,7 @@ Ctrl.hexinfo = hexinfo:8e9db3335779db688bcfe096668d9c3bc64e193e3529c430e68d09d56 Output = 6db880daac98b078ee389a2164252ded61322d661e2b49247ea921e544675d8f17af2bf66dd40d81 # Test concat of multiple info (Uses existing test data, and just splits the info into separate fields) +FIPSversion = >=3.2.0 KDF = KBKDF Ctrl.mode = mode:COUNTER Ctrl.digest = digest:SHA512 diff --git a/test/recipes/30-test_evp_data/evpkdf_ss.txt b/test/recipes/30-test_evp_data/evpkdf_ss.txt index 1959341231..c2b405a648 100644 --- a/test/recipes/30-test_evp_data/evpkdf_ss.txt +++ b/test/recipes/30-test_evp_data/evpkdf_ss.txt @@ -1121,6 +1121,7 @@ Ctrl.hexinfo = hexinfo:307e300a06082b06010502030603a01f041d301ba0071b0553552e534 Output = d3c78b78d75313e9a926f75dfb012363fa17fa01db # Test concat of multiple info (Uses existing test data, and just splits the info into separate fields) +FIPSversion = >=3.2.0 KDF = SSKDF Ctrl.digest = digest:SHA512 Ctrl.hexsecret = hexsecret:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/test/recipes/30-test_evp_data/evpkdf_x963.txt b/test/recipes/30-test_evp_data/evpkdf_x963.txt index 8024396543..7d078debfb 100644 --- a/test/recipes/30-test_evp_data/evpkdf_x963.txt +++ b/test/recipes/30-test_evp_data/evpkdf_x963.txt @@ -112,6 +112,7 @@ Ctrl.hexinfo = hexinfo:eb17da8851c41c7ac6710b1c49f324f8 Output = 829a28b81f9e95b5f306604067499c07d5944ca034ed130d513951f7143e4e162bad8adb2833e53b8235c293cd2a809659ac7f7e392cba6a543660e5d95070c0c9e6a9cdc38123e22da61bb4cbb6ad6d1a58a069e934fc231bd9fe39a24afcbf322ccea385f0418f3b01c1edd6e7124593a1cefe3e48fcd95daaf72cfd973c59 # Test concat of multiple info (Uses existing test data, and just splits the info into separate fields) +FIPSversion = >=3.2.0 KDF = X963KDF Ctrl.digest = digest:SHA512 Ctrl.hexsecret = hexsecret:0096172bf47d06d544ae98471490cf9e52ee59ea7a2208b33b26c52d4952bb8f41b2211d3f9ff32e77ca8cc906ba8d246ff266ddf1df8f53824ccb15b8fb39724703 |