Add new OID to pSpecified from PKCS#1

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 241d4e148cf72ec831515a84e677e177805d2c73..db446795885449635628e6b0a228938aeafc0e96 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 938
-#define NUM_SN 931
-#define NUM_LN 931
-#define NUM_OBJ 872
+#define NUM_NID 939
+#define NUM_SN 932
+#define NUM_LN 932
+#define NUM_OBJ 873
 
-static const unsigned char lvalues[6113]={
+static const unsigned char lvalues[6122]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -940,6 +940,7 @@ static const unsigned char lvalues[6113]={
 0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0C,/* [6085] OBJ_brainpoolP384t1 */
 0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0D,/* [6094] OBJ_brainpoolP512r1 */
 0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0E,/* [6103] OBJ_brainpoolP512t1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x09,/* [6112] OBJ_pSpecified */
 };
 
 static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2456,6 +2457,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
        NID_aes_192_cbc_hmac_sha256,0,NULL,0},
 {"AES-256-CBC-HMAC-SHA256","aes-256-cbc-hmac-sha256",
        NID_aes_256_cbc_hmac_sha256,0,NULL,0},
+{"PSPECIFIED","pSpecified",NID_pSpecified,9,&(lvalues[6112]),0},
 };
 
 static const unsigned int sn_objs[NUM_SN]={
@@ -2597,6 +2599,7 @@ static const unsigned int sn_objs[NUM_SN]={
 69,    /* "PBKDF2" */
 162,   /* "PBMAC1" */
 127,   /* "PKIX" */
+938,   /* "PSPECIFIED" */
 98,    /* "RC2-40-CBC" */
 166,   /* "RC2-64-CBC" */
 37,    /* "RC2-CBC" */
@@ -4010,6 +4013,7 @@ static const unsigned int ln_objs[NUM_LN]={
 18,    /* "organizationalUnitName" */
 475,   /* "otherMailbox" */
 876,   /* "owner" */
+938,   /* "pSpecified" */
 489,   /* "pagerTelephoneNumber" */
 782,   /* "password based MAC" */
 374,   /* "path" */
@@ -4919,6 +4923,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
 644,   /* OBJ_rsaOAEPEncryptionSET         1 2 840 113549 1 1 6 */
 919,   /* OBJ_rsaesOaep                    1 2 840 113549 1 1 7 */
 911,   /* OBJ_mgf1                         1 2 840 113549 1 1 8 */
+938,   /* OBJ_pSpecified                   1 2 840 113549 1 1 9 */
 912,   /* OBJ_rsassaPss                    1 2 840 113549 1 1 10 */
 668,   /* OBJ_sha256WithRSAEncryption      1 2 840 113549 1 1 11 */
 669,   /* OBJ_sha384WithRSAEncryption      1 2 840 113549 1 1 12 */

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 68063777d84319aa0379c69281b23aa99c8c6cde..e7c9c40a2859df67cf25524c8330c7d89cc90021 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -590,6 +590,11 @@
 #define NID_mgf1               911
 #define OBJ_mgf1               OBJ_pkcs1,8L
 
+#define SN_pSpecified          "PSPECIFIED"
+#define LN_pSpecified          "pSpecified"
+#define NID_pSpecified         938
+#define OBJ_pSpecified         OBJ_pkcs1,9L
+
 #define SN_rsassaPss           "RSASSA-PSS"
 #define LN_rsassaPss           "rsassaPss"
 #define NID_rsassaPss          912

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 181532424d85a7d79378b4e1508e593dc834c687..dc1febe85f488ffcd5fd9348b5173a4d0aaa4492 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -935,3 +935,4 @@ brainpoolP512t1             934
 aes_128_cbc_hmac_sha256                935
 aes_192_cbc_hmac_sha256                936
 aes_256_cbc_hmac_sha256                937
+pSpecified             938

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 1868446392f14171f3777033ce04edea49103631..72ad29738b1aa253b3a77025ef29bf50fc304b53 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -168,6 +168,7 @@ pkcs1 5                     : RSA-SHA1              : sha1WithRSAEncryption
 # According to PKCS #1 version 2.1
 pkcs1 7                        : RSAES-OAEP            : rsaesOaep
 pkcs1 8                        : MGF1                  : mgf1
+pkcs1 9                        : PSPECIFIED            : pSpecified
 pkcs1 10               : RSASSA-PSS            : rsassaPss
 
 pkcs1 11               : RSA-SHA256            : sha256WithRSAEncryption