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/include/internal/asn1_int.h | |
| 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/include/internal/asn1_int.h')
| -rw-r--r-- | crypto/include/internal/asn1_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h index 554f067740..f78ced6dab 100644 --- a/crypto/include/internal/asn1_int.h +++ b/crypto/include/internal/asn1_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-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 @@ -67,6 +67,7 @@ extern const EVP_PKEY_ASN1_METHOD poly1305_asn1_meth; extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2]; extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD siphash_asn1_meth; /* * These are used internally in the ASN1_OBJECT to keep track of whether the |