diff options
| author | Jack Lloyd <[email protected]> | 2016-11-26 11:38:01 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-26 11:38:01 -0500 |
| commit | 345f0881bc44b7a8344ea943e96b1dad4a8d484b (patch) | |
| tree | d7d30b2e13abe660713eafed3e034ebf1494e7f8 /src/tests/data/pbkdf | |
| parent | d695dfadc0daf8290d344f82697d456fd011d153 (diff) | |
Add test for various functions previously missed (T::clone, PBKDF::name, AEAD::output_length)
Fix a bug in CCM, GCM, and OCB decryption which caused `output_length(tag_size())`
to fail even though empty plaintexts are certainly defined for all three modes.
Diffstat (limited to 'src/tests/data/pbkdf')
| -rw-r--r-- | src/tests/data/pbkdf/pbkdf1.vec | 2 | ||||
| -rw-r--r-- | src/tests/data/pbkdf/pbkdf2.vec | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/data/pbkdf/pbkdf1.vec b/src/tests/data/pbkdf/pbkdf1.vec index ebcad175b..a0eeba6e5 100644 --- a/src/tests/data/pbkdf/pbkdf1.vec +++ b/src/tests/data/pbkdf/pbkdf1.vec @@ -1,4 +1,4 @@ -[PBKDF1(SHA-1)] +[PBKDF1(SHA-160)] Salt = 40AC5837560251C275AF5E30A6A3074E57CED38E Iterations = 6 Passphrase = ftlkfbxdtbjbvllvbwiw diff --git a/src/tests/data/pbkdf/pbkdf2.vec b/src/tests/data/pbkdf/pbkdf2.vec index 6a027721a..c8a5356be 100644 --- a/src/tests/data/pbkdf/pbkdf2.vec +++ b/src/tests/data/pbkdf/pbkdf2.vec @@ -1,4 +1,4 @@ -[PBKDF2(SHA-1)] +[PBKDF2(HMAC(SHA-160))] Salt = 0001020304050607 Iterations = 10000 Passphrase = @@ -59,21 +59,21 @@ Passphrase = gwrxpqxumsdsmbmhfhmfdcvlcvngzkig OutputLen = 64 Output = 4C9DB7BA24955225D5B845F65EF24EF1B0C6E86F2E39C8DDAA4B8ABD26082D1F350381FADEAEB560DC447AFC68A6B47E6EA1E7412F6CF7B2D82342FCCD11D3B4 -[PBKDF2(SHA-256)] +[PBKDF2(HMAC(SHA-256))] Salt = 0001020304050607 Iterations = 10000 Passphrase = xyz OutputLen = 48 Output = DEFD2987FA26A4672F4D16D98398432AD95E896BF619F6A6B8D4ED1FAF98E8B531B39FFB66966D0E115A6CD8E70B72D0 -[PBKDF2(SHA-384)] +[PBKDF2(HMAC(SHA-384))] Salt = 0001020304050607 Iterations = 10000 Passphrase = xyz OutputLen = 48 Output = 47A3AE920B24EDAA2BB53155808554B13FAB58DF62B81F043D9812E9F2881164DF20BBFFA54E5EE2489FA183B6718A74 -[PBKDF2(SHA-512)] +[PBKDF2(HMAC(SHA-512))] Salt = 0001020304050607 Iterations = 10000 Passphrase = xyz |