diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-11-11 12:23:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-11-12 07:16:58 +0100 |
| commit | 61e78e7ace6c5d65910379556d7da7d23492291c (patch) | |
| tree | 0e83b9e32ed1d2c183af578613b4814da2fd51c9 /test/recipes | |
| parent | e37b7014f3f52124b787ca1b5b51b0111462a0ac (diff) | |
Fix SipHash init order.
Setting the SipHash hash size and setting its key is done with two
independent functions... and yet, the internals depend on both.
Unfortunately, the function to change the size wasn't adapted for the
possibility that the key was set first, with a different hash size.
This changes the hash setting function to fix the internal values
(which is easy, fortunately) according to the hash size.
evpmac.txt value for digestsize:8 is also corrected.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7613)
(cherry picked from commit 425036130dfb3cfbef5937772f7526ce60133264)
Diffstat (limited to 'test/recipes')
| -rw-r--r-- | test/recipes/30-test_evp_data/evpmac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/recipes/30-test_evp_data/evpmac.txt b/test/recipes/30-test_evp_data/evpmac.txt index 4ec5fa425c..2bcb3c33be 100644 --- a/test/recipes/30-test_evp_data/evpmac.txt +++ b/test/recipes/30-test_evp_data/evpmac.txt @@ -134,7 +134,7 @@ MAC = SipHash Ctrl = digestsize:8 Key = 000102030405060708090A0B0C0D0E0F Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E -Output = B96AB0B9D449A78A +Output = 724506EB4C328A95 # SIPHASH - default values: 2,4 rounds, explicit 16-byte mac |