From 3f5616d734a92fdf99ab827f21e5b6cab85e7194 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 11 Jan 2017 16:38:44 -0500 Subject: 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 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2216) --- util/libcrypto.num | 1 + util/mkdef.pl | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/libcrypto.num b/util/libcrypto.num index 8e9b752940..d876ed4666 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4230,3 +4230,4 @@ UI_UTIL_wrap_read_pem_callback 4180 1_1_1 EXIST::FUNCTION:UI X509_VERIFY_PARAM_get_time 4181 1_1_0d EXIST::FUNCTION: EVP_PKEY_get0_poly1305 4182 1_1_1 EXIST::FUNCTION:POLY1305 DH_check_params 4183 1_1_0d EXIST::FUNCTION:DH +EVP_PKEY_get0_siphash 4184 1_1_1 EXIST::FUNCTION:SIPHASH 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" -- cgit v1.2.3