diff options
| author | Todd Short <tshort@akamai.com> | 2017-01-11 22:38:44 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-01 20:14:36 +0100 |
| commit | 3f5616d734a92fdf99ab827f21e5b6cab85e7194 (patch) | |
| tree | 9c106795f72bc6622dfdca63d723ce0127011fc7 /util/mkdef.pl | |
| parent | remove test/.rnd on make clean (diff) | |
| download | openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.tar.xz openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.zip | |
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 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index c5884d3b92..99f5c9d011 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1995-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 @@ -82,6 +82,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", "SCRYPT", "CHACHA", "POLY1305", "BLAKE2", + "SIPHASH", # EC_NISTP_64_GCC_128 "EC_NISTP_64_GCC_128", # Envelope "algorithms" |