Commit 7114af30 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add NID_auth_any and NID_kx_any NIDs. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2550)
parent e5c4bf93

crypto/objects/obj_dat.h

+9 −3
Original line number Diff line number Diff line
@@ -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" */

crypto/objects/obj_mac.num

+2 −0
Original line number Diff line number Diff line
@@ -1060,3 +1060,5 @@ id_smime_ct_authEnvelopedData 1059 
id_ct_xml		1060

poly1305		1061

siphash		1062

kx_any		1063

auth_any		1064

crypto/objects/objects.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

include/openssl/obj_mac.h

+8 −0
Original line number Diff line number Diff line
@@ -4544,6 +4544,10 @@ 
#define LN_kx_gost              "kx-gost"

#define NID_kx_gost             1045



#define SN_kx_any               "KxANY"

#define LN_kx_any               "kx-any"

#define NID_kx_any              1063



#define SN_auth_rsa             "AuthRSA"

#define LN_auth_rsa             "auth-rsa"

#define NID_auth_rsa            1046
@@ -4576,6 +4580,10 @@ 
#define LN_auth_null            "auth-null"

#define NID_auth_null           1053



#define SN_auth_any             "AuthANY"

#define LN_auth_any             "auth-any"

#define NID_auth_any            1064



#define SN_poly1305             "Poly1305"

#define LN_poly1305             "poly1305"

#define NID_poly1305            1061

ssl/ssl_ciph.c

+4 −2
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ static const ssl_cipher_table ssl_cipher_table_kx[] = { 
    {SSL_kRSAPSK,   NID_kx_rsa_psk},

    {SSL_kPSK,      NID_kx_psk},

    {SSL_kSRP,      NID_kx_srp},

    {SSL_kGOST,     NID_kx_gost}

    {SSL_kGOST,     NID_kx_gost},

    {SSL_kANY,      NID_kx_any}

};



static const ssl_cipher_table ssl_cipher_table_auth[] = {
@@ -164,7 +165,8 @@ static const ssl_cipher_table ssl_cipher_table_auth[] = { 
    {SSL_aGOST01, NID_auth_gost01},

    {SSL_aGOST12, NID_auth_gost12},

    {SSL_aSRP,    NID_auth_srp},

    {SSL_aNULL,   NID_auth_null}

    {SSL_aNULL,   NID_auth_null},

    {SSL_aANY,    NID_auth_any}

};

/* *INDENT-ON* */