diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-02-04 12:42:57 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-02-08 02:16:26 +0000 |
| commit | 7114af3054c005d9ff587b78f193d75e4ddf1775 (patch) | |
| tree | 30895b5e949d9f273a1bf2ebb4500077ccb22e65 /crypto | |
| parent | e5c4bf93a9b65652138ca0433b2d37d5113da5dd (diff) | |
Add NID_auth_any and NID_kx_any NIDs.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2550)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/objects/obj_dat.h | 12 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 2 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 88d371aed0..8de2592341 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 1063 +#define NUM_NID 1065 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2028,9 +2028,11 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"id-ct-xml", "id-ct-xml", NID_id_ct_xml, 11, &so[6753]}, {"Poly1305", "poly1305", NID_poly1305}, {"SipHash", "siphash", NID_siphash}, + {"KxANY", "kx-any", NID_kx_any}, + {"AuthANY", "auth-any", NID_auth_any}, }; -#define NUM_SN 1054 +#define NUM_SN 1056 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -2065,6 +2067,7 @@ static const unsigned int sn_objs[NUM_SN] = { 960, /* "AES-256-OCB" */ 428, /* "AES-256-OFB" */ 914, /* "AES-256-XTS" */ + 1064, /* "AuthANY" */ 1049, /* "AuthDSS" */ 1047, /* "AuthECDSA" */ 1050, /* "AuthGOST01" */ @@ -2163,6 +2166,7 @@ static const unsigned int sn_objs[NUM_SN] = { 645, /* "ITU-T" */ 646, /* "JOINT-ISO-ITU-T" */ 773, /* "KISA" */ + 1063, /* "KxANY" */ 1039, /* "KxDHE" */ 1041, /* "KxDHE-PSK" */ 1038, /* "KxECDHE" */ @@ -3088,7 +3092,7 @@ static const unsigned int sn_objs[NUM_SN] = { 160, /* "x509Crl" */ }; -#define NUM_LN 1054 +#define NUM_LN 1056 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -3310,6 +3314,7 @@ static const unsigned int ln_objs[NUM_LN] = { 484, /* "associatedDomain" */ 485, /* "associatedName" */ 501, /* "audio" */ + 1064, /* "auth-any" */ 1049, /* "auth-dss" */ 1047, /* "auth-ecdsa" */ 1050, /* "auth-gost01" */ @@ -3783,6 +3788,7 @@ static const unsigned int ln_objs[NUM_LN] = { 956, /* "jurisdictionStateOrProvinceName" */ 150, /* "keyBag" */ 773, /* "kisa" */ + 1063, /* "kx-any" */ 1039, /* "kx-dhe" */ 1041, /* "kx-dhe-psk" */ 1038, /* "kx-ecdhe" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 3793951c62..5ca5260fb1 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1060,3 +1060,5 @@ id_smime_ct_authEnvelopedData 1059 id_ct_xml 1060 poly1305 1061 siphash 1062 +kx_any 1063 +auth_any 1064 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 5b1f2bdac5..0d189f8b4a 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1472,6 +1472,7 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : KxPSK : kx-psk : KxSRP : kx-srp : KxGOST : kx-gost + : KxANY : kx-any # NIDs for cipher authentication : AuthRSA : auth-rsa @@ -1482,6 +1483,7 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : AuthGOST12 : auth-gost12 : AuthSRP : auth-srp : AuthNULL : auth-null + : AuthANY : auth-any # NID for Poly1305 : Poly1305 : poly1305 # NID for SipHash |