From 74c68e5e379d5a6391c587eee2cc5d4ee520d189 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 4 Dec 2014 16:03:21 -0500 Subject: [PATCH] Renegerate OID outputs. The files should round-trip now. This corrects some discrepancies between obj_mac.h and obj_mac.num which were also present in upstream. There seems to be a mismerge in upstream's eebd5e5dd7dff58297ea52e1c21df8fccd593965. (The discrepancy is harmless; those OIDs are not in obj_xref.txt.) Change-Id: I1f6cda016533ec3182750310f9936f7e072b54a0 Reviewed-on: https://boringssl-review.googlesource.com/2474 Reviewed-by: Adam Langley --- crypto/obj/obj_dat.h | 75 +++++++++++++++++++-------------------- crypto/obj/obj_xref.h | 4 ++- include/openssl/obj_mac.h | 29 +++++++-------- 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/crypto/obj/obj_dat.h b/crypto/obj/obj_dat.h index 18bcec13..2584d87b 100644 --- a/crypto/obj/obj_dat.h +++ b/crypto/obj/obj_dat.h @@ -1,6 +1,6 @@ /* THIS FILE IS GENERATED FROM objects.h by obj_dat.pl via the * following command: - * perl obj_dat.pl obj_mac.h obj_dat.h */ + * perl obj_dat.pl ../../include/openssl/obj_mac.h obj_dat.h */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -58,7 +58,7 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ -#define NUM_NID 951 +#define NUM_NID 948 #define NUM_SN 941 #define NUM_LN 941 #define NUM_OBJ 883 @@ -2451,9 +2451,6 @@ static const ASN1_OBJECT kObjects[NUM_NID]={ {"brainpoolP512t1","brainpoolP512t1",NID_brainpoolP512t1,9, &(lvalues[6097]),0}, {"PSPECIFIED","pSpecified",NID_pSpecified,9,&(lvalues[6106]),0}, -{NULL,NULL,NID_undef,0,NULL,0}, -{NULL,NULL,NID_undef,0,NULL,0}, -{NULL,NULL,NID_undef,0,NULL,0}, {"dhSinglePass-stdDH-sha1kdf-scheme", "dhSinglePass-stdDH-sha1kdf-scheme", NID_dhSinglePass_stdDH_sha1kdf_scheme,9,&(lvalues[6115]),0}, @@ -2769,19 +2766,19 @@ static const unsigned int kNIDsInShortNameOrder[NUM_SN]={ 891, /* "deltaRevocationList" */ 107, /* "description" */ 871, /* "destinationIndicator" */ -950, /* "dh-cofactor-kdf" */ -949, /* "dh-std-kdf" */ +947, /* "dh-cofactor-kdf" */ +946, /* "dh-std-kdf" */ 28, /* "dhKeyAgreement" */ -944, /* "dhSinglePass-cofactorDH-sha1kdf-scheme" */ -945, /* "dhSinglePass-cofactorDH-sha224kdf-scheme" */ -946, /* "dhSinglePass-cofactorDH-sha256kdf-scheme" */ -947, /* "dhSinglePass-cofactorDH-sha384kdf-scheme" */ -948, /* "dhSinglePass-cofactorDH-sha512kdf-scheme" */ -939, /* "dhSinglePass-stdDH-sha1kdf-scheme" */ -940, /* "dhSinglePass-stdDH-sha224kdf-scheme" */ -941, /* "dhSinglePass-stdDH-sha256kdf-scheme" */ -942, /* "dhSinglePass-stdDH-sha384kdf-scheme" */ -943, /* "dhSinglePass-stdDH-sha512kdf-scheme" */ +941, /* "dhSinglePass-cofactorDH-sha1kdf-scheme" */ +942, /* "dhSinglePass-cofactorDH-sha224kdf-scheme" */ +943, /* "dhSinglePass-cofactorDH-sha256kdf-scheme" */ +944, /* "dhSinglePass-cofactorDH-sha384kdf-scheme" */ +945, /* "dhSinglePass-cofactorDH-sha512kdf-scheme" */ +936, /* "dhSinglePass-stdDH-sha1kdf-scheme" */ +937, /* "dhSinglePass-stdDH-sha224kdf-scheme" */ +938, /* "dhSinglePass-stdDH-sha256kdf-scheme" */ +939, /* "dhSinglePass-stdDH-sha384kdf-scheme" */ +940, /* "dhSinglePass-stdDH-sha512kdf-scheme" */ 920, /* "dhpublicnumber" */ 382, /* "directory" */ 887, /* "distinguishedName" */ @@ -3723,19 +3720,19 @@ static const unsigned int kNIDsInLongNameOrder[NUM_LN]={ 107, /* "description" */ 871, /* "destinationIndicator" */ 80, /* "desx-cbc" */ -950, /* "dh-cofactor-kdf" */ -949, /* "dh-std-kdf" */ +947, /* "dh-cofactor-kdf" */ +946, /* "dh-std-kdf" */ 28, /* "dhKeyAgreement" */ -944, /* "dhSinglePass-cofactorDH-sha1kdf-scheme" */ -945, /* "dhSinglePass-cofactorDH-sha224kdf-scheme" */ -946, /* "dhSinglePass-cofactorDH-sha256kdf-scheme" */ -947, /* "dhSinglePass-cofactorDH-sha384kdf-scheme" */ -948, /* "dhSinglePass-cofactorDH-sha512kdf-scheme" */ -939, /* "dhSinglePass-stdDH-sha1kdf-scheme" */ -940, /* "dhSinglePass-stdDH-sha224kdf-scheme" */ -941, /* "dhSinglePass-stdDH-sha256kdf-scheme" */ -942, /* "dhSinglePass-stdDH-sha384kdf-scheme" */ -943, /* "dhSinglePass-stdDH-sha512kdf-scheme" */ +941, /* "dhSinglePass-cofactorDH-sha1kdf-scheme" */ +942, /* "dhSinglePass-cofactorDH-sha224kdf-scheme" */ +943, /* "dhSinglePass-cofactorDH-sha256kdf-scheme" */ +944, /* "dhSinglePass-cofactorDH-sha384kdf-scheme" */ +945, /* "dhSinglePass-cofactorDH-sha512kdf-scheme" */ +936, /* "dhSinglePass-stdDH-sha1kdf-scheme" */ +937, /* "dhSinglePass-stdDH-sha224kdf-scheme" */ +938, /* "dhSinglePass-stdDH-sha256kdf-scheme" */ +939, /* "dhSinglePass-stdDH-sha384kdf-scheme" */ +940, /* "dhSinglePass-stdDH-sha512kdf-scheme" */ 11, /* "directory services (X.500)" */ 378, /* "directory services - algorithms" */ 887, /* "distinguishedName" */ @@ -4703,14 +4700,14 @@ static const unsigned int kNIDsInOIDOrder[NUM_OBJ]={ 505, /* OBJ_mime_mhs_headings 1 3 6 1 7 1 1 */ 506, /* OBJ_mime_mhs_bodies 1 3 6 1 7 1 2 */ 119, /* OBJ_ripemd160WithRSA 1 3 36 3 3 1 2 */ -940, /* OBJ_dhSinglePass_stdDH_sha224kdf_scheme 1 3 132 1 11 0 */ -941, /* OBJ_dhSinglePass_stdDH_sha256kdf_scheme 1 3 132 1 11 1 */ -942, /* OBJ_dhSinglePass_stdDH_sha384kdf_scheme 1 3 132 1 11 2 */ -943, /* OBJ_dhSinglePass_stdDH_sha512kdf_scheme 1 3 132 1 11 3 */ -945, /* OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme 1 3 132 1 14 0 */ -946, /* OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme 1 3 132 1 14 1 */ -947, /* OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme 1 3 132 1 14 2 */ -948, /* OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme 1 3 132 1 14 3 */ +937, /* OBJ_dhSinglePass_stdDH_sha224kdf_scheme 1 3 132 1 11 0 */ +938, /* OBJ_dhSinglePass_stdDH_sha256kdf_scheme 1 3 132 1 11 1 */ +939, /* OBJ_dhSinglePass_stdDH_sha384kdf_scheme 1 3 132 1 11 2 */ +940, /* OBJ_dhSinglePass_stdDH_sha512kdf_scheme 1 3 132 1 11 3 */ +942, /* OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme 1 3 132 1 14 0 */ +943, /* OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme 1 3 132 1 14 1 */ +944, /* OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme 1 3 132 1 14 2 */ +945, /* OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme 1 3 132 1 14 3 */ 631, /* OBJ_setAttr_GenCryptgrm 2 23 42 3 3 3 1 */ 632, /* OBJ_setAttr_T2Enc 2 23 42 3 3 4 1 */ 633, /* OBJ_setAttr_T2cleartxt 2 23 42 3 3 4 2 */ @@ -5053,8 +5050,8 @@ static const unsigned int kNIDsInOIDOrder[NUM_OBJ]={ 932, /* OBJ_brainpoolP384t1 1 3 36 3 3 2 8 1 1 12 */ 933, /* OBJ_brainpoolP512r1 1 3 36 3 3 2 8 1 1 13 */ 934, /* OBJ_brainpoolP512t1 1 3 36 3 3 2 8 1 1 14 */ -939, /* OBJ_dhSinglePass_stdDH_sha1kdf_scheme 1 3 133 16 840 63 0 2 */ -944, /* OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme 1 3 133 16 840 63 0 3 */ +936, /* OBJ_dhSinglePass_stdDH_sha1kdf_scheme 1 3 133 16 840 63 0 2 */ +941, /* OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme 1 3 133 16 840 63 0 3 */ 418, /* OBJ_aes_128_ecb 2 16 840 1 101 3 4 1 1 */ 419, /* OBJ_aes_128_cbc 2 16 840 1 101 3 4 1 2 */ 420, /* OBJ_aes_128_ofb128 2 16 840 1 101 3 4 1 3 */ diff --git a/crypto/obj/obj_xref.h b/crypto/obj/obj_xref.h index 433c96bb..b2082f55 100644 --- a/crypto/obj/obj_xref.h +++ b/crypto/obj/obj_xref.h @@ -1,4 +1,6 @@ -/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */ +/* THIS FILE IS GENERATED FROM obj_xref.txt by obj_xref.pl via the + * following command: + * perl obj_xref.pl obj_mac.num obj_xref.txt > obj_xref.h */ typedef struct { diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index b5ad56df..b028c005 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -1,9 +1,6 @@ -/* crypto/objects/obj_mac.h */ - /* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the * following command: - * perl objects.pl objects.txt obj_mac.num obj_mac.h - */ + * perl objects.pl objects.txt obj_mac.num ../../include/openssl/obj_mac.h */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -4101,48 +4098,48 @@ #define OBJ_secg_scheme OBJ_certicom_arc,1L #define SN_dhSinglePass_stdDH_sha1kdf_scheme "dhSinglePass-stdDH-sha1kdf-scheme" -#define NID_dhSinglePass_stdDH_sha1kdf_scheme 939 +#define NID_dhSinglePass_stdDH_sha1kdf_scheme 936 #define OBJ_dhSinglePass_stdDH_sha1kdf_scheme OBJ_x9_63_scheme,2L #define SN_dhSinglePass_stdDH_sha224kdf_scheme "dhSinglePass-stdDH-sha224kdf-scheme" -#define NID_dhSinglePass_stdDH_sha224kdf_scheme 940 +#define NID_dhSinglePass_stdDH_sha224kdf_scheme 937 #define OBJ_dhSinglePass_stdDH_sha224kdf_scheme OBJ_secg_scheme,11L,0L #define SN_dhSinglePass_stdDH_sha256kdf_scheme "dhSinglePass-stdDH-sha256kdf-scheme" -#define NID_dhSinglePass_stdDH_sha256kdf_scheme 941 +#define NID_dhSinglePass_stdDH_sha256kdf_scheme 938 #define OBJ_dhSinglePass_stdDH_sha256kdf_scheme OBJ_secg_scheme,11L,1L #define SN_dhSinglePass_stdDH_sha384kdf_scheme "dhSinglePass-stdDH-sha384kdf-scheme" -#define NID_dhSinglePass_stdDH_sha384kdf_scheme 942 +#define NID_dhSinglePass_stdDH_sha384kdf_scheme 939 #define OBJ_dhSinglePass_stdDH_sha384kdf_scheme OBJ_secg_scheme,11L,2L #define SN_dhSinglePass_stdDH_sha512kdf_scheme "dhSinglePass-stdDH-sha512kdf-scheme" -#define NID_dhSinglePass_stdDH_sha512kdf_scheme 943 +#define NID_dhSinglePass_stdDH_sha512kdf_scheme 940 #define OBJ_dhSinglePass_stdDH_sha512kdf_scheme OBJ_secg_scheme,11L,3L #define SN_dhSinglePass_cofactorDH_sha1kdf_scheme "dhSinglePass-cofactorDH-sha1kdf-scheme" -#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme 944 +#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme 941 #define OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme OBJ_x9_63_scheme,3L #define SN_dhSinglePass_cofactorDH_sha224kdf_scheme "dhSinglePass-cofactorDH-sha224kdf-scheme" -#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme 945 +#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme 942 #define OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme OBJ_secg_scheme,14L,0L #define SN_dhSinglePass_cofactorDH_sha256kdf_scheme "dhSinglePass-cofactorDH-sha256kdf-scheme" -#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme 946 +#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme 943 #define OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme OBJ_secg_scheme,14L,1L #define SN_dhSinglePass_cofactorDH_sha384kdf_scheme "dhSinglePass-cofactorDH-sha384kdf-scheme" -#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme 947 +#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme 944 #define OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme OBJ_secg_scheme,14L,2L #define SN_dhSinglePass_cofactorDH_sha512kdf_scheme "dhSinglePass-cofactorDH-sha512kdf-scheme" -#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme 948 +#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme 945 #define OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme OBJ_secg_scheme,14L,3L #define SN_dh_std_kdf "dh-std-kdf" -#define NID_dh_std_kdf 949 +#define NID_dh_std_kdf 946 #define SN_dh_cofactor_kdf "dh-cofactor-kdf" -#define NID_dh_cofactor_kdf 950 +#define NID_dh_cofactor_kdf 947