objects/objects.txt: fix RSA-SHA3-284 typo.
authorAndy Polyakov <appro@openssl.org>
Sun, 10 Sep 2017 19:38:32 +0000 (21:38 +0200)
committerAndy Polyakov <appro@openssl.org>
Mon, 11 Sep 2017 20:17:02 +0000 (22:17 +0200)
Reviewed-by: Richard Levitte <levitte@openssl.org>
crypto/objects/obj_dat.h
crypto/objects/obj_mac.num
crypto/objects/objects.txt
include/openssl/obj_mac.h

index 4c3c9d5..7f7b57f 100644 (file)
@@ -1008,7 +1008,7 @@ static const unsigned char so[7222] = {
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x0C,  /* [ 7122] OBJ_ecdsa_with_SHA3_512 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x0D,  /* [ 7131] OBJ_RSA_SHA3_224 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x0E,  /* [ 7140] OBJ_RSA_SHA3_256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x0F,  /* [ 7149] OBJ_RSA_SHA3_284 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x0F,  /* [ 7149] OBJ_RSA_SHA3_384 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x10,  /* [ 7158] OBJ_RSA_SHA3_512 */
     0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x25,  /* [ 7167] OBJ_aria_128_ccm */
     0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x26,  /* [ 7176] OBJ_aria_192_ccm */
@@ -2138,7 +2138,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"id-ecdsa-with-sha3-512", "ecdsa_with_SHA3-512", NID_ecdsa_with_SHA3_512, 9, &so[7122]},
     {"id-rsassa-pkcs1-v1_5-with-sha3-224", "RSA-SHA3-224", NID_RSA_SHA3_224, 9, &so[7131]},
     {"id-rsassa-pkcs1-v1_5-with-sha3-256", "RSA-SHA3-256", NID_RSA_SHA3_256, 9, &so[7140]},
-    {"id-rsassa-pkcs1-v1_5-with-sha3-384", "RSA-SHA3-284", NID_RSA_SHA3_284, 9, &so[7149]},
+    {"id-rsassa-pkcs1-v1_5-with-sha3-384", "RSA-SHA3-384", NID_RSA_SHA3_384, 9, &so[7149]},
     {"id-rsassa-pkcs1-v1_5-with-sha3-512", "RSA-SHA3-512", NID_RSA_SHA3_512, 9, &so[7158]},
     {"ARIA-128-CCM", "aria-128-ccm", NID_aria_128_ccm, 9, &so[7167]},
     {"ARIA-192-CCM", "aria-192-ccm", NID_aria_192_ccm, 9, &so[7176]},
@@ -3393,7 +3393,7 @@ static const unsigned int ln_objs[NUM_LN] = {
        2,    /* "RSA Data Security, Inc. PKCS" */
     1116,    /* "RSA-SHA3-224" */
     1117,    /* "RSA-SHA3-256" */
-    1118,    /* "RSA-SHA3-284" */
+    1118,    /* "RSA-SHA3-384" */
     1119,    /* "RSA-SHA3-512" */
      188,    /* "S/MIME" */
      167,    /* "S/MIME Capabilities" */
@@ -5212,7 +5212,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1115,    /* OBJ_ecdsa_with_SHA3_512          2 16 840 1 101 3 4 3 12 */
     1116,    /* OBJ_RSA_SHA3_224                 2 16 840 1 101 3 4 3 13 */
     1117,    /* OBJ_RSA_SHA3_256                 2 16 840 1 101 3 4 3 14 */
-    1118,    /* OBJ_RSA_SHA3_284                 2 16 840 1 101 3 4 3 15 */
+    1118,    /* OBJ_RSA_SHA3_384                 2 16 840 1 101 3 4 3 15 */
     1119,    /* OBJ_RSA_SHA3_512                 2 16 840 1 101 3 4 3 16 */
       71,    /* OBJ_netscape_cert_type           2 16 840 1 113730 1 1 */
       72,    /* OBJ_netscape_base_url            2 16 840 1 113730 1 2 */
index b0b3d4d..84208ef 100644 (file)
@@ -1115,7 +1115,7 @@ ecdsa_with_SHA3_384               1114
 ecdsa_with_SHA3_512            1115
 RSA_SHA3_224           1116
 RSA_SHA3_256           1117
-RSA_SHA3_284           1118
+RSA_SHA3_384           1118
 RSA_SHA3_512           1119
 aria_128_ccm           1120
 aria_192_ccm           1121
index 185a7a7..841e9ab 100644 (file)
@@ -974,7 +974,7 @@ sigAlgs 11  : id-ecdsa-with-sha3-384        : ecdsa_with_SHA3-384
 sigAlgs 12     : id-ecdsa-with-sha3-512        : ecdsa_with_SHA3-512
 sigAlgs 13     : id-rsassa-pkcs1-v1_5-with-sha3-224    : RSA-SHA3-224
 sigAlgs 14     : id-rsassa-pkcs1-v1_5-with-sha3-256    : RSA-SHA3-256
-sigAlgs 15     : id-rsassa-pkcs1-v1_5-with-sha3-384    : RSA-SHA3-284
+sigAlgs 15     : id-rsassa-pkcs1-v1_5-with-sha3-384    : RSA-SHA3-384
 sigAlgs 16     : id-rsassa-pkcs1-v1_5-with-sha3-512    : RSA-SHA3-512
 
 # Hold instruction CRL entry extension
index d4f1a5c..d028af9 100644 (file)
 #define NID_RSA_SHA3_256                1117
 #define OBJ_RSA_SHA3_256                OBJ_sigAlgs,14L
 
-#define SN_RSA_SHA3_284         "id-rsassa-pkcs1-v1_5-with-sha3-384"
-#define LN_RSA_SHA3_284         "RSA-SHA3-284"
-#define NID_RSA_SHA3_284                1118
-#define OBJ_RSA_SHA3_284                OBJ_sigAlgs,15L
+#define SN_RSA_SHA3_384         "id-rsassa-pkcs1-v1_5-with-sha3-384"
+#define LN_RSA_SHA3_384         "RSA-SHA3-384"
+#define NID_RSA_SHA3_384                1118
+#define OBJ_RSA_SHA3_384                OBJ_sigAlgs,15L
 
 #define SN_RSA_SHA3_512         "id-rsassa-pkcs1-v1_5-with-sha3-512"
 #define LN_RSA_SHA3_512         "RSA-SHA3-512"