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 /doc | |
| parent | 122fa088524571a3b60ebf301873f69afdac8f7a (diff) | |
| download | openssl-3f5616d734a92fdf99ab827f21e5b6cab85e7194.tar.gz | |
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 'doc')
| -rw-r--r-- | doc/man3/EVP_PKEY_CTX_ctrl.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man3/EVP_PKEY_CTX_ctrl.pod b/doc/man3/EVP_PKEY_CTX_ctrl.pod index abe76c8089..0e043f1a72 100644 --- a/doc/man3/EVP_PKEY_CTX_ctrl.pod +++ b/doc/man3/EVP_PKEY_CTX_ctrl.pod @@ -49,7 +49,7 @@ The control command is indicated in B<cmd> and any additional arguments in B<p1> and B<p2>. For B<cmd> = B<EVP_PKEY_CTRL_SET_MAC_KEY>, B<p1> is the length of the MAC key, -and B<p2> is MAC key. This is used by Poly1305, HMAC and CMAC. +and B<p2> is MAC key. This is used by Poly1305, SipHash, HMAC and CMAC. Applications will not normally call EVP_PKEY_CTX_ctrl() directly but will instead call one of the algorithm specific macros below. |