diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-04 14:10:52 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-04 14:10:52 +0000 |
| commit | da15ce2212ffcba0a1fa7263ebd1b434dd60d040 (patch) | |
| tree | 35c0a931cc96c2c60c55d17b3d995c39c4d30433 /crypto/objects | |
| parent | d848944848cb18cb1332f9514b8122af0cf09e55 (diff) | |
| download | openssl-new-da15ce2212ffcba0a1fa7263ebd1b434dd60d040.tar.gz | |
update OID tables
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 30 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 4 |
2 files changed, 29 insertions, 5 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index c7a793377f..18115acc32 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -60,12 +60,12 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 1034 -#define NUM_SN 1027 -#define NUM_LN 1027 -#define NUM_OBJ 949 +#define NUM_NID 1038 +#define NUM_SN 1031 +#define NUM_LN 1031 +#define NUM_OBJ 953 -static const unsigned char lvalues[6704]={ +static const unsigned char lvalues[6740]={ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */ @@ -1009,6 +1009,10 @@ static const unsigned char lvalues[6704]={ 0x2B,0x06,0x01,0x05,0x02,0x03, /* [6683] OBJ_id_pkinit */ 0x2B,0x06,0x01,0x05,0x02,0x03,0x04, /* [6689] OBJ_pkInitClientAuth */ 0x2B,0x06,0x01,0x05,0x02,0x03,0x05, /* [6696] OBJ_pkInitKDC */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x01,/* [6703] OBJ_Curve25519 */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x02,/* [6712] OBJ_Curve448 */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x03,/* [6721] OBJ_Curve25519ph */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x04,/* [6730] OBJ_Curve448ph */ }; static const ASN1_OBJECT nid_objs[NUM_NID]={ @@ -2700,6 +2704,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ {"pkInitClientAuth","PKINIT Client Auth",NID_pkInitClientAuth,7, &(lvalues[6689]),0}, {"pkInitKDC","Signing KDC Response",NID_pkInitKDC,7,&(lvalues[6696]),0}, +{"Curve25519","Curve25519",NID_Curve25519,9,&(lvalues[6703]),0}, +{"Curve448","Curve448",NID_Curve448,9,&(lvalues[6712]),0}, +{"Curve25519ph","Curve25519ph",NID_Curve25519ph,9,&(lvalues[6721]),0}, +{"Curve448ph","Curve448ph",NID_Curve448ph,9,&(lvalues[6730]),0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2782,6 +2790,10 @@ static const unsigned int sn_objs[NUM_SN]={ 1019, /* "ChaCha20" */ 1018, /* "ChaCha20-Poly1305" */ 367, /* "CrlID" */ +1034, /* "Curve25519" */ +1036, /* "Curve25519ph" */ +1035, /* "Curve448" */ +1037, /* "Curve448ph" */ 391, /* "DC" */ 31, /* "DES-CBC" */ 643, /* "DES-CDMF" */ @@ -3750,6 +3762,10 @@ static const unsigned int ln_objs[NUM_LN]={ 131, /* "Code Signing" */ 1024, /* "Ctrl/Provision WAP Termination" */ 1023, /* "Ctrl/provision WAP Access" */ +1034, /* "Curve25519" */ +1036, /* "Curve25519ph" */ +1035, /* "Curve448" */ +1037, /* "Curve448ph" */ 783, /* "Diffie-Hellman based MAC" */ 382, /* "Directory" */ 392, /* "Domain" */ @@ -5464,6 +5480,10 @@ static const unsigned int obj_objs[NUM_OBJ]={ 390, /* OBJ_dcObject 1 3 6 1 4 1 1466 344 */ 91, /* OBJ_bf_cbc 1 3 6 1 4 1 3029 1 2 */ 973, /* OBJ_id_scrypt 1 3 6 1 4 1 11591 4 11 */ +1034, /* OBJ_Curve25519 1 3 6 1 4 1 11591 15 1 */ +1035, /* OBJ_Curve448 1 3 6 1 4 1 11591 15 2 */ +1036, /* OBJ_Curve25519ph 1 3 6 1 4 1 11591 15 3 */ +1037, /* OBJ_Curve448ph 1 3 6 1 4 1 11591 15 4 */ 315, /* OBJ_id_regCtrl_regToken 1 3 6 1 5 5 7 5 1 1 */ 316, /* OBJ_id_regCtrl_authenticator 1 3 6 1 5 5 7 5 1 2 */ 317, /* OBJ_id_regCtrl_pkiPublicationInfo 1 3 6 1 5 5 7 5 1 3 */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index f4937958c7..a9a9e3d16d 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1031,3 +1031,7 @@ sendProxiedOwner 1030 id_pkinit 1031 pkInitClientAuth 1032 pkInitKDC 1033 +Curve25519 1034 +Curve448 1035 +Curve25519ph 1036 +Curve448ph 1037 |