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/objects | |
| 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/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 9 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 1 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 5171f56846..88d371aed0 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -963,7 +963,7 @@ static const unsigned char so[6765] = { 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1C, /* [ 6753] OBJ_id_ct_xml */ }; -#define NUM_NID 1062 +#define NUM_NID 1063 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2027,9 +2027,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"id-smime-ct-authEnvelopedData", "id-smime-ct-authEnvelopedData", NID_id_smime_ct_authEnvelopedData, 11, &so[6742]}, {"id-ct-xml", "id-ct-xml", NID_id_ct_xml, 11, &so[6753]}, {"Poly1305", "poly1305", NID_poly1305}, + {"SipHash", "siphash", NID_siphash}, }; -#define NUM_SN 1053 +#define NUM_SN 1054 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -2256,6 +2257,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1006, /* "SNILS" */ 16, /* "ST" */ 143, /* "SXNetID" */ + 1062, /* "SipHash" */ 1021, /* "TLS1-PRF" */ 458, /* "UID" */ 0, /* "UNDEF" */ @@ -3086,7 +3088,7 @@ static const unsigned int sn_objs[NUM_SN] = { 160, /* "x509Crl" */ }; -#define NUM_LN 1053 +#define NUM_LN 1054 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -4096,6 +4098,7 @@ static const unsigned int ln_objs[NUM_LN] = { 52, /* "signingTime" */ 454, /* "simpleSecurityObject" */ 496, /* "singleLevelQuality" */ + 1062, /* "siphash" */ 16, /* "stateOrProvinceName" */ 660, /* "streetAddress" */ 498, /* "subtreeMaximumQuality" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 9aa490b670..3793951c62 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1059,3 +1059,4 @@ id_smime_ct_contentCollection 1058 id_smime_ct_authEnvelopedData 1059 id_ct_xml 1060 poly1305 1061 +siphash 1062 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 09701af4a1..5b1f2bdac5 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1484,3 +1484,5 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : AuthNULL : auth-null # NID for Poly1305 : Poly1305 : poly1305 +# NID for SipHash + : SipHash : siphash |