diff options
author | jpierre%netscape.com <devnull@localhost> | 2002-07-01 20:27:36 +0000 |
---|---|---|
committer | jpierre%netscape.com <devnull@localhost> | 2002-07-01 20:27:36 +0000 |
commit | 6c96929b0e4d7cc1d208392e9cf54f1610d9b3fe (patch) | |
tree | 0b65407da508301496f00e435432dfa6f7ff6305 | |
parent | b2c5fd42b7636b9f0ad64f4a6ffbd1ffb117e22f (diff) | |
download | nss-hg-6c96929b0e4d7cc1d208392e9cf54f1610d9b3fe.tar.gz |
Fix for 139874 - inject latest Root CA certs - VISA
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 116 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 110 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/constants.c | 2 |
3 files changed, 224 insertions, 4 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 0be8ab598..bf1adaf6f 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -452,6 +452,12 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_132 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_133 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING }; +static const CK_ATTRIBUTE_TYPE nss_builtins_types_134 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +}; +static const CK_ATTRIBUTE_TYPE nss_builtins_types_135 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING +}; #ifdef DEBUG static const NSSItem nss_builtins_items_0 [] = { { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, @@ -8188,6 +8194,108 @@ static const NSSItem nss_builtins_items_133 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; +static const NSSItem nss_builtins_items_134 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"Visa eCommerce Root", (PRUint32)20 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057" +"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156" +"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166" +"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061" +"\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145" +"\103\157\155\155\145\162\143\145\040\122\157\157\164" +, (PRUint32)109 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057" +"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156" +"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166" +"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061" +"\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145" +"\103\157\155\155\145\162\143\145\040\122\157\157\164" +, (PRUint32)109 }, + { (void *)"\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142" +, (PRUint32)16 }, + { (void *)"\060\202\003\242\060\202\002\212\240\003\002\001\002\002\020\023" +"\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142\060" +"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\153" +"\061\013\060\011\006\003\125\004\006\023\002\125\123\061\015\060" +"\013\006\003\125\004\012\023\004\126\111\123\101\061\057\060\055" +"\006\003\125\004\013\023\046\126\151\163\141\040\111\156\164\145" +"\162\156\141\164\151\157\156\141\154\040\123\145\162\166\151\143" +"\145\040\101\163\163\157\143\151\141\164\151\157\156\061\034\060" +"\032\006\003\125\004\003\023\023\126\151\163\141\040\145\103\157" +"\155\155\145\162\143\145\040\122\157\157\164\060\036\027\015\060" +"\062\060\066\062\066\060\062\061\070\063\066\132\027\015\062\062" +"\060\066\062\064\060\060\061\066\061\062\132\060\153\061\013\060" +"\011\006\003\125\004\006\023\002\125\123\061\015\060\013\006\003" +"\125\004\012\023\004\126\111\123\101\061\057\060\055\006\003\125" +"\004\013\023\046\126\151\163\141\040\111\156\164\145\162\156\141" +"\164\151\157\156\141\154\040\123\145\162\166\151\143\145\040\101" +"\163\163\157\143\151\141\164\151\157\156\061\034\060\032\006\003" +"\125\004\003\023\023\126\151\163\141\040\145\103\157\155\155\145" +"\162\143\145\040\122\157\157\164\060\202\001\042\060\015\006\011" +"\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000" +"\060\202\001\012\002\202\001\001\000\257\127\336\126\036\156\241" +"\332\140\261\224\047\313\027\333\007\077\200\205\117\310\234\266" +"\320\364\157\117\317\231\330\341\333\302\110\134\072\254\071\063" +"\307\037\152\213\046\075\053\065\365\110\261\221\301\002\116\004" +"\226\221\173\260\063\360\261\024\116\021\157\265\100\257\033\105" +"\245\112\357\176\266\254\362\240\037\130\077\022\106\140\074\215" +"\241\340\175\317\127\076\063\036\373\107\361\252\025\227\007\125" +"\146\245\265\055\056\330\200\131\262\247\015\267\106\354\041\143" +"\377\065\253\245\002\317\052\364\114\376\173\365\224\135\204\115" +"\250\362\140\217\333\016\045\074\237\163\161\317\224\337\112\352" +"\333\337\162\070\214\363\226\275\361\027\274\322\272\073\105\132" +"\306\247\366\306\027\213\001\235\374\031\250\052\203\026\270\072" +"\110\376\116\076\240\253\006\031\351\123\363\200\023\007\355\055" +"\277\077\012\074\125\040\071\054\054\000\151\164\225\112\274\040" +"\262\251\171\345\030\211\221\250\334\034\115\357\273\176\067\013" +"\135\376\071\245\210\122\214\000\154\354\030\174\101\275\366\213" +"\165\167\272\140\235\204\347\376\055\002\003\001\000\001\243\102" +"\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060\003" +"\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003" +"\002\001\006\060\035\006\003\125\035\016\004\026\004\024\025\070" +"\203\017\077\054\077\160\063\036\315\106\376\007\214\040\340\327" +"\303\267\060\015\006\011\052\206\110\206\367\015\001\001\005\005" +"\000\003\202\001\001\000\137\361\101\175\174\134\010\271\053\340" +"\325\222\107\372\147\134\245\023\303\003\041\233\053\114\211\106" +"\317\131\115\311\376\245\100\266\143\315\335\161\050\225\147\021" +"\314\044\254\323\104\154\161\256\001\040\153\003\242\217\030\267" +"\051\072\175\345\026\140\123\170\074\300\257\025\203\367\217\122" +"\063\044\275\144\223\227\356\213\367\333\030\250\155\161\263\367" +"\054\027\320\164\045\151\367\376\153\074\224\276\115\113\101\214" +"\116\342\163\320\343\220\042\163\103\315\363\357\352\163\316\105" +"\212\260\246\111\377\114\175\235\161\210\304\166\035\220\133\035" +"\356\375\314\367\356\375\140\245\261\172\026\161\321\026\320\174" +"\022\074\154\151\227\333\256\137\071\232\160\057\005\074\031\106" +"\004\231\040\066\320\140\156\141\006\273\026\102\214\160\367\060" +"\373\340\333\146\243\000\001\275\346\054\332\221\137\240\106\213" +"\115\152\234\075\075\335\005\106\376\166\277\240\012\074\344\000" +"\346\047\267\377\204\055\336\272\042\047\226\020\161\353\042\355" +"\337\337\063\234\317\343\255\256\216\324\216\346\117\121\257\026" +"\222\340\134\366\007\017" +, (PRUint32)934 } +}; +static const NSSItem nss_builtins_items_135 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"Visa eCommerce Root", (PRUint32)20 }, + { (void *)"\160\027\233\206\214\000\244\372\140\221\122\042\077\237\076\062" +"\275\340\005\142" +, (PRUint32)20 }, + { (void *)"\374\021\270\330\010\223\060\000\155\043\371\176\353\122\036\002" +, (PRUint32)16 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } +}; PR_IMPLEMENT_DATA(builtinsInternalObject) nss_builtins_data[] = { @@ -8326,11 +8434,13 @@ nss_builtins_data[] = { { 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} }, { 10, nss_builtins_types_131, nss_builtins_items_131, {NULL} }, { 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} }, - { 10, nss_builtins_types_133, nss_builtins_items_133, {NULL} } + { 10, nss_builtins_types_133, nss_builtins_items_133, {NULL} }, + { 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} }, + { 10, nss_builtins_types_135, nss_builtins_items_135, {NULL} } }; PR_IMPLEMENT_DATA(const PRUint32) #ifdef DEBUG - nss_builtins_nObjects = 133+1; + nss_builtins_nObjects = 135+1; #else - nss_builtins_nObjects = 133; + nss_builtins_nObjects = 135; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index 240986506..e69eafbf2 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -8452,3 +8452,113 @@ END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + +# +# Certificate "Visa eCommerce Root" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Visa eCommerce Root" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057 +\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156 +\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166 +\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061 +\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145 +\103\157\155\155\145\162\143\145\040\122\157\157\164 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057 +\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156 +\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166 +\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061 +\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145 +\103\157\155\155\145\162\143\145\040\122\157\157\164 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\242\060\202\002\212\240\003\002\001\002\002\020\023 +\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\153 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\015\060 +\013\006\003\125\004\012\023\004\126\111\123\101\061\057\060\055 +\006\003\125\004\013\023\046\126\151\163\141\040\111\156\164\145 +\162\156\141\164\151\157\156\141\154\040\123\145\162\166\151\143 +\145\040\101\163\163\157\143\151\141\164\151\157\156\061\034\060 +\032\006\003\125\004\003\023\023\126\151\163\141\040\145\103\157 +\155\155\145\162\143\145\040\122\157\157\164\060\036\027\015\060 +\062\060\066\062\066\060\062\061\070\063\066\132\027\015\062\062 +\060\066\062\064\060\060\061\066\061\062\132\060\153\061\013\060 +\011\006\003\125\004\006\023\002\125\123\061\015\060\013\006\003 +\125\004\012\023\004\126\111\123\101\061\057\060\055\006\003\125 +\004\013\023\046\126\151\163\141\040\111\156\164\145\162\156\141 +\164\151\157\156\141\154\040\123\145\162\166\151\143\145\040\101 +\163\163\157\143\151\141\164\151\157\156\061\034\060\032\006\003 +\125\004\003\023\023\126\151\163\141\040\145\103\157\155\155\145 +\162\143\145\040\122\157\157\164\060\202\001\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 +\060\202\001\012\002\202\001\001\000\257\127\336\126\036\156\241 +\332\140\261\224\047\313\027\333\007\077\200\205\117\310\234\266 +\320\364\157\117\317\231\330\341\333\302\110\134\072\254\071\063 +\307\037\152\213\046\075\053\065\365\110\261\221\301\002\116\004 +\226\221\173\260\063\360\261\024\116\021\157\265\100\257\033\105 +\245\112\357\176\266\254\362\240\037\130\077\022\106\140\074\215 +\241\340\175\317\127\076\063\036\373\107\361\252\025\227\007\125 +\146\245\265\055\056\330\200\131\262\247\015\267\106\354\041\143 +\377\065\253\245\002\317\052\364\114\376\173\365\224\135\204\115 +\250\362\140\217\333\016\045\074\237\163\161\317\224\337\112\352 +\333\337\162\070\214\363\226\275\361\027\274\322\272\073\105\132 +\306\247\366\306\027\213\001\235\374\031\250\052\203\026\270\072 +\110\376\116\076\240\253\006\031\351\123\363\200\023\007\355\055 +\277\077\012\074\125\040\071\054\054\000\151\164\225\112\274\040 +\262\251\171\345\030\211\221\250\334\034\115\357\273\176\067\013 +\135\376\071\245\210\122\214\000\154\354\030\174\101\275\366\213 +\165\167\272\140\235\204\347\376\055\002\003\001\000\001\243\102 +\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\006\060\035\006\003\125\035\016\004\026\004\024\025\070 +\203\017\077\054\077\160\063\036\315\106\376\007\214\040\340\327 +\303\267\060\015\006\011\052\206\110\206\367\015\001\001\005\005 +\000\003\202\001\001\000\137\361\101\175\174\134\010\271\053\340 +\325\222\107\372\147\134\245\023\303\003\041\233\053\114\211\106 +\317\131\115\311\376\245\100\266\143\315\335\161\050\225\147\021 +\314\044\254\323\104\154\161\256\001\040\153\003\242\217\030\267 +\051\072\175\345\026\140\123\170\074\300\257\025\203\367\217\122 +\063\044\275\144\223\227\356\213\367\333\030\250\155\161\263\367 +\054\027\320\164\045\151\367\376\153\074\224\276\115\113\101\214 +\116\342\163\320\343\220\042\163\103\315\363\357\352\163\316\105 +\212\260\246\111\377\114\175\235\161\210\304\166\035\220\133\035 +\356\375\314\367\356\375\140\245\261\172\026\161\321\026\320\174 +\022\074\154\151\227\333\256\137\071\232\160\057\005\074\031\106 +\004\231\040\066\320\140\156\141\006\273\026\102\214\160\367\060 +\373\340\333\146\243\000\001\275\346\054\332\221\137\240\106\213 +\115\152\234\075\075\335\005\106\376\166\277\240\012\074\344\000 +\346\047\267\377\204\055\336\272\042\047\226\020\161\353\042\355 +\337\337\063\234\317\343\255\256\216\324\216\346\117\121\257\026 +\222\340\134\366\007\017 +END + +# Trust for Certificate "Visa eCommerce Root" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Visa eCommerce Root" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\160\027\233\206\214\000\244\372\140\221\122\042\077\237\076\062 +\275\340\005\142 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\374\021\270\330\010\223\060\000\155\043\371\176\353\122\036\002 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR diff --git a/security/nss/lib/ckfw/builtins/constants.c b/security/nss/lib/ckfw/builtins/constants.c index 1491dc940..727930f2d 100644 --- a/security/nss/lib/ckfw/builtins/constants.c +++ b/security/nss/lib/ckfw/builtins/constants.c @@ -59,7 +59,7 @@ NSS_IMPLEMENT_DATA const NSSUTF8 * nss_builtins_LibraryDescription = (NSSUTF8 *) "NSS Builtin Object Cryptoki Module"; NSS_IMPLEMENT_DATA const CK_VERSION -nss_builtins_LibraryVersion = { 1, 0 }; +nss_builtins_LibraryVersion = { 1, 1 }; NSS_IMPLEMENT_DATA const NSSUTF8 * nss_builtins_SlotDescription = (NSSUTF8 *) ""; |