diff options
author | wtc%netscape.com <devnull@localhost> | 2003-05-29 14:26:16 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2003-05-29 14:26:16 +0000 |
commit | fd1b697a6d2ea77e263351a0a23091b768566edb (patch) | |
tree | cd7e5bb0f7c49c306751d62db1b064c9cd944eff /security/nss/lib/ckfw | |
parent | 89834182fe65ac598075a82b6fea5392fc9a5bb2 (diff) | |
download | nss-hg-fd1b697a6d2ea77e263351a0a23091b768566edb.tar.gz |
Bugzilla 207379: removed the certificate "ValiCert OCSP Responder".
Bumped version to 1.40 (for NSS 3.9). r=relyea.
Modified Files: certdata.c certdata.txt nssckbi.h
Diffstat (limited to 'security/nss/lib/ckfw')
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 279 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 131 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/nssckbi.h | 2 |
3 files changed, 76 insertions, 336 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 90b8de68c..8de8086fe 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -39,15 +39,15 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $R #include "builtins.h" #endif /* BUILTINS_H */ -static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST; +static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; +static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509; +static const CK_BBOOL ck_false = CK_FALSE; static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID; -static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST; static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR; -static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509; static const CK_OBJECT_CLASS cko_data = CKO_DATA; -static const CK_BBOOL ck_false = CK_FALSE; static const CK_BBOOL ck_true = CK_TRUE; -static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; +static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST; +static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST; #ifdef DEBUG static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_APPLICATION, CKA_VALUE @@ -452,12 +452,6 @@ 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_ISSUER, CKA_SERIAL_NUMBER, 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_ISSUER, CKA_SERIAL_NUMBER, 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) }, @@ -4244,127 +4238,6 @@ static const NSSItem nss_builtins_items_66 [] = { { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"ValiCert OCSP Responder", (PRUint32)24 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"0", (PRUint32)2 }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, - { (void *)"\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001" -"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" -"\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154" -"\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157\156" -"\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125\004" -"\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156\143" -"\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141\163" -"\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040\101" -"\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120\061" -"\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072\057" -"\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156\145" -"\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001\011" -"\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162\164" -"\056\143\157\155\060\036\027\015\060\060\060\062\061\062\061\061" -"\065\060\060\065\132\027\015\060\065\060\062\061\060\061\061\065" -"\060\060\065\132\060\201\262\061\044\060\042\006\003\125\004\007" -"\023\033\126\141\154\151\103\145\162\164\040\126\141\154\151\144" -"\141\164\151\157\156\040\116\145\164\167\157\162\153\061\027\060" -"\025\006\003\125\004\012\023\016\126\141\154\151\103\145\162\164" -"\054\040\111\156\143\056\061\054\060\052\006\003\125\004\013\023" -"\043\103\154\141\163\163\040\061\040\126\141\154\151\144\141\164" -"\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040" -"\117\103\123\120\061\041\060\037\006\003\125\004\003\023\030\150" -"\164\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145" -"\162\164\056\156\145\164\057\061\040\060\036\006\011\052\206\110" -"\206\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154" -"\151\143\145\162\164\056\143\157\155\060\201\237\060\015\006\011" -"\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060" -"\201\211\002\201\201\000\307\214\057\247\303\100\207\073\075\327" -"\304\232\130\024\144\012\303\010\071\142\032\317\322\353\251\361" -"\151\164\212\312\016\132\166\314\242\122\116\320\363\304\172\265" -"\370\246\034\273\243\247\244\123\207\133\215\300\000\273\325\146" -"\044\347\164\306\026\310\257\310\003\142\325\062\207\242\122\221" -"\104\224\225\250\107\103\155\245\110\234\366\114\165\325\117\142" -"\347\311\377\173\364\044\214\247\274\050\166\265\062\240\045\163" -"\267\107\057\170\370\106\371\207\024\360\167\374\012\167\350\117" -"\375\214\037\372\142\331\002\003\001\000\001\243\154\060\152\060" -"\017\006\011\053\006\001\005\005\007\060\001\005\004\002\005\000" -"\060\023\006\003\125\035\045\004\014\060\012\006\010\053\006\001" -"\005\005\007\003\011\060\013\006\003\125\035\017\004\004\003\002" -"\001\206\060\065\006\010\053\006\001\005\005\007\001\001\004\051" -"\060\047\060\045\006\010\053\006\001\005\005\007\060\001\206\031" -"\150\164\164\160\072\057\057\157\143\163\160\062\056\166\141\154" -"\151\143\145\162\164\056\156\145\164\060\015\006\011\052\206\110" -"\206\367\015\001\001\005\005\000\003\201\201\000\025\305\340\270" -"\064\162\022\006\040\250\142\225\223\321\274\223\272\220\253\334" -"\116\215\216\215\230\114\343\062\365\053\077\263\227\373\252\242" -"\255\100\227\255\150\275\134\255\123\016\320\246\263\015\254\032" -"\231\215\252\060\036\317\016\160\377\002\260\167\145\203\315\332" -"\007\134\122\315\131\273\242\310\342\264\026\203\217\324\225\171" -"\223\055\350\277\104\223\061\222\060\323\064\064\361\020\373\041" -"\254\056\364\303\135\144\143\172\231\341\232\253\102\035\110\146" -"\246\167\067\270\125\074\255\376\145\260\142\351" -, (PRUint32)844 } -}; -static const NSSItem nss_builtins_items_67 [] = { - { (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 *)"ValiCert OCSP Responder", (PRUint32)24 }, - { (void *)"\133\166\261\274\342\212\360\366\161\221\205\147\046\215\021\151" -"\017\027\077\163" -, (PRUint32)20 }, - { (void *)"\325\036\040\137\321\365\035\202\127\010\122\071\035\372\212\255" -, (PRUint32)16 }, - { (void *)"\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141" -"\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157" -"\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125" -"\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156" -"\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141" -"\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040" -"\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120" -"\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072" -"\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156" -"\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001" -"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" -"\164\056\143\157\155" -, (PRUint32)181 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, - { (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) } -}; -static const NSSItem nss_builtins_items_68 [] = { - { (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 *)"Baltimore CyberTrust Code Signing Root", (PRUint32)39 }, { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, { (void *)"\060\147\061\013\060\011\006\003\125\004\006\023\002\111\105\061" @@ -4447,7 +4320,7 @@ static const NSSItem nss_builtins_items_68 [] = { "\306\003\256\254\343\277\267\300\252\052" , (PRUint32)938 } }; -static const NSSItem nss_builtins_items_69 [] = { +static const NSSItem nss_builtins_items_67 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4472,7 +4345,7 @@ static const NSSItem nss_builtins_items_69 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_70 [] = { +static const NSSItem nss_builtins_items_68 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4554,7 +4427,7 @@ static const NSSItem nss_builtins_items_70 [] = { "\347\201\035\031\303\044\102\352\143\071\251" , (PRUint32)891 } }; -static const NSSItem nss_builtins_items_71 [] = { +static const NSSItem nss_builtins_items_69 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4578,7 +4451,7 @@ static const NSSItem nss_builtins_items_71 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_72 [] = { +static const NSSItem nss_builtins_items_70 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4647,7 +4520,7 @@ static const NSSItem nss_builtins_items_72 [] = { "\365" , (PRUint32)641 } }; -static const NSSItem nss_builtins_items_73 [] = { +static const NSSItem nss_builtins_items_71 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4672,7 +4545,7 @@ static const NSSItem nss_builtins_items_73 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_74 [] = { +static const NSSItem nss_builtins_items_72 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4740,7 +4613,7 @@ static const NSSItem nss_builtins_items_74 [] = { "\126\224\251\125" , (PRUint32)660 } }; -static const NSSItem nss_builtins_items_75 [] = { +static const NSSItem nss_builtins_items_73 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4764,7 +4637,7 @@ static const NSSItem nss_builtins_items_75 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_76 [] = { +static const NSSItem nss_builtins_items_74 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4831,7 +4704,7 @@ static const NSSItem nss_builtins_items_76 [] = { "\132\052\202\262\067\171" , (PRUint32)646 } }; -static const NSSItem nss_builtins_items_77 [] = { +static const NSSItem nss_builtins_items_75 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4855,7 +4728,7 @@ static const NSSItem nss_builtins_items_77 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_78 [] = { +static const NSSItem nss_builtins_items_76 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4930,7 +4803,7 @@ static const NSSItem nss_builtins_items_78 [] = { "\221\060\352\315" , (PRUint32)804 } }; -static const NSSItem nss_builtins_items_79 [] = { +static const NSSItem nss_builtins_items_77 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -4953,7 +4826,7 @@ static const NSSItem nss_builtins_items_79 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_80 [] = { +static const NSSItem nss_builtins_items_78 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5038,7 +4911,7 @@ static const NSSItem nss_builtins_items_80 [] = { "\265\314\255\006" , (PRUint32)900 } }; -static const NSSItem nss_builtins_items_81 [] = { +static const NSSItem nss_builtins_items_79 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5063,7 +4936,7 @@ static const NSSItem nss_builtins_items_81 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_82 [] = { +static const NSSItem nss_builtins_items_80 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5172,7 +5045,7 @@ static const NSSItem nss_builtins_items_82 [] = { "\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256" , (PRUint32)1328 } }; -static const NSSItem nss_builtins_items_83 [] = { +static const NSSItem nss_builtins_items_81 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5196,7 +5069,7 @@ static const NSSItem nss_builtins_items_83 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_84 [] = { +static const NSSItem nss_builtins_items_82 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5290,7 +5163,7 @@ static const NSSItem nss_builtins_items_84 [] = { "\065\341\035\026\034\320\274\053\216\326\161\331" , (PRUint32)1052 } }; -static const NSSItem nss_builtins_items_85 [] = { +static const NSSItem nss_builtins_items_83 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5315,7 +5188,7 @@ static const NSSItem nss_builtins_items_85 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_86 [] = { +static const NSSItem nss_builtins_items_84 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5413,7 +5286,7 @@ static const NSSItem nss_builtins_items_86 [] = { "\027\132\173\320\274\307\217\116\206\004" , (PRUint32)1082 } }; -static const NSSItem nss_builtins_items_87 [] = { +static const NSSItem nss_builtins_items_85 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5439,7 +5312,7 @@ static const NSSItem nss_builtins_items_87 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_88 [] = { +static const NSSItem nss_builtins_items_86 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5533,7 +5406,7 @@ static const NSSItem nss_builtins_items_88 [] = { "\116\072\063\014\053\263\055\220\006" , (PRUint32)1049 } }; -static const NSSItem nss_builtins_items_89 [] = { +static const NSSItem nss_builtins_items_87 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5559,7 +5432,7 @@ static const NSSItem nss_builtins_items_89 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_90 [] = { +static const NSSItem nss_builtins_items_88 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5654,7 +5527,7 @@ static const NSSItem nss_builtins_items_90 [] = { "\306\241" , (PRUint32)1058 } }; -static const NSSItem nss_builtins_items_91 [] = { +static const NSSItem nss_builtins_items_89 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5679,7 +5552,7 @@ static const NSSItem nss_builtins_items_91 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_92 [] = { +static const NSSItem nss_builtins_items_90 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5771,7 +5644,7 @@ static const NSSItem nss_builtins_items_92 [] = { "\051\303" , (PRUint32)930 } }; -static const NSSItem nss_builtins_items_93 [] = { +static const NSSItem nss_builtins_items_91 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5797,7 +5670,7 @@ static const NSSItem nss_builtins_items_93 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_94 [] = { +static const NSSItem nss_builtins_items_92 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5889,7 +5762,7 @@ static const NSSItem nss_builtins_items_94 [] = { "\064\215" , (PRUint32)930 } }; -static const NSSItem nss_builtins_items_95 [] = { +static const NSSItem nss_builtins_items_93 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -5915,7 +5788,7 @@ static const NSSItem nss_builtins_items_95 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_96 [] = { +static const NSSItem nss_builtins_items_94 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6007,7 +5880,7 @@ static const NSSItem nss_builtins_items_96 [] = { "\116\101\325\226\343\116" , (PRUint32)934 } }; -static const NSSItem nss_builtins_items_97 [] = { +static const NSSItem nss_builtins_items_95 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6033,7 +5906,7 @@ static const NSSItem nss_builtins_items_97 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_98 [] = { +static const NSSItem nss_builtins_items_96 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6125,7 +5998,7 @@ static const NSSItem nss_builtins_items_98 [] = { "\316\324\357" , (PRUint32)931 } }; -static const NSSItem nss_builtins_items_99 [] = { +static const NSSItem nss_builtins_items_97 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6151,7 +6024,7 @@ static const NSSItem nss_builtins_items_99 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_100 [] = { +static const NSSItem nss_builtins_items_98 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6252,7 +6125,7 @@ static const NSSItem nss_builtins_items_100 [] = { "\024" , (PRUint32)977 } }; -static const NSSItem nss_builtins_items_101 [] = { +static const NSSItem nss_builtins_items_99 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6284,7 +6157,7 @@ static const NSSItem nss_builtins_items_101 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_102 [] = { +static const NSSItem nss_builtins_items_100 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6359,7 +6232,7 @@ static const NSSItem nss_builtins_items_102 [] = { "\011\254\211\111\323" , (PRUint32)677 } }; -static const NSSItem nss_builtins_items_103 [] = { +static const NSSItem nss_builtins_items_101 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6386,7 +6259,7 @@ static const NSSItem nss_builtins_items_103 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_104 [] = { +static const NSSItem nss_builtins_items_102 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6498,7 +6371,7 @@ static const NSSItem nss_builtins_items_104 [] = { "\005\377\154\211\063\360\354\025\017" , (PRUint32)1177 } }; -static const NSSItem nss_builtins_items_105 [] = { +static const NSSItem nss_builtins_items_103 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6528,7 +6401,7 @@ static const NSSItem nss_builtins_items_105 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_106 [] = { +static const NSSItem nss_builtins_items_104 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6639,7 +6512,7 @@ static const NSSItem nss_builtins_items_106 [] = { "\316\145\146\227\256\046\136" , (PRUint32)1159 } }; -static const NSSItem nss_builtins_items_107 [] = { +static const NSSItem nss_builtins_items_105 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6669,7 +6542,7 @@ static const NSSItem nss_builtins_items_107 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_108 [] = { +static const NSSItem nss_builtins_items_106 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6764,7 +6637,7 @@ static const NSSItem nss_builtins_items_108 [] = { "\071\050\150\016\163\335\045\232\336\022" , (PRUint32)1002 } }; -static const NSSItem nss_builtins_items_109 [] = { +static const NSSItem nss_builtins_items_107 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6791,7 +6664,7 @@ static const NSSItem nss_builtins_items_109 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_110 [] = { +static const NSSItem nss_builtins_items_108 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6918,7 +6791,7 @@ static const NSSItem nss_builtins_items_110 [] = { "\204\327\372\334\162\133\367\301\072\150" , (PRUint32)1514 } }; -static const NSSItem nss_builtins_items_111 [] = { +static const NSSItem nss_builtins_items_109 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -6945,7 +6818,7 @@ static const NSSItem nss_builtins_items_111 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_112 [] = { +static const NSSItem nss_builtins_items_110 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7060,7 +6933,7 @@ static const NSSItem nss_builtins_items_112 [] = { "\061\210\027\120\237\311\304\016\213\330\250\002\143\015" , (PRUint32)1390 } }; -static const NSSItem nss_builtins_items_113 [] = { +static const NSSItem nss_builtins_items_111 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7085,7 +6958,7 @@ static const NSSItem nss_builtins_items_113 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_114 [] = { +static const NSSItem nss_builtins_items_112 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7215,7 +7088,7 @@ static const NSSItem nss_builtins_items_114 [] = { "\254\142\127\251\367" , (PRUint32)1621 } }; -static const NSSItem nss_builtins_items_115 [] = { +static const NSSItem nss_builtins_items_113 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7240,7 +7113,7 @@ static const NSSItem nss_builtins_items_115 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_116 [] = { +static const NSSItem nss_builtins_items_114 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7356,7 +7229,7 @@ static const NSSItem nss_builtins_items_116 [] = { "\230\150\373\001\103\326\033\342\011\261\227\034" , (PRUint32)1388 } }; -static const NSSItem nss_builtins_items_117 [] = { +static const NSSItem nss_builtins_items_115 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7382,7 +7255,7 @@ static const NSSItem nss_builtins_items_117 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_118 [] = { +static const NSSItem nss_builtins_items_116 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7460,7 +7333,7 @@ static const NSSItem nss_builtins_items_118 [] = { "\354\040\005\141\336" , (PRUint32)869 } }; -static const NSSItem nss_builtins_items_119 [] = { +static const NSSItem nss_builtins_items_117 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7483,7 +7356,7 @@ static const NSSItem nss_builtins_items_119 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_120 [] = { +static const NSSItem nss_builtins_items_118 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7544,7 +7417,7 @@ static const NSSItem nss_builtins_items_120 [] = { "\215\210\043\361\025\101\015\245\106\076\221\077\213\353\367\161" , (PRUint32)608 } }; -static const NSSItem nss_builtins_items_121 [] = { +static const NSSItem nss_builtins_items_119 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7567,7 +7440,7 @@ static const NSSItem nss_builtins_items_121 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_122 [] = { +static const NSSItem nss_builtins_items_120 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7645,7 +7518,7 @@ static const NSSItem nss_builtins_items_122 [] = { "\302\005\146\200\241\313\346\063" , (PRUint32)856 } }; -static const NSSItem nss_builtins_items_123 [] = { +static const NSSItem nss_builtins_items_121 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7668,7 +7541,7 @@ static const NSSItem nss_builtins_items_123 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_124 [] = { +static const NSSItem nss_builtins_items_122 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7776,7 +7649,7 @@ static const NSSItem nss_builtins_items_124 [] = { "\152\372\246\070\254\037\304\204" , (PRUint32)1128 } }; -static const NSSItem nss_builtins_items_125 [] = { +static const NSSItem nss_builtins_items_123 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7806,7 +7679,7 @@ static const NSSItem nss_builtins_items_125 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_126 [] = { +static const NSSItem nss_builtins_items_124 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7893,7 +7766,7 @@ static const NSSItem nss_builtins_items_126 [] = { "\200\072\231\355\165\314\106\173" , (PRUint32)936 } }; -static const NSSItem nss_builtins_items_127 [] = { +static const NSSItem nss_builtins_items_125 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -7918,7 +7791,7 @@ static const NSSItem nss_builtins_items_127 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_128 [] = { +static const NSSItem nss_builtins_items_126 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8037,7 +7910,7 @@ static const NSSItem nss_builtins_items_128 [] = { "\105\217\046\221\242\216\376\251" , (PRUint32)1448 } }; -static const NSSItem nss_builtins_items_129 [] = { +static const NSSItem nss_builtins_items_127 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8062,7 +7935,7 @@ static const NSSItem nss_builtins_items_129 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_130 [] = { +static const NSSItem nss_builtins_items_128 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8150,7 +8023,7 @@ static const NSSItem nss_builtins_items_130 [] = { "\222\340\134\366\007\017" , (PRUint32)934 } }; -static const NSSItem nss_builtins_items_131 [] = { +static const NSSItem nss_builtins_items_129 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8176,7 +8049,7 @@ static const NSSItem nss_builtins_items_131 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) } }; -static const NSSItem nss_builtins_items_132 [] = { +static const NSSItem nss_builtins_items_130 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8268,7 +8141,7 @@ static const NSSItem nss_builtins_items_132 [] = { "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144" , (PRUint32)864 } }; -static const NSSItem nss_builtins_items_133 [] = { +static const NSSItem nss_builtins_items_131 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8298,7 +8171,7 @@ 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 [] = { +static const NSSItem nss_builtins_items_132 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8390,7 +8263,7 @@ static const NSSItem nss_builtins_items_134 [] = { "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064" , (PRUint32)864 } }; -static const NSSItem nss_builtins_items_135 [] = { +static const NSSItem nss_builtins_items_133 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -8558,13 +8431,11 @@ nss_builtins_data[] = { { 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} }, { 12, nss_builtins_types_131, nss_builtins_items_131, {NULL} }, { 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} }, - { 12, nss_builtins_types_133, nss_builtins_items_133, {NULL} }, - { 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} }, - { 12, nss_builtins_types_135, nss_builtins_items_135, {NULL} } + { 12, nss_builtins_types_133, nss_builtins_items_133, {NULL} } }; PR_IMPLEMENT_DATA(const PRUint32) #ifdef DEBUG - nss_builtins_nObjects = 135+1; + nss_builtins_nObjects = 133+1; #else - nss_builtins_nObjects = 135; + nss_builtins_nObjects = 133; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index 3e28a3c6d..e4f9906bf 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -4181,137 +4181,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR # -# Certificate "ValiCert OCSP Responder" -# -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 "ValiCert OCSP Responder" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 -\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154 -\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157\156 -\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125\004 -\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156\143 -\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141\163 -\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040\101 -\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120\061 -\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072\057 -\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156\145 -\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001\011 -\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162\164 -\056\143\157\155\060\036\027\015\060\060\060\062\061\062\061\061 -\065\060\060\065\132\027\015\060\065\060\062\061\060\061\061\065 -\060\060\065\132\060\201\262\061\044\060\042\006\003\125\004\007 -\023\033\126\141\154\151\103\145\162\164\040\126\141\154\151\144 -\141\164\151\157\156\040\116\145\164\167\157\162\153\061\027\060 -\025\006\003\125\004\012\023\016\126\141\154\151\103\145\162\164 -\054\040\111\156\143\056\061\054\060\052\006\003\125\004\013\023 -\043\103\154\141\163\163\040\061\040\126\141\154\151\144\141\164 -\151\157\156\040\101\165\164\150\157\162\151\164\171\040\055\040 -\117\103\123\120\061\041\060\037\006\003\125\004\003\023\030\150 -\164\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145 -\162\164\056\156\145\164\057\061\040\060\036\006\011\052\206\110 -\206\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154 -\151\143\145\162\164\056\143\157\155\060\201\237\060\015\006\011 -\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060 -\201\211\002\201\201\000\307\214\057\247\303\100\207\073\075\327 -\304\232\130\024\144\012\303\010\071\142\032\317\322\353\251\361 -\151\164\212\312\016\132\166\314\242\122\116\320\363\304\172\265 -\370\246\034\273\243\247\244\123\207\133\215\300\000\273\325\146 -\044\347\164\306\026\310\257\310\003\142\325\062\207\242\122\221 -\104\224\225\250\107\103\155\245\110\234\366\114\165\325\117\142 -\347\311\377\173\364\044\214\247\274\050\166\265\062\240\045\163 -\267\107\057\170\370\106\371\207\024\360\167\374\012\167\350\117 -\375\214\037\372\142\331\002\003\001\000\001\243\154\060\152\060 -\017\006\011\053\006\001\005\005\007\060\001\005\004\002\005\000 -\060\023\006\003\125\035\045\004\014\060\012\006\010\053\006\001 -\005\005\007\003\011\060\013\006\003\125\035\017\004\004\003\002 -\001\206\060\065\006\010\053\006\001\005\005\007\001\001\004\051 -\060\047\060\045\006\010\053\006\001\005\005\007\060\001\206\031 -\150\164\164\160\072\057\057\157\143\163\160\062\056\166\141\154 -\151\143\145\162\164\056\156\145\164\060\015\006\011\052\206\110 -\206\367\015\001\001\005\005\000\003\201\201\000\025\305\340\270 -\064\162\022\006\040\250\142\225\223\321\274\223\272\220\253\334 -\116\215\216\215\230\114\343\062\365\053\077\263\227\373\252\242 -\255\100\227\255\150\275\134\255\123\016\320\246\263\015\254\032 -\231\215\252\060\036\317\016\160\377\002\260\167\145\203\315\332 -\007\134\122\315\131\273\242\310\342\264\026\203\217\324\225\171 -\223\055\350\277\104\223\061\222\060\323\064\064\361\020\373\041 -\254\056\364\303\135\144\143\172\231\341\232\253\102\035\110\146 -\246\167\067\270\125\074\255\376\145\260\142\351 -END - -# Trust for Certificate "ValiCert OCSP Responder" -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 "ValiCert OCSP Responder" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\133\166\261\274\342\212\360\366\161\221\205\147\046\215\021\151 -\017\027\077\163 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\325\036\040\137\321\365\035\202\127\010\122\071\035\372\212\255 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141 -\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157 -\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125 -\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156 -\143\056\061\054\060\052\006\003\125\004\013\023\043\103\154\141 -\163\163\040\061\040\126\141\154\151\144\141\164\151\157\156\040 -\101\165\164\150\157\162\151\164\171\040\055\040\117\103\123\120 -\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160\072 -\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056\156 -\145\164\057\061\040\060\036\006\011\052\206\110\206\367\015\001 -\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162 -\164\056\143\157\155 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 -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 "Baltimore CyberTrust Code Signing Root" # CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h index 81c3f47a3..1354854aa 100644 --- a/security/nss/lib/ckfw/builtins/nssckbi.h +++ b/security/nss/lib/ckfw/builtins/nssckbi.h @@ -50,7 +50,7 @@ /* These are the correct verion numbers that details the changes * to the list of trusted certificates. */ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 20 +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 40 /* These verion numbers that details the semantic changes to the ckfw engine. */ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 |