summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorTodd Short <tshort@akamai.com>2017-01-11 16:38:44 -0500
committerRich Salz <rsalz@openssl.org>2017-02-01 14:14:36 -0500
commit3f5616d734a92fdf99ab827f21e5b6cab85e7194 (patch)
tree9c106795f72bc6622dfdca63d723ce0127011fc7 /Configure
parent122fa088524571a3b60ebf301873f69afdac8f7a (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 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/Configure b/Configure
index ef532dad78..1fe2280fd4 100755
--- a/Configure
+++ b/Configure
@@ -313,7 +313,7 @@ $config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "util", "tools", "
# crypto/ subdirectories to build
$config{sdirs} = [
"objects",
- "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2",
+ "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2", "siphash",
"des", "aes", "rc2", "rc4", "rc5", "idea", "bf", "cast", "camellia", "seed", "chacha", "modes",
"bn", "ec", "rsa", "dsa", "dh", "dso", "engine",
"buffer", "bio", "stack", "lhash", "rand", "err",
@@ -397,6 +397,7 @@ my @disablables = (
"sctp",
"seed",
"shared",
+ "siphash",
"sock",
"srp",
"srtp",