From 899cf48f17ba95a7bd986bbeffeebf9a1d9fd3fb Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 22 Feb 2016 14:27:09 +0000 Subject: [PATCH] Rename OIDs. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use standard X25519 and X448 names for OIDs. Delete EdDSA OIDs: for now they wont be used and EdDSA may use a different format. Reviewed-by: Rich Salz Reviewed-by: Emilia Käsper --- crypto/objects/obj_dat.h | 40 ++++++++++++++------------------------ crypto/objects/obj_mac.num | 6 ++---- crypto/objects/objects.txt | 6 ++---- include/openssl/obj_mac.h | 20 ++++++------------- 4 files changed, 25 insertions(+), 47 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 18115acc32..e5c5963d8b 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 1038 -#define NUM_SN 1031 -#define NUM_LN 1031 -#define NUM_OBJ 953 +#define NUM_NID 1036 +#define NUM_SN 1029 +#define NUM_LN 1029 +#define NUM_OBJ 951 -static const unsigned char lvalues[6740]={ +static const unsigned char lvalues[6722]={ 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,10 +1009,8 @@ static const unsigned char lvalues[6740]={ 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 */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x01,/* [6703] OBJ_X25519 */ +0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x02,/* [6712] OBJ_X448 */ }; static const ASN1_OBJECT nid_objs[NUM_NID]={ @@ -2704,10 +2702,8 @@ 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}, +{"X25519","X25519",NID_X25519,9,&(lvalues[6703]),0}, +{"X448","X448",NID_X448,9,&(lvalues[6712]),0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2790,10 +2786,6 @@ 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" */ @@ -2922,6 +2914,8 @@ static const unsigned int sn_objs[NUM_SN]={ 1021, /* "TLS1-PRF" */ 458, /* "UID" */ 0, /* "UNDEF" */ +1034, /* "X25519" */ +1035, /* "X448" */ 11, /* "X500" */ 378, /* "X500algorithms" */ 12, /* "X509" */ @@ -3762,10 +3756,6 @@ 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" */ @@ -3889,6 +3879,8 @@ static const unsigned int ln_objs[NUM_LN]={ 129, /* "TLS Web Server Authentication" */ 133, /* "Time Stamping" */ 375, /* "Trust Root" */ +1034, /* "X25519" */ +1035, /* "X448" */ 12, /* "X509" */ 402, /* "X509v3 AC Targeting" */ 746, /* "X509v3 Any Policy" */ @@ -5480,10 +5472,8 @@ 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 */ +1034, /* OBJ_X25519 1 3 6 1 4 1 11591 15 1 */ +1035, /* OBJ_X448 1 3 6 1 4 1 11591 15 2 */ 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 a9a9e3d16d..e981a057ce 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1031,7 +1031,5 @@ sendProxiedOwner 1030 id_pkinit 1031 pkInitClientAuth 1032 pkInitKDC 1033 -Curve25519 1034 -Curve448 1035 -Curve25519ph 1036 -Curve448ph 1037 +X25519 1034 +X448 1035 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 645591bc14..14e68e384c 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1451,7 +1451,5 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response # New curves from draft-josefsson-pkix-newcurves -1 3 6 1 4 1 11591 15 1 : Curve25519 -1 3 6 1 4 1 11591 15 2 : Curve448 -1 3 6 1 4 1 11591 15 3 : Curve25519ph -1 3 6 1 4 1 11591 15 4 : Curve448ph +1 3 6 1 4 1 11591 15 1 : X25519 +1 3 6 1 4 1 11591 15 2 : X448 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index aa640b03e5..b58c44db73 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -4525,18 +4525,10 @@ #define NID_pkInitKDC 1033 #define OBJ_pkInitKDC OBJ_id_pkinit,5L -#define SN_Curve25519 "Curve25519" -#define NID_Curve25519 1034 -#define OBJ_Curve25519 1L,3L,6L,1L,4L,1L,11591L,15L,1L +#define SN_X25519 "X25519" +#define NID_X25519 1034 +#define OBJ_X25519 1L,3L,6L,1L,4L,1L,11591L,15L,1L -#define SN_Curve448 "Curve448" -#define NID_Curve448 1035 -#define OBJ_Curve448 1L,3L,6L,1L,4L,1L,11591L,15L,2L - -#define SN_Curve25519ph "Curve25519ph" -#define NID_Curve25519ph 1036 -#define OBJ_Curve25519ph 1L,3L,6L,1L,4L,1L,11591L,15L,3L - -#define SN_Curve448ph "Curve448ph" -#define NID_Curve448ph 1037 -#define OBJ_Curve448ph 1L,3L,6L,1L,4L,1L,11591L,15L,4L +#define SN_X448 "X448" +#define NID_X448 1035 +#define OBJ_X448 1L,3L,6L,1L,4L,1L,11591L,15L,2L -- 2.34.1