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/asn1/standard_methods.h | |
| parent | 122fa088524571a3b60ebf301873f69afdac8f7a (diff) | |
| download | openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.zip openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.tar.gz openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.tar.bz2 | |
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/asn1/standard_methods.h')
| -rw-r--r-- | crypto/asn1/standard_methods.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h index ca38b09..a0fd881 100644 --- a/crypto/asn1/standard_methods.h +++ b/crypto/asn1/standard_methods.h @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -46,5 +46,8 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { #ifndef OPENSSL_NO_POLY1305 &poly1305_asn1_meth, #endif +#ifndef OPENSSL_NO_SIPHASH + &siphash_asn1_meth, +#endif }; |