diff options
author | Todd Short <tshort@akamai.com> | 2017-01-11 16:38:44 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-02-01 14:14:36 -0500 |
commit | 3f5616d734a92fdf99ab827f21e5b6cab85e7194 (patch) | |
tree | 9c106795f72bc6622dfdca63d723ce0127011fc7 /crypto/objects/objects.txt | |
parent | 122fa088524571a3b60ebf301873f69afdac8f7a (diff) |
Add support for parameterized SipHash
The core SipHash supports either 8 or 16-byte output and a configurable
number of rounds.
The default behavior, as added to EVP, is to use 16-byte output and
2,4 rounds, which matches the behavior of most implementations.
There is an EVP_PKEY_CTRL that can control the output size.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2216)
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r-- | crypto/objects/objects.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 09701af4a1..5b1f2bdac5 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1484,3 +1484,5 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : AuthNULL : auth-null # NID for Poly1305 : Poly1305 : poly1305 +# NID for SipHash + : SipHash : siphash |