Update OpenSSL to version 1.0.2g
This commit is contained in:
mrezai
@@ -62,12 +62,12 @@
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
#define NUM_NID 920
|
||||
#define NUM_SN 913
|
||||
#define NUM_LN 913
|
||||
#define NUM_OBJ 857
|
||||
#define NUM_NID 958
|
||||
#define NUM_SN 951
|
||||
#define NUM_LN 951
|
||||
#define NUM_OBJ 890
|
||||
|
||||
static const unsigned char lvalues[5974]={
|
||||
static const unsigned char lvalues[6255]={
|
||||
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 */
|
||||
@@ -919,6 +919,39 @@ static const unsigned char lvalues[5974]={
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5946] OBJ_mgf1 */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5955] OBJ_rsassaPss */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5964] OBJ_rsaesOaep */
|
||||
0x2A,0x86,0x48,0xCE,0x3E,0x02,0x01, /* [5973] OBJ_dhpublicnumber */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x01,/* [5980] OBJ_brainpoolP160r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x02,/* [5989] OBJ_brainpoolP160t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x03,/* [5998] OBJ_brainpoolP192r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x04,/* [6007] OBJ_brainpoolP192t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x05,/* [6016] OBJ_brainpoolP224r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x06,/* [6025] OBJ_brainpoolP224t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x07,/* [6034] OBJ_brainpoolP256r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x08,/* [6043] OBJ_brainpoolP256t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x09,/* [6052] OBJ_brainpoolP320r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0A,/* [6061] OBJ_brainpoolP320t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0B,/* [6070] OBJ_brainpoolP384r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0C,/* [6079] OBJ_brainpoolP384t1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0D,/* [6088] OBJ_brainpoolP512r1 */
|
||||
0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0E,/* [6097] OBJ_brainpoolP512t1 */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x09,/* [6106] OBJ_pSpecified */
|
||||
0x2B,0x81,0x05,0x10,0x86,0x48,0x3F,0x00,0x02,/* [6115] OBJ_dhSinglePass_stdDH_sha1kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0B,0x00, /* [6124] OBJ_dhSinglePass_stdDH_sha224kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0B,0x01, /* [6130] OBJ_dhSinglePass_stdDH_sha256kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0B,0x02, /* [6136] OBJ_dhSinglePass_stdDH_sha384kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0B,0x03, /* [6142] OBJ_dhSinglePass_stdDH_sha512kdf_scheme */
|
||||
0x2B,0x81,0x05,0x10,0x86,0x48,0x3F,0x00,0x03,/* [6148] OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0E,0x00, /* [6157] OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0E,0x01, /* [6163] OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0E,0x02, /* [6169] OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme */
|
||||
0x2B,0x81,0x04,0x01,0x0E,0x03, /* [6175] OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme */
|
||||
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x02,/* [6181] OBJ_ct_precert_scts */
|
||||
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x03,/* [6191] OBJ_ct_precert_poison */
|
||||
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x04,/* [6201] OBJ_ct_precert_signer */
|
||||
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x05,/* [6211] OBJ_ct_cert_scts */
|
||||
0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x01,/* [6221] OBJ_jurisdictionLocalityName */
|
||||
0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x02,/* [6232] OBJ_jurisdictionStateOrProvinceName */
|
||||
0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x03,/* [6243] OBJ_jurisdictionCountryName */
|
||||
};
|
||||
|
||||
static const ASN1_OBJECT nid_objs[NUM_NID]={
|
||||
@@ -2399,12 +2432,95 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
|
||||
{"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
|
||||
NID_aes_256_cbc_hmac_sha1,0,NULL,0},
|
||||
{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5964]),0},
|
||||
{"dhpublicnumber","X9.42 DH",NID_dhpublicnumber,7,&(lvalues[5973]),0},
|
||||
{"brainpoolP160r1","brainpoolP160r1",NID_brainpoolP160r1,9,
|
||||
&(lvalues[5980]),0},
|
||||
{"brainpoolP160t1","brainpoolP160t1",NID_brainpoolP160t1,9,
|
||||
&(lvalues[5989]),0},
|
||||
{"brainpoolP192r1","brainpoolP192r1",NID_brainpoolP192r1,9,
|
||||
&(lvalues[5998]),0},
|
||||
{"brainpoolP192t1","brainpoolP192t1",NID_brainpoolP192t1,9,
|
||||
&(lvalues[6007]),0},
|
||||
{"brainpoolP224r1","brainpoolP224r1",NID_brainpoolP224r1,9,
|
||||
&(lvalues[6016]),0},
|
||||
{"brainpoolP224t1","brainpoolP224t1",NID_brainpoolP224t1,9,
|
||||
&(lvalues[6025]),0},
|
||||
{"brainpoolP256r1","brainpoolP256r1",NID_brainpoolP256r1,9,
|
||||
&(lvalues[6034]),0},
|
||||
{"brainpoolP256t1","brainpoolP256t1",NID_brainpoolP256t1,9,
|
||||
&(lvalues[6043]),0},
|
||||
{"brainpoolP320r1","brainpoolP320r1",NID_brainpoolP320r1,9,
|
||||
&(lvalues[6052]),0},
|
||||
{"brainpoolP320t1","brainpoolP320t1",NID_brainpoolP320t1,9,
|
||||
&(lvalues[6061]),0},
|
||||
{"brainpoolP384r1","brainpoolP384r1",NID_brainpoolP384r1,9,
|
||||
&(lvalues[6070]),0},
|
||||
{"brainpoolP384t1","brainpoolP384t1",NID_brainpoolP384t1,9,
|
||||
&(lvalues[6079]),0},
|
||||
{"brainpoolP512r1","brainpoolP512r1",NID_brainpoolP512r1,9,
|
||||
&(lvalues[6088]),0},
|
||||
{"brainpoolP512t1","brainpoolP512t1",NID_brainpoolP512t1,9,
|
||||
&(lvalues[6097]),0},
|
||||
{"PSPECIFIED","pSpecified",NID_pSpecified,9,&(lvalues[6106]),0},
|
||||
{"dhSinglePass-stdDH-sha1kdf-scheme",
|
||||
"dhSinglePass-stdDH-sha1kdf-scheme",
|
||||
NID_dhSinglePass_stdDH_sha1kdf_scheme,9,&(lvalues[6115]),0},
|
||||
{"dhSinglePass-stdDH-sha224kdf-scheme",
|
||||
"dhSinglePass-stdDH-sha224kdf-scheme",
|
||||
NID_dhSinglePass_stdDH_sha224kdf_scheme,6,&(lvalues[6124]),0},
|
||||
{"dhSinglePass-stdDH-sha256kdf-scheme",
|
||||
"dhSinglePass-stdDH-sha256kdf-scheme",
|
||||
NID_dhSinglePass_stdDH_sha256kdf_scheme,6,&(lvalues[6130]),0},
|
||||
{"dhSinglePass-stdDH-sha384kdf-scheme",
|
||||
"dhSinglePass-stdDH-sha384kdf-scheme",
|
||||
NID_dhSinglePass_stdDH_sha384kdf_scheme,6,&(lvalues[6136]),0},
|
||||
{"dhSinglePass-stdDH-sha512kdf-scheme",
|
||||
"dhSinglePass-stdDH-sha512kdf-scheme",
|
||||
NID_dhSinglePass_stdDH_sha512kdf_scheme,6,&(lvalues[6142]),0},
|
||||
{"dhSinglePass-cofactorDH-sha1kdf-scheme",
|
||||
"dhSinglePass-cofactorDH-sha1kdf-scheme",
|
||||
NID_dhSinglePass_cofactorDH_sha1kdf_scheme,9,&(lvalues[6148]),0},
|
||||
{"dhSinglePass-cofactorDH-sha224kdf-scheme",
|
||||
"dhSinglePass-cofactorDH-sha224kdf-scheme",
|
||||
NID_dhSinglePass_cofactorDH_sha224kdf_scheme,6,&(lvalues[6157]),0},
|
||||
{"dhSinglePass-cofactorDH-sha256kdf-scheme",
|
||||
"dhSinglePass-cofactorDH-sha256kdf-scheme",
|
||||
NID_dhSinglePass_cofactorDH_sha256kdf_scheme,6,&(lvalues[6163]),0},
|
||||
{"dhSinglePass-cofactorDH-sha384kdf-scheme",
|
||||
"dhSinglePass-cofactorDH-sha384kdf-scheme",
|
||||
NID_dhSinglePass_cofactorDH_sha384kdf_scheme,6,&(lvalues[6169]),0},
|
||||
{"dhSinglePass-cofactorDH-sha512kdf-scheme",
|
||||
"dhSinglePass-cofactorDH-sha512kdf-scheme",
|
||||
NID_dhSinglePass_cofactorDH_sha512kdf_scheme,6,&(lvalues[6175]),0},
|
||||
{"dh-std-kdf","dh-std-kdf",NID_dh_std_kdf,0,NULL,0},
|
||||
{"dh-cofactor-kdf","dh-cofactor-kdf",NID_dh_cofactor_kdf,0,NULL,0},
|
||||
{"AES-128-CBC-HMAC-SHA256","aes-128-cbc-hmac-sha256",
|
||||
NID_aes_128_cbc_hmac_sha256,0,NULL,0},
|
||||
{"AES-192-CBC-HMAC-SHA256","aes-192-cbc-hmac-sha256",
|
||||
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},
|
||||
{"ct_precert_scts","CT Precertificate SCTs",NID_ct_precert_scts,10,
|
||||
&(lvalues[6181]),0},
|
||||
{"ct_precert_poison","CT Precertificate Poison",NID_ct_precert_poison,
|
||||
10,&(lvalues[6191]),0},
|
||||
{"ct_precert_signer","CT Precertificate Signer",NID_ct_precert_signer,
|
||||
10,&(lvalues[6201]),0},
|
||||
{"ct_cert_scts","CT Certificate SCTs",NID_ct_cert_scts,10,
|
||||
&(lvalues[6211]),0},
|
||||
{"jurisdictionL","jurisdictionLocalityName",
|
||||
NID_jurisdictionLocalityName,11,&(lvalues[6221]),0},
|
||||
{"jurisdictionST","jurisdictionStateOrProvinceName",
|
||||
NID_jurisdictionStateOrProvinceName,11,&(lvalues[6232]),0},
|
||||
{"jurisdictionC","jurisdictionCountryName",
|
||||
NID_jurisdictionCountryName,11,&(lvalues[6243]),0},
|
||||
};
|
||||
|
||||
static const unsigned int sn_objs[NUM_SN]={
|
||||
364, /* "AD_DVCS" */
|
||||
419, /* "AES-128-CBC" */
|
||||
916, /* "AES-128-CBC-HMAC-SHA1" */
|
||||
948, /* "AES-128-CBC-HMAC-SHA256" */
|
||||
421, /* "AES-128-CFB" */
|
||||
650, /* "AES-128-CFB1" */
|
||||
653, /* "AES-128-CFB8" */
|
||||
@@ -2414,6 +2530,7 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
913, /* "AES-128-XTS" */
|
||||
423, /* "AES-192-CBC" */
|
||||
917, /* "AES-192-CBC-HMAC-SHA1" */
|
||||
949, /* "AES-192-CBC-HMAC-SHA256" */
|
||||
425, /* "AES-192-CFB" */
|
||||
651, /* "AES-192-CFB1" */
|
||||
654, /* "AES-192-CFB8" */
|
||||
@@ -2422,6 +2539,7 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
424, /* "AES-192-OFB" */
|
||||
427, /* "AES-256-CBC" */
|
||||
918, /* "AES-256-CBC-HMAC-SHA1" */
|
||||
950, /* "AES-256-CBC-HMAC-SHA256" */
|
||||
429, /* "AES-256-CFB" */
|
||||
652, /* "AES-256-CFB1" */
|
||||
655, /* "AES-256-CFB8" */
|
||||
@@ -2537,6 +2655,7 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
69, /* "PBKDF2" */
|
||||
162, /* "PBMAC1" */
|
||||
127, /* "PKIX" */
|
||||
935, /* "PSPECIFIED" */
|
||||
98, /* "RC2-40-CBC" */
|
||||
166, /* "RC2-64-CBC" */
|
||||
37, /* "RC2-CBC" */
|
||||
@@ -2613,6 +2732,20 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
87, /* "basicConstraints" */
|
||||
365, /* "basicOCSPResponse" */
|
||||
285, /* "biometricInfo" */
|
||||
921, /* "brainpoolP160r1" */
|
||||
922, /* "brainpoolP160t1" */
|
||||
923, /* "brainpoolP192r1" */
|
||||
924, /* "brainpoolP192t1" */
|
||||
925, /* "brainpoolP224r1" */
|
||||
926, /* "brainpoolP224t1" */
|
||||
927, /* "brainpoolP256r1" */
|
||||
928, /* "brainpoolP256t1" */
|
||||
929, /* "brainpoolP320r1" */
|
||||
930, /* "brainpoolP320t1" */
|
||||
931, /* "brainpoolP384r1" */
|
||||
932, /* "brainpoolP384t1" */
|
||||
933, /* "brainpoolP512r1" */
|
||||
934, /* "brainpoolP512t1" */
|
||||
494, /* "buildingName" */
|
||||
860, /* "businessCategory" */
|
||||
691, /* "c2onb191v4" */
|
||||
@@ -2658,6 +2791,10 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
884, /* "crossCertificatePair" */
|
||||
806, /* "cryptocom" */
|
||||
805, /* "cryptopro" */
|
||||
954, /* "ct_cert_scts" */
|
||||
952, /* "ct_precert_poison" */
|
||||
951, /* "ct_precert_scts" */
|
||||
953, /* "ct_precert_signer" */
|
||||
500, /* "dITRedirect" */
|
||||
451, /* "dNSDomain" */
|
||||
495, /* "dSAQuality" */
|
||||
@@ -2667,7 +2804,20 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
891, /* "deltaRevocationList" */
|
||||
107, /* "description" */
|
||||
871, /* "destinationIndicator" */
|
||||
947, /* "dh-cofactor-kdf" */
|
||||
946, /* "dh-std-kdf" */
|
||||
28, /* "dhKeyAgreement" */
|
||||
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" */
|
||||
892, /* "dmdName" */
|
||||
@@ -2978,6 +3128,9 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
86, /* "issuerAltName" */
|
||||
770, /* "issuingDistributionPoint" */
|
||||
492, /* "janetMailbox" */
|
||||
957, /* "jurisdictionC" */
|
||||
955, /* "jurisdictionL" */
|
||||
956, /* "jurisdictionST" */
|
||||
150, /* "keyBag" */
|
||||
83, /* "keyUsage" */
|
||||
477, /* "lastModifiedBy" */
|
||||
@@ -3328,6 +3481,10 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
285, /* "Biometric Info" */
|
||||
179, /* "CA Issuers" */
|
||||
785, /* "CA Repository" */
|
||||
954, /* "CT Certificate SCTs" */
|
||||
952, /* "CT Precertificate Poison" */
|
||||
951, /* "CT Precertificate SCTs" */
|
||||
953, /* "CT Precertificate Signer" */
|
||||
131, /* "Code Signing" */
|
||||
783, /* "Diffie-Hellman based MAC" */
|
||||
382, /* "Directory" */
|
||||
@@ -3451,6 +3608,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
85, /* "X509v3 Subject Alternative Name" */
|
||||
769, /* "X509v3 Subject Directory Attributes" */
|
||||
82, /* "X509v3 Subject Key Identifier" */
|
||||
920, /* "X9.42 DH" */
|
||||
184, /* "X9.57" */
|
||||
185, /* "X9.57 CM ?" */
|
||||
478, /* "aRecord" */
|
||||
@@ -3463,6 +3621,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
606, /* "additional verification" */
|
||||
419, /* "aes-128-cbc" */
|
||||
916, /* "aes-128-cbc-hmac-sha1" */
|
||||
948, /* "aes-128-cbc-hmac-sha256" */
|
||||
896, /* "aes-128-ccm" */
|
||||
421, /* "aes-128-cfb" */
|
||||
650, /* "aes-128-cfb1" */
|
||||
@@ -3474,6 +3633,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
913, /* "aes-128-xts" */
|
||||
423, /* "aes-192-cbc" */
|
||||
917, /* "aes-192-cbc-hmac-sha1" */
|
||||
949, /* "aes-192-cbc-hmac-sha256" */
|
||||
899, /* "aes-192-ccm" */
|
||||
425, /* "aes-192-cfb" */
|
||||
651, /* "aes-192-cfb1" */
|
||||
@@ -3484,6 +3644,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
424, /* "aes-192-ofb" */
|
||||
427, /* "aes-256-cbc" */
|
||||
918, /* "aes-256-cbc-hmac-sha1" */
|
||||
950, /* "aes-256-cbc-hmac-sha256" */
|
||||
902, /* "aes-256-ccm" */
|
||||
429, /* "aes-256-cfb" */
|
||||
652, /* "aes-256-cfb1" */
|
||||
@@ -3502,6 +3663,20 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
93, /* "bf-cfb" */
|
||||
92, /* "bf-ecb" */
|
||||
94, /* "bf-ofb" */
|
||||
921, /* "brainpoolP160r1" */
|
||||
922, /* "brainpoolP160t1" */
|
||||
923, /* "brainpoolP192r1" */
|
||||
924, /* "brainpoolP192t1" */
|
||||
925, /* "brainpoolP224r1" */
|
||||
926, /* "brainpoolP224t1" */
|
||||
927, /* "brainpoolP256r1" */
|
||||
928, /* "brainpoolP256t1" */
|
||||
929, /* "brainpoolP320r1" */
|
||||
930, /* "brainpoolP320t1" */
|
||||
931, /* "brainpoolP384r1" */
|
||||
932, /* "brainpoolP384t1" */
|
||||
933, /* "brainpoolP512r1" */
|
||||
934, /* "brainpoolP512t1" */
|
||||
494, /* "buildingName" */
|
||||
860, /* "businessCategory" */
|
||||
691, /* "c2onb191v4" */
|
||||
@@ -3593,7 +3768,19 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
107, /* "description" */
|
||||
871, /* "destinationIndicator" */
|
||||
80, /* "desx-cbc" */
|
||||
947, /* "dh-cofactor-kdf" */
|
||||
946, /* "dh-std-kdf" */
|
||||
28, /* "dhKeyAgreement" */
|
||||
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" */
|
||||
@@ -3881,6 +4068,9 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
645, /* "itu-t" */
|
||||
492, /* "janetMailbox" */
|
||||
646, /* "joint-iso-itu-t" */
|
||||
957, /* "jurisdictionCountryName" */
|
||||
955, /* "jurisdictionLocalityName" */
|
||||
956, /* "jurisdictionStateOrProvinceName" */
|
||||
150, /* "keyBag" */
|
||||
773, /* "kisa" */
|
||||
477, /* "lastModifiedBy" */
|
||||
@@ -3917,6 +4107,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
18, /* "organizationalUnitName" */
|
||||
475, /* "otherMailbox" */
|
||||
876, /* "owner" */
|
||||
935, /* "pSpecified" */
|
||||
489, /* "pagerTelephoneNumber" */
|
||||
782, /* "password based MAC" */
|
||||
374, /* "path" */
|
||||
@@ -4560,6 +4751,14 @@ static const unsigned int obj_objs[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 */
|
||||
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 */
|
||||
@@ -4608,6 +4807,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
|
||||
416, /* OBJ_ecdsa_with_SHA1 1 2 840 10045 4 1 */
|
||||
791, /* OBJ_ecdsa_with_Recommended 1 2 840 10045 4 2 */
|
||||
792, /* OBJ_ecdsa_with_Specified 1 2 840 10045 4 3 */
|
||||
920, /* OBJ_dhpublicnumber 1 2 840 10046 2 1 */
|
||||
258, /* OBJ_id_pkix_mod 1 3 6 1 5 5 7 0 */
|
||||
175, /* OBJ_id_pe 1 3 6 1 5 5 7 1 */
|
||||
259, /* OBJ_id_qt 1 3 6 1 5 5 7 2 */
|
||||
@@ -4825,6 +5025,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 */
|
||||
935, /* 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 */
|
||||
@@ -4886,6 +5087,22 @@ static const unsigned int obj_objs[NUM_OBJ]={
|
||||
373, /* OBJ_id_pkix_OCSP_valid 1 3 6 1 5 5 7 48 1 9 */
|
||||
374, /* OBJ_id_pkix_OCSP_path 1 3 6 1 5 5 7 48 1 10 */
|
||||
375, /* OBJ_id_pkix_OCSP_trustRoot 1 3 6 1 5 5 7 48 1 11 */
|
||||
921, /* OBJ_brainpoolP160r1 1 3 36 3 3 2 8 1 1 1 */
|
||||
922, /* OBJ_brainpoolP160t1 1 3 36 3 3 2 8 1 1 2 */
|
||||
923, /* OBJ_brainpoolP192r1 1 3 36 3 3 2 8 1 1 3 */
|
||||
924, /* OBJ_brainpoolP192t1 1 3 36 3 3 2 8 1 1 4 */
|
||||
925, /* OBJ_brainpoolP224r1 1 3 36 3 3 2 8 1 1 5 */
|
||||
926, /* OBJ_brainpoolP224t1 1 3 36 3 3 2 8 1 1 6 */
|
||||
927, /* OBJ_brainpoolP256r1 1 3 36 3 3 2 8 1 1 7 */
|
||||
928, /* OBJ_brainpoolP256t1 1 3 36 3 3 2 8 1 1 8 */
|
||||
929, /* OBJ_brainpoolP320r1 1 3 36 3 3 2 8 1 1 9 */
|
||||
930, /* OBJ_brainpoolP320t1 1 3 36 3 3 2 8 1 1 10 */
|
||||
931, /* OBJ_brainpoolP384r1 1 3 36 3 3 2 8 1 1 11 */
|
||||
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 */
|
||||
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 */
|
||||
@@ -5013,6 +5230,10 @@ static const unsigned int obj_objs[NUM_OBJ]={
|
||||
138, /* OBJ_ms_efs 1 3 6 1 4 1 311 10 3 4 */
|
||||
648, /* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */
|
||||
649, /* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */
|
||||
951, /* OBJ_ct_precert_scts 1 3 6 1 4 1 11129 2 4 2 */
|
||||
952, /* OBJ_ct_precert_poison 1 3 6 1 4 1 11129 2 4 3 */
|
||||
953, /* OBJ_ct_precert_signer 1 3 6 1 4 1 11129 2 4 4 */
|
||||
954, /* OBJ_ct_cert_scts 1 3 6 1 4 1 11129 2 4 5 */
|
||||
751, /* OBJ_camellia_128_cbc 1 2 392 200011 61 1 1 1 2 */
|
||||
752, /* OBJ_camellia_192_cbc 1 2 392 200011 61 1 1 1 3 */
|
||||
753, /* OBJ_camellia_256_cbc 1 2 392 200011 61 1 1 1 4 */
|
||||
@@ -5091,5 +5312,8 @@ static const unsigned int obj_objs[NUM_OBJ]={
|
||||
154, /* OBJ_secretBag 1 2 840 113549 1 12 10 1 5 */
|
||||
155, /* OBJ_safeContentsBag 1 2 840 113549 1 12 10 1 6 */
|
||||
34, /* OBJ_idea_cbc 1 3 6 1 4 1 188 7 1 1 2 */
|
||||
955, /* OBJ_jurisdictionLocalityName 1 3 6 1 4 1 311 60 2 1 1 */
|
||||
956, /* OBJ_jurisdictionStateOrProvinceName 1 3 6 1 4 1 311 60 2 1 2 */
|
||||
957, /* OBJ_jurisdictionCountryName 1 3 6 1 4 1 311 60 2 1 3 */
|
||||
};
|
||||
|
||||
|
||||
@@ -1,307 +0,0 @@
|
||||
#!/usr/local/bin/perl
|
||||
|
||||
# fixes bug in floating point emulation on sparc64 when
|
||||
# this script produces off-by-one output on sparc64
|
||||
use integer;
|
||||
|
||||
sub obj_cmp
|
||||
{
|
||||
local(@a,@b,$_,$r);
|
||||
|
||||
$A=$obj_len{$obj{$nid{$a}}};
|
||||
$B=$obj_len{$obj{$nid{$b}}};
|
||||
|
||||
$r=($A-$B);
|
||||
return($r) if $r != 0;
|
||||
|
||||
$A=$obj_der{$obj{$nid{$a}}};
|
||||
$B=$obj_der{$obj{$nid{$b}}};
|
||||
|
||||
return($A cmp $B);
|
||||
}
|
||||
|
||||
sub expand_obj
|
||||
{
|
||||
local(*v)=@_;
|
||||
local($k,$d);
|
||||
local($i);
|
||||
|
||||
do {
|
||||
$i=0;
|
||||
foreach $k (keys %v)
|
||||
{
|
||||
if (($v{$k} =~ s/(OBJ_[^,]+),/$v{$1},/))
|
||||
{ $i++; }
|
||||
}
|
||||
} while($i);
|
||||
foreach $k (keys %v)
|
||||
{
|
||||
@a=split(/,/,$v{$k});
|
||||
$objn{$k}=$#a+1;
|
||||
}
|
||||
return(%objn);
|
||||
}
|
||||
|
||||
open (IN,"$ARGV[0]") || die "Can't open input file $ARGV[0]";
|
||||
open (OUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]";
|
||||
|
||||
while (<IN>)
|
||||
{
|
||||
next unless /^\#define\s+(\S+)\s+(.*)$/;
|
||||
$v=$1;
|
||||
$d=$2;
|
||||
$d =~ s/^\"//;
|
||||
$d =~ s/\"$//;
|
||||
if ($v =~ /^SN_(.*)$/)
|
||||
{
|
||||
if(defined $snames{$d})
|
||||
{
|
||||
print "WARNING: Duplicate short name \"$d\"\n";
|
||||
}
|
||||
else
|
||||
{ $snames{$d} = "X"; }
|
||||
$sn{$1}=$d;
|
||||
}
|
||||
elsif ($v =~ /^LN_(.*)$/)
|
||||
{
|
||||
if(defined $lnames{$d})
|
||||
{
|
||||
print "WARNING: Duplicate long name \"$d\"\n";
|
||||
}
|
||||
else
|
||||
{ $lnames{$d} = "X"; }
|
||||
$ln{$1}=$d;
|
||||
}
|
||||
elsif ($v =~ /^NID_(.*)$/)
|
||||
{ $nid{$d}=$1; }
|
||||
elsif ($v =~ /^OBJ_(.*)$/)
|
||||
{
|
||||
$obj{$1}=$v;
|
||||
$objd{$v}=$d;
|
||||
}
|
||||
}
|
||||
close IN;
|
||||
|
||||
%ob=&expand_obj(*objd);
|
||||
|
||||
@a=sort { $a <=> $b } keys %nid;
|
||||
$n=$a[$#a]+1;
|
||||
|
||||
@lvalues=();
|
||||
$lvalues=0;
|
||||
|
||||
for ($i=0; $i<$n; $i++)
|
||||
{
|
||||
if (!defined($nid{$i}))
|
||||
{
|
||||
push(@out,"{NULL,NULL,NID_undef,0,NULL,0},\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
$sn=defined($sn{$nid{$i}})?"$sn{$nid{$i}}":"NULL";
|
||||
$ln=defined($ln{$nid{$i}})?"$ln{$nid{$i}}":"NULL";
|
||||
|
||||
if ($sn eq "NULL") {
|
||||
$sn=$ln;
|
||||
$sn{$nid{$i}} = $ln;
|
||||
}
|
||||
|
||||
if ($ln eq "NULL") {
|
||||
$ln=$sn;
|
||||
$ln{$nid{$i}} = $sn;
|
||||
}
|
||||
|
||||
$out ="{";
|
||||
$out.="\"$sn\"";
|
||||
$out.=","."\"$ln\"";
|
||||
$out.=",NID_$nid{$i},";
|
||||
if (defined($obj{$nid{$i}}) && $objd{$obj{$nid{$i}}} =~ /,/)
|
||||
{
|
||||
$v=$objd{$obj{$nid{$i}}};
|
||||
$v =~ s/L//g;
|
||||
$v =~ s/,/ /g;
|
||||
$r=&der_it($v);
|
||||
$z="";
|
||||
$length=0;
|
||||
foreach (unpack("C*",$r))
|
||||
{
|
||||
$z.=sprintf("0x%02X,",$_);
|
||||
$length++;
|
||||
}
|
||||
$obj_der{$obj{$nid{$i}}}=$z;
|
||||
$obj_len{$obj{$nid{$i}}}=$length;
|
||||
|
||||
push(@lvalues,sprintf("%-45s/* [%3d] %s */\n",
|
||||
$z,$lvalues,$obj{$nid{$i}}));
|
||||
$out.="$length,&(lvalues[$lvalues]),0";
|
||||
$lvalues+=$length;
|
||||
}
|
||||
else
|
||||
{
|
||||
$out.="0,NULL,0";
|
||||
}
|
||||
$out.="},\n";
|
||||
push(@out,$out);
|
||||
}
|
||||
}
|
||||
|
||||
@a=grep(defined($sn{$nid{$_}}),0 .. $n);
|
||||
foreach (sort { $sn{$nid{$a}} cmp $sn{$nid{$b}} } @a)
|
||||
{
|
||||
push(@sn,sprintf("%2d,\t/* \"$sn{$nid{$_}}\" */\n",$_));
|
||||
}
|
||||
|
||||
@a=grep(defined($ln{$nid{$_}}),0 .. $n);
|
||||
foreach (sort { $ln{$nid{$a}} cmp $ln{$nid{$b}} } @a)
|
||||
{
|
||||
push(@ln,sprintf("%2d,\t/* \"$ln{$nid{$_}}\" */\n",$_));
|
||||
}
|
||||
|
||||
@a=grep(defined($obj{$nid{$_}}),0 .. $n);
|
||||
foreach (sort obj_cmp @a)
|
||||
{
|
||||
$m=$obj{$nid{$_}};
|
||||
$v=$objd{$m};
|
||||
$v =~ s/L//g;
|
||||
$v =~ s/,/ /g;
|
||||
push(@ob,sprintf("%2d,\t/* %-32s %s */\n",$_,$m,$v));
|
||||
}
|
||||
|
||||
print OUT <<'EOF';
|
||||
/* crypto/objects/obj_dat.h */
|
||||
|
||||
/* 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
|
||||
*/
|
||||
|
||||
/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
EOF
|
||||
|
||||
printf OUT "#define NUM_NID %d\n",$n;
|
||||
printf OUT "#define NUM_SN %d\n",$#sn+1;
|
||||
printf OUT "#define NUM_LN %d\n",$#ln+1;
|
||||
printf OUT "#define NUM_OBJ %d\n\n",$#ob+1;
|
||||
|
||||
printf OUT "static const unsigned char lvalues[%d]={\n",$lvalues+1;
|
||||
print OUT @lvalues;
|
||||
print OUT "};\n\n";
|
||||
|
||||
printf OUT "static const ASN1_OBJECT nid_objs[NUM_NID]={\n";
|
||||
foreach (@out)
|
||||
{
|
||||
if (length($_) > 75)
|
||||
{
|
||||
$out="";
|
||||
foreach (split(/,/))
|
||||
{
|
||||
$t=$out.$_.",";
|
||||
if (length($t) > 70)
|
||||
{
|
||||
print OUT "$out\n";
|
||||
$t="\t$_,";
|
||||
}
|
||||
$out=$t;
|
||||
}
|
||||
chop $out;
|
||||
print OUT "$out";
|
||||
}
|
||||
else
|
||||
{ print OUT $_; }
|
||||
}
|
||||
print OUT "};\n\n";
|
||||
|
||||
printf OUT "static const unsigned int sn_objs[NUM_SN]={\n";
|
||||
print OUT @sn;
|
||||
print OUT "};\n\n";
|
||||
|
||||
printf OUT "static const unsigned int ln_objs[NUM_LN]={\n";
|
||||
print OUT @ln;
|
||||
print OUT "};\n\n";
|
||||
|
||||
printf OUT "static const unsigned int obj_objs[NUM_OBJ]={\n";
|
||||
print OUT @ob;
|
||||
print OUT "};\n\n";
|
||||
|
||||
close OUT;
|
||||
|
||||
sub der_it
|
||||
{
|
||||
local($v)=@_;
|
||||
local(@a,$i,$ret,@r);
|
||||
|
||||
@a=split(/\s+/,$v);
|
||||
$ret.=pack("C*",$a[0]*40+$a[1]);
|
||||
shift @a;
|
||||
shift @a;
|
||||
foreach (@a)
|
||||
{
|
||||
@r=();
|
||||
$t=0;
|
||||
while ($_ >= 128)
|
||||
{
|
||||
$x=$_%128;
|
||||
$_/=128;
|
||||
push(@r,((($t++)?0x80:0)|$x));
|
||||
}
|
||||
push(@r,((($t++)?0x80:0)|$_));
|
||||
$ret.=pack("C*",reverse(@r));
|
||||
}
|
||||
return($ret);
|
||||
}
|
||||
@@ -917,3 +917,41 @@ aes_128_cbc_hmac_sha1 916
|
||||
aes_192_cbc_hmac_sha1 917
|
||||
aes_256_cbc_hmac_sha1 918
|
||||
rsaesOaep 919
|
||||
dhpublicnumber 920
|
||||
brainpoolP160r1 921
|
||||
brainpoolP160t1 922
|
||||
brainpoolP192r1 923
|
||||
brainpoolP192t1 924
|
||||
brainpoolP224r1 925
|
||||
brainpoolP224t1 926
|
||||
brainpoolP256r1 927
|
||||
brainpoolP256t1 928
|
||||
brainpoolP320r1 929
|
||||
brainpoolP320t1 930
|
||||
brainpoolP384r1 931
|
||||
brainpoolP384t1 932
|
||||
brainpoolP512r1 933
|
||||
brainpoolP512t1 934
|
||||
pSpecified 935
|
||||
dhSinglePass_stdDH_sha1kdf_scheme 936
|
||||
dhSinglePass_stdDH_sha224kdf_scheme 937
|
||||
dhSinglePass_stdDH_sha256kdf_scheme 938
|
||||
dhSinglePass_stdDH_sha384kdf_scheme 939
|
||||
dhSinglePass_stdDH_sha512kdf_scheme 940
|
||||
dhSinglePass_cofactorDH_sha1kdf_scheme 941
|
||||
dhSinglePass_cofactorDH_sha224kdf_scheme 942
|
||||
dhSinglePass_cofactorDH_sha256kdf_scheme 943
|
||||
dhSinglePass_cofactorDH_sha384kdf_scheme 944
|
||||
dhSinglePass_cofactorDH_sha512kdf_scheme 945
|
||||
dh_std_kdf 946
|
||||
dh_cofactor_kdf 947
|
||||
aes_128_cbc_hmac_sha256 948
|
||||
aes_192_cbc_hmac_sha256 949
|
||||
aes_256_cbc_hmac_sha256 950
|
||||
ct_precert_scts 951
|
||||
ct_precert_poison 952
|
||||
ct_precert_signer 953
|
||||
ct_cert_scts 954
|
||||
jurisdictionLocalityName 955
|
||||
jurisdictionStateOrProvinceName 956
|
||||
jurisdictionCountryName 957
|
||||
|
||||
@@ -41,6 +41,21 @@ static const nid_triple sigoid_srt[] = {
|
||||
{NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94,
|
||||
NID_id_GostR3410_2001_cc},
|
||||
{NID_rsassaPss, NID_undef, NID_rsaEncryption},
|
||||
{NID_dhSinglePass_stdDH_sha1kdf_scheme, NID_sha1, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha224kdf_scheme, NID_sha224, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha256kdf_scheme, NID_sha256, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha384kdf_scheme, NID_sha384, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha512kdf_scheme, NID_sha512, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha1kdf_scheme, NID_sha1,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha224kdf_scheme, NID_sha224,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha256kdf_scheme, NID_sha256,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha384kdf_scheme, NID_sha384,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512,
|
||||
NID_dh_cofactor_kdf},
|
||||
};
|
||||
|
||||
static const nid_triple *const sigoid_srt_xref[] = {
|
||||
@@ -54,19 +69,29 @@ static const nid_triple *const sigoid_srt_xref[] = {
|
||||
&sigoid_srt[5],
|
||||
&sigoid_srt[8],
|
||||
&sigoid_srt[12],
|
||||
&sigoid_srt[30],
|
||||
&sigoid_srt[35],
|
||||
&sigoid_srt[6],
|
||||
&sigoid_srt[10],
|
||||
&sigoid_srt[11],
|
||||
&sigoid_srt[13],
|
||||
&sigoid_srt[24],
|
||||
&sigoid_srt[20],
|
||||
&sigoid_srt[32],
|
||||
&sigoid_srt[37],
|
||||
&sigoid_srt[14],
|
||||
&sigoid_srt[21],
|
||||
&sigoid_srt[33],
|
||||
&sigoid_srt[38],
|
||||
&sigoid_srt[15],
|
||||
&sigoid_srt[22],
|
||||
&sigoid_srt[34],
|
||||
&sigoid_srt[39],
|
||||
&sigoid_srt[16],
|
||||
&sigoid_srt[23],
|
||||
&sigoid_srt[19],
|
||||
&sigoid_srt[31],
|
||||
&sigoid_srt[36],
|
||||
&sigoid_srt[25],
|
||||
&sigoid_srt[26],
|
||||
&sigoid_srt[27],
|
||||
|
||||
@@ -44,3 +44,15 @@ id_GostR3411_94_with_GostR3410_2001 id_GostR3411_94 id_GostR3410_2001
|
||||
id_GostR3411_94_with_GostR3410_94 id_GostR3411_94 id_GostR3410_94
|
||||
id_GostR3411_94_with_GostR3410_94_cc id_GostR3411_94 id_GostR3410_94_cc
|
||||
id_GostR3411_94_with_GostR3410_2001_cc id_GostR3411_94 id_GostR3410_2001_cc
|
||||
# ECDH KDFs and their corresponding message digests and schemes
|
||||
dhSinglePass_stdDH_sha1kdf_scheme sha1 dh_std_kdf
|
||||
dhSinglePass_stdDH_sha224kdf_scheme sha224 dh_std_kdf
|
||||
dhSinglePass_stdDH_sha256kdf_scheme sha256 dh_std_kdf
|
||||
dhSinglePass_stdDH_sha384kdf_scheme sha384 dh_std_kdf
|
||||
dhSinglePass_stdDH_sha512kdf_scheme sha512 dh_std_kdf
|
||||
|
||||
dhSinglePass_cofactorDH_sha1kdf_scheme sha1 dh_cofactor_kdf
|
||||
dhSinglePass_cofactorDH_sha224kdf_scheme sha224 dh_cofactor_kdf
|
||||
dhSinglePass_cofactorDH_sha256kdf_scheme sha256 dh_cofactor_kdf
|
||||
dhSinglePass_cofactorDH_sha384kdf_scheme sha384 dh_cofactor_kdf
|
||||
dhSinglePass_cofactorDH_sha512kdf_scheme sha512 dh_cofactor_kdf
|
||||
|
||||
@@ -1,240 +0,0 @@
|
||||
#!/usr/local/bin/perl
|
||||
|
||||
open (NUMIN,"$ARGV[1]") || die "Can't open number file $ARGV[1]";
|
||||
$max_nid=0;
|
||||
$o=0;
|
||||
while(<NUMIN>)
|
||||
{
|
||||
chop;
|
||||
$o++;
|
||||
s/#.*$//;
|
||||
next if /^\s*$/;
|
||||
$_ = 'X'.$_;
|
||||
($Cname,$mynum) = split;
|
||||
$Cname =~ s/^X//;
|
||||
if (defined($nidn{$mynum}))
|
||||
{ die "$ARGV[1]:$o:There's already an object with NID ",$mynum," on line ",$order{$mynum},"\n"; }
|
||||
if (defined($nid{$Cname}))
|
||||
{ die "$ARGV[1]:$o:There's already an object with name ",$Cname," on line ",$order{$nid{$Cname}},"\n"; }
|
||||
$nid{$Cname} = $mynum;
|
||||
$nidn{$mynum} = $Cname;
|
||||
$order{$mynum} = $o;
|
||||
$max_nid = $mynum if $mynum > $max_nid;
|
||||
}
|
||||
close NUMIN;
|
||||
|
||||
open (IN,"$ARGV[0]") || die "Can't open input file $ARGV[0]";
|
||||
$Cname="";
|
||||
$o=0;
|
||||
while (<IN>)
|
||||
{
|
||||
chop;
|
||||
$o++;
|
||||
if (/^!module\s+(.*)$/)
|
||||
{
|
||||
$module = $1."-";
|
||||
$module =~ s/\./_/g;
|
||||
$module =~ s/-/_/g;
|
||||
}
|
||||
if (/^!global$/)
|
||||
{ $module = ""; }
|
||||
if (/^!Cname\s+(.*)$/)
|
||||
{ $Cname = $1; }
|
||||
if (/^!Alias\s+(.+?)\s+(.*)$/)
|
||||
{
|
||||
$Cname = $module.$1;
|
||||
$myoid = $2;
|
||||
$myoid = &process_oid($myoid);
|
||||
$Cname =~ s/-/_/g;
|
||||
$ordern{$o} = $Cname;
|
||||
$order{$Cname} = $o;
|
||||
$obj{$Cname} = $myoid;
|
||||
$_ = "";
|
||||
$Cname = "";
|
||||
}
|
||||
s/!.*$//;
|
||||
s/#.*$//;
|
||||
next if /^\s*$/;
|
||||
($myoid,$mysn,$myln) = split ':';
|
||||
$mysn =~ s/^\s*//;
|
||||
$mysn =~ s/\s*$//;
|
||||
$myln =~ s/^\s*//;
|
||||
$myln =~ s/\s*$//;
|
||||
$myoid =~ s/^\s*//;
|
||||
$myoid =~ s/\s*$//;
|
||||
if ($myoid ne "")
|
||||
{
|
||||
$myoid = &process_oid($myoid);
|
||||
}
|
||||
|
||||
if ($Cname eq "" && ($myln =~ /^[_A-Za-z][\w.-]*$/ ))
|
||||
{
|
||||
$Cname = $myln;
|
||||
$Cname =~ s/\./_/g;
|
||||
$Cname =~ s/-/_/g;
|
||||
if ($Cname ne "" && defined($ln{$module.$Cname}))
|
||||
{ die "objects.txt:$o:There's already an object with long name ",$ln{$module.$Cname}," on line ",$order{$module.$Cname},"\n"; }
|
||||
}
|
||||
if ($Cname eq "")
|
||||
{
|
||||
$Cname = $mysn;
|
||||
$Cname =~ s/-/_/g;
|
||||
if ($Cname ne "" && defined($sn{$module.$Cname}))
|
||||
{ die "objects.txt:$o:There's already an object with short name ",$sn{$module.$Cname}," on line ",$order{$module.$Cname},"\n"; }
|
||||
}
|
||||
if ($Cname eq "")
|
||||
{
|
||||
$Cname = $myln;
|
||||
$Cname =~ s/-/_/g;
|
||||
$Cname =~ s/\./_/g;
|
||||
$Cname =~ s/ /_/g;
|
||||
if ($Cname ne "" && defined($ln{$module.$Cname}))
|
||||
{ die "objects.txt:$o:There's already an object with long name ",$ln{$module.$Cname}," on line ",$order{$module.$Cname},"\n"; }
|
||||
}
|
||||
$Cname =~ s/\./_/g;
|
||||
$Cname =~ s/-/_/g;
|
||||
$Cname = $module.$Cname;
|
||||
$ordern{$o} = $Cname;
|
||||
$order{$Cname} = $o;
|
||||
$sn{$Cname} = $mysn;
|
||||
$ln{$Cname} = $myln;
|
||||
$obj{$Cname} = $myoid;
|
||||
if (!defined($nid{$Cname}))
|
||||
{
|
||||
$max_nid++;
|
||||
$nid{$Cname} = $max_nid;
|
||||
$nidn{$max_nid} = $Cname;
|
||||
print STDERR "Added OID $Cname\n";
|
||||
}
|
||||
$Cname="";
|
||||
}
|
||||
close IN;
|
||||
|
||||
open (NUMOUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]";
|
||||
foreach (sort { $a <=> $b } keys %nidn)
|
||||
{
|
||||
print NUMOUT $nidn{$_},"\t\t",$_,"\n";
|
||||
}
|
||||
close NUMOUT;
|
||||
|
||||
open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]";
|
||||
print OUT <<'EOF';
|
||||
/* 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
|
||||
*/
|
||||
|
||||
/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
#define SN_undef "UNDEF"
|
||||
#define LN_undef "undefined"
|
||||
#define NID_undef 0
|
||||
#define OBJ_undef 0L
|
||||
EOF
|
||||
|
||||
sub expand
|
||||
{
|
||||
my $string = shift;
|
||||
|
||||
1 while $string =~ s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e;
|
||||
|
||||
return $string;
|
||||
}
|
||||
|
||||
foreach (sort { $a <=> $b } keys %ordern)
|
||||
{
|
||||
$Cname=$ordern{$_};
|
||||
print OUT "\n";
|
||||
print OUT expand("#define SN_$Cname\t\t\"$sn{$Cname}\"\n") if $sn{$Cname} ne "";
|
||||
print OUT expand("#define LN_$Cname\t\t\"$ln{$Cname}\"\n") if $ln{$Cname} ne "";
|
||||
print OUT expand("#define NID_$Cname\t\t$nid{$Cname}\n") if $nid{$Cname} ne "";
|
||||
print OUT expand("#define OBJ_$Cname\t\t$obj{$Cname}\n") if $obj{$Cname} ne "";
|
||||
}
|
||||
|
||||
close OUT;
|
||||
|
||||
sub process_oid
|
||||
{
|
||||
local($oid)=@_;
|
||||
local(@a,$oid_pref);
|
||||
|
||||
@a = split(/\s+/,$myoid);
|
||||
$pref_oid = "";
|
||||
$pref_sep = "";
|
||||
if (!($a[0] =~ /^[0-9]+$/))
|
||||
{
|
||||
$a[0] =~ s/-/_/g;
|
||||
if (!defined($obj{$a[0]}))
|
||||
{ die "$ARGV[0]:$o:Undefined identifier ",$a[0],"\n"; }
|
||||
$pref_oid = "OBJ_" . $a[0];
|
||||
$pref_sep = ",";
|
||||
shift @a;
|
||||
}
|
||||
$oids = join('L,',@a) . "L";
|
||||
if ($oids ne "L")
|
||||
{
|
||||
$oids = $pref_oid . $pref_sep . $oids;
|
||||
}
|
||||
else
|
||||
{
|
||||
$oids = $pref_oid;
|
||||
}
|
||||
return($oids);
|
||||
}
|
||||
@@ -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
|
||||
@@ -1290,3 +1291,60 @@ kisa 1 6 : SEED-OFB : seed-ofb
|
||||
: AES-128-CBC-HMAC-SHA1 : aes-128-cbc-hmac-sha1
|
||||
: AES-192-CBC-HMAC-SHA1 : aes-192-cbc-hmac-sha1
|
||||
: AES-256-CBC-HMAC-SHA1 : aes-256-cbc-hmac-sha1
|
||||
: AES-128-CBC-HMAC-SHA256 : aes-128-cbc-hmac-sha256
|
||||
: AES-192-CBC-HMAC-SHA256 : aes-192-cbc-hmac-sha256
|
||||
: AES-256-CBC-HMAC-SHA256 : aes-256-cbc-hmac-sha256
|
||||
|
||||
ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
|
||||
|
||||
# RFC 5639 curve OIDs (see http://www.ietf.org/rfc/rfc5639.txt)
|
||||
# versionOne OBJECT IDENTIFIER ::= {
|
||||
# iso(1) identifified-organization(3) teletrust(36) algorithm(3)
|
||||
# signature-algorithm(3) ecSign(2) ecStdCurvesAndGeneration(8)
|
||||
# ellipticCurve(1) 1 }
|
||||
1 3 36 3 3 2 8 1 1 1 : brainpoolP160r1
|
||||
1 3 36 3 3 2 8 1 1 2 : brainpoolP160t1
|
||||
1 3 36 3 3 2 8 1 1 3 : brainpoolP192r1
|
||||
1 3 36 3 3 2 8 1 1 4 : brainpoolP192t1
|
||||
1 3 36 3 3 2 8 1 1 5 : brainpoolP224r1
|
||||
1 3 36 3 3 2 8 1 1 6 : brainpoolP224t1
|
||||
1 3 36 3 3 2 8 1 1 7 : brainpoolP256r1
|
||||
1 3 36 3 3 2 8 1 1 8 : brainpoolP256t1
|
||||
1 3 36 3 3 2 8 1 1 9 : brainpoolP320r1
|
||||
1 3 36 3 3 2 8 1 1 10 : brainpoolP320t1
|
||||
1 3 36 3 3 2 8 1 1 11 : brainpoolP384r1
|
||||
1 3 36 3 3 2 8 1 1 12 : brainpoolP384t1
|
||||
1 3 36 3 3 2 8 1 1 13 : brainpoolP512r1
|
||||
1 3 36 3 3 2 8 1 1 14 : brainpoolP512t1
|
||||
|
||||
# ECDH schemes from RFC5753
|
||||
!Alias x9-63-scheme 1 3 133 16 840 63 0
|
||||
!Alias secg-scheme certicom-arc 1
|
||||
|
||||
x9-63-scheme 2 : dhSinglePass-stdDH-sha1kdf-scheme
|
||||
secg-scheme 11 0 : dhSinglePass-stdDH-sha224kdf-scheme
|
||||
secg-scheme 11 1 : dhSinglePass-stdDH-sha256kdf-scheme
|
||||
secg-scheme 11 2 : dhSinglePass-stdDH-sha384kdf-scheme
|
||||
secg-scheme 11 3 : dhSinglePass-stdDH-sha512kdf-scheme
|
||||
|
||||
x9-63-scheme 3 : dhSinglePass-cofactorDH-sha1kdf-scheme
|
||||
secg-scheme 14 0 : dhSinglePass-cofactorDH-sha224kdf-scheme
|
||||
secg-scheme 14 1 : dhSinglePass-cofactorDH-sha256kdf-scheme
|
||||
secg-scheme 14 2 : dhSinglePass-cofactorDH-sha384kdf-scheme
|
||||
secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
|
||||
# NIDs for use with lookup tables.
|
||||
: dh-std-kdf
|
||||
: dh-cofactor-kdf
|
||||
|
||||
# RFC 6962 Extension OIDs (see http://www.ietf.org/rfc/rfc6962.txt)
|
||||
1 3 6 1 4 1 11129 2 4 2 : ct_precert_scts : CT Precertificate SCTs
|
||||
1 3 6 1 4 1 11129 2 4 3 : ct_precert_poison : CT Precertificate Poison
|
||||
1 3 6 1 4 1 11129 2 4 4 : ct_precert_signer : CT Precertificate Signer
|
||||
1 3 6 1 4 1 11129 2 4 5 : ct_cert_scts : CT Certificate SCTs
|
||||
|
||||
# CABForum EV SSL Certificate Guidelines
|
||||
# (see https://cabforum.org/extended-validation/)
|
||||
# OIDs for Subject Jurisdiction of Incorporation or Registration
|
||||
1 3 6 1 4 1 311 60 2 1 1 : jurisdictionL : jurisdictionLocalityName
|
||||
1 3 6 1 4 1 311 60 2 1 2 : jurisdictionST : jurisdictionStateOrProvinceName
|
||||
1 3 6 1 4 1 311 60 2 1 3 : jurisdictionC : jurisdictionCountryName
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
#!/usr/local/bin/perl
|
||||
|
||||
use strict;
|
||||
|
||||
my %xref_tbl;
|
||||
my %oid_tbl;
|
||||
|
||||
my ($mac_file, $xref_file) = @ARGV;
|
||||
|
||||
open(IN, $mac_file) || die "Can't open $mac_file";
|
||||
|
||||
# Read in OID nid values for a lookup table.
|
||||
|
||||
while (<IN>)
|
||||
{
|
||||
chomp;
|
||||
my ($name, $num) = /^(\S+)\s+(\S+)$/;
|
||||
$oid_tbl{$name} = $num;
|
||||
}
|
||||
close IN;
|
||||
|
||||
open(IN, $xref_file) || die "Can't open $xref_file";
|
||||
|
||||
my $ln = 1;
|
||||
|
||||
while (<IN>)
|
||||
{
|
||||
chomp;
|
||||
s/#.*$//;
|
||||
next if (/^\S*$/);
|
||||
my ($xr, $p1, $p2) = /^(\S+)\s+(\S+)\s+(\S+)/;
|
||||
check_oid($xr);
|
||||
check_oid($p1);
|
||||
check_oid($p2);
|
||||
$xref_tbl{$xr} = [$p1, $p2, $ln];
|
||||
}
|
||||
|
||||
my @xrkeys = keys %xref_tbl;
|
||||
|
||||
my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
|
||||
|
||||
for(my $i = 0; $i <= $#srt1; $i++)
|
||||
{
|
||||
$xref_tbl{$srt1[$i]}[2] = $i;
|
||||
}
|
||||
|
||||
my @srt2 = sort
|
||||
{
|
||||
my$ap1 = $oid_tbl{$xref_tbl{$a}[0]};
|
||||
my$bp1 = $oid_tbl{$xref_tbl{$b}[0]};
|
||||
return $ap1 - $bp1 if ($ap1 != $bp1);
|
||||
my$ap2 = $oid_tbl{$xref_tbl{$a}[1]};
|
||||
my$bp2 = $oid_tbl{$xref_tbl{$b}[1]};
|
||||
|
||||
return $ap2 - $bp2;
|
||||
} @xrkeys;
|
||||
|
||||
my $pname = $0;
|
||||
|
||||
$pname =~ s|^.[^/]/||;
|
||||
|
||||
print <<EOF;
|
||||
/* AUTOGENERATED BY $pname, DO NOT EDIT */
|
||||
|
||||
typedef struct {
|
||||
int sign_id;
|
||||
int hash_id;
|
||||
int pkey_id;
|
||||
} nid_triple;
|
||||
|
||||
static const nid_triple sigoid_srt[] = {
|
||||
EOF
|
||||
|
||||
foreach (@srt1)
|
||||
{
|
||||
my $xr = $_;
|
||||
my ($p1, $p2) = @{$xref_tbl{$_}};
|
||||
my $o1 = " {NID_$xr, NID_$p1,";
|
||||
my $o2 = "NID_$p2},";
|
||||
if (length("$o1 $o2") < 78)
|
||||
{
|
||||
print "$o1 $o2\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
print "$o1\n $o2\n";
|
||||
}
|
||||
}
|
||||
|
||||
print "};";
|
||||
print <<EOF;
|
||||
|
||||
|
||||
static const nid_triple *const sigoid_srt_xref[] = {
|
||||
EOF
|
||||
|
||||
foreach (@srt2)
|
||||
{
|
||||
my ($p1, $p2, $x) = @{$xref_tbl{$_}};
|
||||
# If digest or signature algorithm is "undef" then the algorithm
|
||||
# needs special handling and is excluded from the cross reference table.
|
||||
next if $p1 eq "undef" || $p2 eq "undef";
|
||||
print " \&sigoid_srt\[$x\],\n";
|
||||
}
|
||||
|
||||
print "};\n";
|
||||
|
||||
sub check_oid
|
||||
{
|
||||
my ($chk) = @_;
|
||||
if (!exists $oid_tbl{$chk})
|
||||
{
|
||||
die "Not Found \"$chk\"\n";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user