diff options
| author | Pauli <paul.dale@oracle.com> | 2019-08-27 15:23:09 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-06 19:27:57 +1000 |
| commit | d6c5d7f3de5e56f467631ee2e4866cf8a523bc02 (patch) | |
| tree | 86b31880c03d92661723e530fc5d5b73ec84f840 /test | |
| parent | 59cba5ac8591dba5113fb674ad001d45450e59d1 (diff) | |
Update EVP test data for KDFs and PRFs.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9662)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/30-test_evp_data/evpkdf.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/recipes/30-test_evp_data/evpkdf.txt b/test/recipes/30-test_evp_data/evpkdf.txt index 6f7270bb9e..9c9be7552c 100644 --- a/test/recipes/30-test_evp_data/evpkdf.txt +++ b/test/recipes/30-test_evp_data/evpkdf.txt @@ -254,51 +254,51 @@ Output = 2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081 Title = id-scrypt tests (from draft-josefsson-id-scrypt-kdf-03 and others) -KDF = scrypt +KDF = id-scrypt Ctrl.pass = pass: Ctrl.salt = salt: -Ctrl.N = N:16 +Ctrl.N = n:16 Ctrl.r = r:1 Ctrl.p = p:1 Output = 77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906 -KDF = scrypt +KDF = id-scrypt Ctrl.pass = pass:password Ctrl.salt = salt:NaCl -Ctrl.N = N:1024 +Ctrl.N = n:1024 Ctrl.r = r:8 Ctrl.p = p:16 Output = fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640 -KDF = scrypt +KDF = id-scrypt Ctrl.hexpass = hexpass:70617373776f7264 Ctrl.salt = salt:NaCl -Ctrl.N = N:1024 +Ctrl.N = n:1024 Ctrl.r = r:8 Ctrl.p = p:16 Output = fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640 -KDF = scrypt +KDF = id-scrypt Ctrl.pass = pass:password Ctrl.hexsalt = hexsalt:4e61436c -Ctrl.N = N:1024 +Ctrl.N = n:1024 Ctrl.r = r:8 Ctrl.p = p:16 Output = fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640 -KDF = scrypt +KDF = id-scrypt Ctrl.pass = pass:pleaseletmein Ctrl.salt = salt:SodiumChloride -Ctrl.N = N:16384 +Ctrl.N = n:16384 Ctrl.r = r:8 Ctrl.p = p:1 Output = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887 # Out of memory -KDF = scrypt +KDF = id-scrypt Ctrl.pass = pass:pleaseletmein Ctrl.salt = salt:SodiumChloride -Ctrl.N = N:1048576 +Ctrl.N = n:1048576 Ctrl.r = r:8 Ctrl.p = p:1 Result = INTERNAL_ERROR @@ -452,7 +452,7 @@ Title = SSHKDF tests (from NIST CAVS 14.1 test vectors) # The first one uses md instead of digest to test alias works KDF = SSHKDF -Ctrl.md = md:SHA1 +Ctrl.digest = digest:SHA1 Ctrl.hexkey = hexkey:0000008055bae931c07fd824bf10add1902b6fbc7c665347383498a686929ff5a25f8e40cb6645ea814fb1a5e0a11f852f86255641e5ed986e83a78bc8269480eac0b0dfd770cab92e7a28dd87ff452466d6ae867cead63b366b1c286e6c4811a9f14c27aea14c5171d49b78c06e3735d36e6a3be321dd5fc82308f34ee1cb17fba94a59 Ctrl.hexxcghash = hexxcghash:a4ebd45934f56792b5112dcd75a1075fdc889245 Ctrl.hexsession_id = hexsession_id:a4ebd45934f56792b5112dcd75a1075fdc889245 |