diff options
Diffstat (limited to 'security/nss/lib')
| -rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 443 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 155 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/nssckbi.h | 4 |
3 files changed, 147 insertions, 455 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index c2e4c7d1f..32c6edac5 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -1039,12 +1039,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_326 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { 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, CKA_TRUST_STEP_UP_APPROVED }; -static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = { - 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_329 [] = { - 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, CKA_TRUST_STEP_UP_APPROVED -}; #ifdef DEBUG static const NSSItem nss_builtins_items_0 [] = { { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, @@ -1053,7 +1047,7 @@ static const NSSItem nss_builtins_items_0 [] = { { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"CVS ID", (PRUint32)7 }, { (void *)"NSS", (PRUint32)4 }, - { (void *)"@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$ $Revision$ $Date$", (PRUint32)164 } + { (void *)"@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$ $Revision$ $Date$", (PRUint32)165 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { @@ -12506,151 +12500,6 @@ static const NSSItem nss_builtins_items_186 [] = { { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"DigiNotar Root CA", (PRUint32)18 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" -"\154" -, (PRUint32)97 }, - { (void *)"0", (PRUint32)2 }, - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" -"\154" -, (PRUint32)97 }, - { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" -"\074\114" -, (PRUint32)18 }, - { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014" -"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060" -"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" -"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" -"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" -"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" -"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" -"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" -"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" -"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132" -"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060" -"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" -"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" -"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" -"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" -"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" -"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" -"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" -"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" -"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" -"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" -"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" -"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" -"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" -"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" -"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" -"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" -"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" -"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" -"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" -"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" -"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" -"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" -"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" -"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" -"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" -"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" -"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" -"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" -"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" -"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" -"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" -"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" -"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" -"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" -"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" -"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" -"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" -"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" -"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" -"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" -"\243\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\210\150\277\340\216\065\304\073\070\153" -"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" -"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" -"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" -"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" -"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" -"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" -"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" -"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" -"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" -"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" -"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" -"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" -"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" -"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" -"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" -"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" -"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" -"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" -"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" -"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" -"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" -"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" -"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" -"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" -"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" -"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" -"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" -"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" -"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" -"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" -"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" -"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" -"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" -"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" -, (PRUint32)1422 } -}; -static const NSSItem nss_builtins_items_187 [] = { - { (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 *)"DigiNotar Root CA", (PRUint32)18 }, - { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317" -"\201\147\107\214" -, (PRUint32)20 }, - { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230" -, (PRUint32)16 }, - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" -"\154" -, (PRUint32)97 }, - { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" -"\074\114" -, (PRUint32)18 }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -}; -static const NSSItem nss_builtins_items_188 [] = { - { (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 *)"Network Solutions Certificate Authority", (PRUint32)40 }, { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" @@ -12738,7 +12587,7 @@ static const NSSItem nss_builtins_items_188 [] = { "\244\140\114\260\125\240\240\173\127\262" , (PRUint32)1002 } }; -static const NSSItem nss_builtins_items_189 [] = { +static const NSSItem nss_builtins_items_187 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -12765,7 +12614,7 @@ static const NSSItem nss_builtins_items_189 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_190 [] = { +static const NSSItem nss_builtins_items_188 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -12874,7 +12723,7 @@ static const NSSItem nss_builtins_items_190 [] = { "\333" , (PRUint32)1217 } }; -static const NSSItem nss_builtins_items_191 [] = { +static const NSSItem nss_builtins_items_189 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -12902,7 +12751,7 @@ static const NSSItem nss_builtins_items_191 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_192 [] = { +static const NSSItem nss_builtins_items_190 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -12976,7 +12825,7 @@ static const NSSItem nss_builtins_items_192 [] = { "\334\335\363\377\035\054\072\026\127\331\222\071\326" , (PRUint32)653 } }; -static const NSSItem nss_builtins_items_193 [] = { +static const NSSItem nss_builtins_items_191 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13005,7 +12854,7 @@ static const NSSItem nss_builtins_items_193 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_194 [] = { +static const NSSItem nss_builtins_items_192 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13097,7 +12946,7 @@ static const NSSItem nss_builtins_items_194 [] = { "\321\236\164\310\166\147" , (PRUint32)1078 } }; -static const NSSItem nss_builtins_items_195 [] = { +static const NSSItem nss_builtins_items_193 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13122,7 +12971,7 @@ static const NSSItem nss_builtins_items_195 [] = { { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_196 [] = { +static const NSSItem nss_builtins_items_194 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13219,7 +13068,7 @@ static const NSSItem nss_builtins_items_196 [] = { "\253\205\322\140\126\132" , (PRUint32)1030 } }; -static const NSSItem nss_builtins_items_197 [] = { +static const NSSItem nss_builtins_items_195 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13247,7 +13096,7 @@ static const NSSItem nss_builtins_items_197 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_198 [] = { +static const NSSItem nss_builtins_items_196 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13332,7 +13181,7 @@ static const NSSItem nss_builtins_items_198 [] = { "\164" , (PRUint32)897 } }; -static const NSSItem nss_builtins_items_199 [] = { +static const NSSItem nss_builtins_items_197 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13358,7 +13207,7 @@ static const NSSItem nss_builtins_items_199 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_200 [] = { +static const NSSItem nss_builtins_items_198 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13455,7 +13304,7 @@ static const NSSItem nss_builtins_items_200 [] = { "\374\276\337\012\015" , (PRUint32)1013 } }; -static const NSSItem nss_builtins_items_201 [] = { +static const NSSItem nss_builtins_items_199 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13484,7 +13333,7 @@ static const NSSItem nss_builtins_items_201 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_202 [] = { +static const NSSItem nss_builtins_items_200 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13595,7 +13444,7 @@ static const NSSItem nss_builtins_items_202 [] = { "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" , (PRUint32)1151 } }; -static const NSSItem nss_builtins_items_203 [] = { +static const NSSItem nss_builtins_items_201 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13627,7 +13476,7 @@ static const NSSItem nss_builtins_items_203 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_204 [] = { +static const NSSItem nss_builtins_items_202 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13781,7 +13630,7 @@ static const NSSItem nss_builtins_items_204 [] = { "\103\307\003\340\067\116\135\012\334\131\040\045" , (PRUint32)1964 } }; -static const NSSItem nss_builtins_items_205 [] = { +static const NSSItem nss_builtins_items_203 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13809,7 +13658,7 @@ static const NSSItem nss_builtins_items_205 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_206 [] = { +static const NSSItem nss_builtins_items_204 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13890,7 +13739,7 @@ static const NSSItem nss_builtins_items_206 [] = { "\300\226\130\057\352\273\106\327\273\344\331\056" , (PRUint32)940 } }; -static const NSSItem nss_builtins_items_207 [] = { +static const NSSItem nss_builtins_items_205 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -13913,7 +13762,7 @@ static const NSSItem nss_builtins_items_207 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_208 [] = { +static const NSSItem nss_builtins_items_206 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14047,7 +13896,7 @@ static const NSSItem nss_builtins_items_208 [] = { "\005\211\374\170\326\134\054\046\103\251" , (PRUint32)1642 } }; -static const NSSItem nss_builtins_items_209 [] = { +static const NSSItem nss_builtins_items_207 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14075,7 +13924,7 @@ static const NSSItem nss_builtins_items_209 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_210 [] = { +static const NSSItem nss_builtins_items_208 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14180,7 +14029,7 @@ static const NSSItem nss_builtins_items_210 [] = { "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" , (PRUint32)1198 } }; -static const NSSItem nss_builtins_items_211 [] = { +static const NSSItem nss_builtins_items_209 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14207,7 +14056,7 @@ static const NSSItem nss_builtins_items_211 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_212 [] = { +static const NSSItem nss_builtins_items_210 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14312,7 +14161,7 @@ static const NSSItem nss_builtins_items_212 [] = { "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" , (PRUint32)1198 } }; -static const NSSItem nss_builtins_items_213 [] = { +static const NSSItem nss_builtins_items_211 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14339,7 +14188,7 @@ static const NSSItem nss_builtins_items_213 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_214 [] = { +static const NSSItem nss_builtins_items_212 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14432,7 +14281,7 @@ static const NSSItem nss_builtins_items_214 [] = { "\230" , (PRUint32)993 } }; -static const NSSItem nss_builtins_items_215 [] = { +static const NSSItem nss_builtins_items_213 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14459,7 +14308,7 @@ static const NSSItem nss_builtins_items_215 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_216 [] = { +static const NSSItem nss_builtins_items_214 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14548,7 +14397,7 @@ static const NSSItem nss_builtins_items_216 [] = { "\126\144\127" , (PRUint32)931 } }; -static const NSSItem nss_builtins_items_217 [] = { +static const NSSItem nss_builtins_items_215 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14575,7 +14424,7 @@ static const NSSItem nss_builtins_items_217 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_218 [] = { +static const NSSItem nss_builtins_items_216 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14656,7 +14505,7 @@ static const NSSItem nss_builtins_items_218 [] = { "\000\147\240\161\000\202\110" , (PRUint32)919 } }; -static const NSSItem nss_builtins_items_219 [] = { +static const NSSItem nss_builtins_items_217 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14680,7 +14529,7 @@ static const NSSItem nss_builtins_items_219 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_220 [] = { +static const NSSItem nss_builtins_items_218 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14762,7 +14611,7 @@ static const NSSItem nss_builtins_items_220 [] = { "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" , (PRUint32)943 } }; -static const NSSItem nss_builtins_items_221 [] = { +static const NSSItem nss_builtins_items_219 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14786,7 +14635,7 @@ static const NSSItem nss_builtins_items_221 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_222 [] = { +static const NSSItem nss_builtins_items_220 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14867,7 +14716,7 @@ static const NSSItem nss_builtins_items_222 [] = { "\246\210\070\316\125" , (PRUint32)933 } }; -static const NSSItem nss_builtins_items_223 [] = { +static const NSSItem nss_builtins_items_221 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -14890,7 +14739,7 @@ static const NSSItem nss_builtins_items_223 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_224 [] = { +static const NSSItem nss_builtins_items_222 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15009,7 +14858,7 @@ static const NSSItem nss_builtins_items_224 [] = { "\201\370\021\234" , (PRUint32)1460 } }; -static const NSSItem nss_builtins_items_225 [] = { +static const NSSItem nss_builtins_items_223 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15035,7 +14884,7 @@ static const NSSItem nss_builtins_items_225 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_226 [] = { +static const NSSItem nss_builtins_items_224 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15169,7 +15018,7 @@ static const NSSItem nss_builtins_items_226 [] = { "\311\234\220\332\354\251\102\074\255\266\002" , (PRUint32)1307 } }; -static const NSSItem nss_builtins_items_227 [] = { +static const NSSItem nss_builtins_items_225 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15207,7 +15056,7 @@ static const NSSItem nss_builtins_items_227 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_228 [] = { +static const NSSItem nss_builtins_items_226 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15285,7 +15134,7 @@ static const NSSItem nss_builtins_items_228 [] = { "\366\324\357\277\114\210\150" , (PRUint32)855 } }; -static const NSSItem nss_builtins_items_229 [] = { +static const NSSItem nss_builtins_items_227 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15309,7 +15158,7 @@ static const NSSItem nss_builtins_items_229 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_230 [] = { +static const NSSItem nss_builtins_items_228 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15387,7 +15236,7 @@ static const NSSItem nss_builtins_items_230 [] = { "\246\347\313\100\003\335\171" , (PRUint32)855 } }; -static const NSSItem nss_builtins_items_231 [] = { +static const NSSItem nss_builtins_items_229 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15411,7 +15260,7 @@ static const NSSItem nss_builtins_items_231 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_232 [] = { +static const NSSItem nss_builtins_items_230 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15538,7 +15387,7 @@ static const NSSItem nss_builtins_items_232 [] = { "\320\352\111\242\034\215\122\024\246\012\223" , (PRUint32)1515 } }; -static const NSSItem nss_builtins_items_233 [] = { +static const NSSItem nss_builtins_items_231 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15566,7 +15415,7 @@ static const NSSItem nss_builtins_items_233 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_234 [] = { +static const NSSItem nss_builtins_items_232 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15640,7 +15489,7 @@ static const NSSItem nss_builtins_items_234 [] = { "\366\356\260\132\116\111\104\124\130\137\102\203" , (PRUint32)828 } }; -static const NSSItem nss_builtins_items_235 [] = { +static const NSSItem nss_builtins_items_233 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15663,7 +15512,7 @@ static const NSSItem nss_builtins_items_235 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_236 [] = { +static const NSSItem nss_builtins_items_234 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15739,7 +15588,7 @@ static const NSSItem nss_builtins_items_236 [] = { "\011\333\212\101\202\236\146\233\021" , (PRUint32)857 } }; -static const NSSItem nss_builtins_items_237 [] = { +static const NSSItem nss_builtins_items_235 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15762,7 +15611,7 @@ static const NSSItem nss_builtins_items_237 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_238 [] = { +static const NSSItem nss_builtins_items_236 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15845,7 +15694,7 @@ static const NSSItem nss_builtins_items_238 [] = { "\262\033\211\124" , (PRUint32)932 } }; -static const NSSItem nss_builtins_items_239 [] = { +static const NSSItem nss_builtins_items_237 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15869,7 +15718,7 @@ static const NSSItem nss_builtins_items_239 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_240 [] = { +static const NSSItem nss_builtins_items_238 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15969,7 +15818,7 @@ static const NSSItem nss_builtins_items_240 [] = { "\021\055" , (PRUint32)1026 } }; -static const NSSItem nss_builtins_items_241 [] = { +static const NSSItem nss_builtins_items_239 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -15999,7 +15848,7 @@ static const NSSItem nss_builtins_items_241 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_242 [] = { +static const NSSItem nss_builtins_items_240 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16073,7 +15922,7 @@ static const NSSItem nss_builtins_items_242 [] = { "\367\130\077\056\162\002\127\243\217\241\024\056" , (PRUint32)652 } }; -static const NSSItem nss_builtins_items_243 [] = { +static const NSSItem nss_builtins_items_241 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16102,7 +15951,7 @@ static const NSSItem nss_builtins_items_243 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_244 [] = { +static const NSSItem nss_builtins_items_242 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16208,7 +16057,7 @@ static const NSSItem nss_builtins_items_244 [] = { "\061\324\100\032\142\064\066\077\065\001\256\254\143\240" , (PRUint32)1070 } }; -static const NSSItem nss_builtins_items_245 [] = { +static const NSSItem nss_builtins_items_243 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16240,7 +16089,7 @@ static const NSSItem nss_builtins_items_245 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_246 [] = { +static const NSSItem nss_builtins_items_244 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16319,7 +16168,7 @@ static const NSSItem nss_builtins_items_246 [] = { "\017\212" , (PRUint32)690 } }; -static const NSSItem nss_builtins_items_247 [] = { +static const NSSItem nss_builtins_items_245 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16349,7 +16198,7 @@ static const NSSItem nss_builtins_items_247 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_248 [] = { +static const NSSItem nss_builtins_items_246 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16464,7 +16313,7 @@ static const NSSItem nss_builtins_items_248 [] = { "\354\315\202\141\361\070\346\117\227\230\052\132\215" , (PRUint32)1213 } }; -static const NSSItem nss_builtins_items_249 [] = { +static const NSSItem nss_builtins_items_247 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16496,7 +16345,7 @@ static const NSSItem nss_builtins_items_249 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_250 [] = { +static const NSSItem nss_builtins_items_248 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16594,7 +16443,7 @@ static const NSSItem nss_builtins_items_250 [] = { "\055\247\330\206\052\335\056\020" , (PRUint32)904 } }; -static const NSSItem nss_builtins_items_251 [] = { +static const NSSItem nss_builtins_items_249 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16627,7 +16476,7 @@ static const NSSItem nss_builtins_items_251 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_252 [] = { +static const NSSItem nss_builtins_items_250 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16729,7 +16578,7 @@ static const NSSItem nss_builtins_items_252 [] = { "\330\316\304\143\165\077\131\107\261" , (PRUint32)1049 } }; -static const NSSItem nss_builtins_items_253 [] = { +static const NSSItem nss_builtins_items_251 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16759,7 +16608,7 @@ static const NSSItem nss_builtins_items_253 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_254 [] = { +static const NSSItem nss_builtins_items_252 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16878,7 +16727,7 @@ static const NSSItem nss_builtins_items_254 [] = { "\370\161\012\334\271\374\175\062\140\346\353\257\212\001" , (PRUint32)1486 } }; -static const NSSItem nss_builtins_items_255 [] = { +static const NSSItem nss_builtins_items_253 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16903,7 +16752,7 @@ static const NSSItem nss_builtins_items_255 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_256 [] = { +static const NSSItem nss_builtins_items_254 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -16993,7 +16842,7 @@ static const NSSItem nss_builtins_items_256 [] = { "\315\345\250" , (PRUint32)1043 } }; -static const NSSItem nss_builtins_items_257 [] = { +static const NSSItem nss_builtins_items_255 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17017,7 +16866,7 @@ static const NSSItem nss_builtins_items_257 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_258 [] = { +static const NSSItem nss_builtins_items_256 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17122,7 +16971,7 @@ static const NSSItem nss_builtins_items_258 [] = { "\115\273\306\104\333\066\313\052\234\216" , (PRUint32)1258 } }; -static const NSSItem nss_builtins_items_259 [] = { +static const NSSItem nss_builtins_items_257 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17147,7 +16996,7 @@ static const NSSItem nss_builtins_items_259 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_260 [] = { +static const NSSItem nss_builtins_items_258 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17223,7 +17072,7 @@ static const NSSItem nss_builtins_items_260 [] = { "\002\153\331\132" , (PRUint32)820 } }; -static const NSSItem nss_builtins_items_261 [] = { +static const NSSItem nss_builtins_items_259 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17247,7 +17096,7 @@ static const NSSItem nss_builtins_items_261 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_262 [] = { +static const NSSItem nss_builtins_items_260 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17329,7 +17178,7 @@ static const NSSItem nss_builtins_items_262 [] = { "\362" , (PRUint32)881 } }; -static const NSSItem nss_builtins_items_263 [] = { +static const NSSItem nss_builtins_items_261 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17354,7 +17203,7 @@ static const NSSItem nss_builtins_items_263 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_264 [] = { +static const NSSItem nss_builtins_items_262 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17470,7 +17319,7 @@ static const NSSItem nss_builtins_items_264 [] = { "\113\076\053\070\007\125\230\136\244" , (PRUint32)1465 } }; -static const NSSItem nss_builtins_items_265 [] = { +static const NSSItem nss_builtins_items_263 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17494,7 +17343,7 @@ static const NSSItem nss_builtins_items_265 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_266 [] = { +static const NSSItem nss_builtins_items_264 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17559,7 +17408,7 @@ static const NSSItem nss_builtins_items_266 [] = { "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" , (PRUint32)576 } }; -static const NSSItem nss_builtins_items_267 [] = { +static const NSSItem nss_builtins_items_265 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17586,7 +17435,7 @@ static const NSSItem nss_builtins_items_267 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_268 [] = { +static const NSSItem nss_builtins_items_266 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17651,7 +17500,7 @@ static const NSSItem nss_builtins_items_268 [] = { "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" , (PRUint32)576 } }; -static const NSSItem nss_builtins_items_269 [] = { +static const NSSItem nss_builtins_items_267 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17678,7 +17527,7 @@ static const NSSItem nss_builtins_items_269 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_270 [] = { +static const NSSItem nss_builtins_items_268 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17775,7 +17624,7 @@ static const NSSItem nss_builtins_items_270 [] = { "\202\042\055\172\124\253\160\303\175\042\145\202\160\226" , (PRUint32)1038 } }; -static const NSSItem nss_builtins_items_271 [] = { +static const NSSItem nss_builtins_items_269 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17803,7 +17652,7 @@ static const NSSItem nss_builtins_items_271 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_272 [] = { +static const NSSItem nss_builtins_items_270 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17894,7 +17743,7 @@ static const NSSItem nss_builtins_items_272 [] = { "\336\102\343\055\202\361\017\345\372\227" , (PRUint32)954 } }; -static const NSSItem nss_builtins_items_273 [] = { +static const NSSItem nss_builtins_items_271 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -17922,7 +17771,7 @@ static const NSSItem nss_builtins_items_273 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_274 [] = { +static const NSSItem nss_builtins_items_272 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18001,7 +17850,7 @@ static const NSSItem nss_builtins_items_274 [] = { "\130\077\137" , (PRUint32)867 } }; -static const NSSItem nss_builtins_items_275 [] = { +static const NSSItem nss_builtins_items_273 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18025,7 +17874,7 @@ static const NSSItem nss_builtins_items_275 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_276 [] = { +static const NSSItem nss_builtins_items_274 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18118,7 +17967,7 @@ static const NSSItem nss_builtins_items_276 [] = { "\045\361\224\264\146" , (PRUint32)997 } }; -static const NSSItem nss_builtins_items_277 [] = { +static const NSSItem nss_builtins_items_275 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18145,7 +17994,7 @@ static const NSSItem nss_builtins_items_277 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_278 [] = { +static const NSSItem nss_builtins_items_276 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18269,7 +18118,7 @@ static const NSSItem nss_builtins_items_278 [] = { "\156\117\022\176\012\074\235\225" , (PRUint32)1560 } }; -static const NSSItem nss_builtins_items_279 [] = { +static const NSSItem nss_builtins_items_277 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18294,7 +18143,7 @@ static const NSSItem nss_builtins_items_279 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_280 [] = { +static const NSSItem nss_builtins_items_278 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18413,7 +18262,7 @@ static const NSSItem nss_builtins_items_280 [] = { "\333\374\046\210\307" , (PRUint32)1525 } }; -static const NSSItem nss_builtins_items_281 [] = { +static const NSSItem nss_builtins_items_279 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18437,7 +18286,7 @@ static const NSSItem nss_builtins_items_281 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_282 [] = { +static const NSSItem nss_builtins_items_280 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18593,7 +18442,7 @@ static const NSSItem nss_builtins_items_282 [] = { "\167\110\320" , (PRUint32)1875 } }; -static const NSSItem nss_builtins_items_283 [] = { +static const NSSItem nss_builtins_items_281 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18624,7 +18473,7 @@ static const NSSItem nss_builtins_items_283 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_284 [] = { +static const NSSItem nss_builtins_items_282 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18777,7 +18626,7 @@ static const NSSItem nss_builtins_items_284 [] = { "\351\233\256\325\124\300\164\200\321\013\102\237\301" , (PRUint32)1869 } }; -static const NSSItem nss_builtins_items_285 [] = { +static const NSSItem nss_builtins_items_283 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18807,7 +18656,7 @@ static const NSSItem nss_builtins_items_285 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_286 [] = { +static const NSSItem nss_builtins_items_284 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18943,7 +18792,7 @@ static const NSSItem nss_builtins_items_286 [] = { "\242\355\264\324\265\145\103\267\223\106\212\323" , (PRUint32)1532 } }; -static const NSSItem nss_builtins_items_287 [] = { +static const NSSItem nss_builtins_items_285 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -18973,7 +18822,7 @@ static const NSSItem nss_builtins_items_287 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_288 [] = { +static const NSSItem nss_builtins_items_286 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19124,7 +18973,7 @@ static const NSSItem nss_builtins_items_288 [] = { "\264" , (PRUint32)1761 } }; -static const NSSItem nss_builtins_items_289 [] = { +static const NSSItem nss_builtins_items_287 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19154,7 +19003,7 @@ static const NSSItem nss_builtins_items_289 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_290 [] = { +static const NSSItem nss_builtins_items_288 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19290,7 +19139,7 @@ static const NSSItem nss_builtins_items_290 [] = { "\111\043" , (PRUint32)1522 } }; -static const NSSItem nss_builtins_items_291 [] = { +static const NSSItem nss_builtins_items_289 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19320,7 +19169,7 @@ static const NSSItem nss_builtins_items_291 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_292 [] = { +static const NSSItem nss_builtins_items_290 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19455,7 +19304,7 @@ static const NSSItem nss_builtins_items_292 [] = { "\172\244\047\023\326\117\364\151" , (PRUint32)1512 } }; -static const NSSItem nss_builtins_items_293 [] = { +static const NSSItem nss_builtins_items_291 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19485,7 +19334,7 @@ static const NSSItem nss_builtins_items_293 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_294 [] = { +static const NSSItem nss_builtins_items_292 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19621,7 +19470,7 @@ static const NSSItem nss_builtins_items_294 [] = { "\302\021\254" , (PRUint32)1523 } }; -static const NSSItem nss_builtins_items_295 [] = { +static const NSSItem nss_builtins_items_293 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19651,7 +19500,7 @@ static const NSSItem nss_builtins_items_295 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_296 [] = { +static const NSSItem nss_builtins_items_294 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19787,7 +19636,7 @@ static const NSSItem nss_builtins_items_296 [] = { "\147\024\060" , (PRUint32)1523 } }; -static const NSSItem nss_builtins_items_297 [] = { +static const NSSItem nss_builtins_items_295 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19817,7 +19666,7 @@ static const NSSItem nss_builtins_items_297 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_298 [] = { +static const NSSItem nss_builtins_items_296 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19951,7 +19800,7 @@ static const NSSItem nss_builtins_items_298 [] = { "\217\116\235\306\066\347\134\246\253\022\017\326\317" , (PRUint32)1501 } }; -static const NSSItem nss_builtins_items_299 [] = { +static const NSSItem nss_builtins_items_297 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -19981,7 +19830,7 @@ static const NSSItem nss_builtins_items_299 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_300 [] = { +static const NSSItem nss_builtins_items_298 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20115,7 +19964,7 @@ static const NSSItem nss_builtins_items_300 [] = { "\130\113\161\203\237\146\346\254\171\110\376\376\107" , (PRUint32)1501 } }; -static const NSSItem nss_builtins_items_301 [] = { +static const NSSItem nss_builtins_items_299 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20145,7 +19994,7 @@ static const NSSItem nss_builtins_items_301 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_302 [] = { +static const NSSItem nss_builtins_items_300 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20280,7 +20129,7 @@ static const NSSItem nss_builtins_items_302 [] = { "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352" , (PRUint32)1520 } }; -static const NSSItem nss_builtins_items_303 [] = { +static const NSSItem nss_builtins_items_301 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20310,7 +20159,7 @@ static const NSSItem nss_builtins_items_303 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_304 [] = { +static const NSSItem nss_builtins_items_302 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20438,7 +20287,7 @@ static const NSSItem nss_builtins_items_304 [] = { "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221" , (PRUint32)1392 } }; -static const NSSItem nss_builtins_items_305 [] = { +static const NSSItem nss_builtins_items_303 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20468,7 +20317,7 @@ static const NSSItem nss_builtins_items_305 [] = { { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_306 [] = { +static const NSSItem nss_builtins_items_304 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20561,7 +20410,7 @@ static const NSSItem nss_builtins_items_306 [] = { "\342\342\104\276\134\367\352\034\365" , (PRUint32)969 } }; -static const NSSItem nss_builtins_items_307 [] = { +static const NSSItem nss_builtins_items_305 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20589,7 +20438,7 @@ static const NSSItem nss_builtins_items_307 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_308 [] = { +static const NSSItem nss_builtins_items_306 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20686,7 +20535,7 @@ static const NSSItem nss_builtins_items_308 [] = { "\364" , (PRUint32)993 } }; -static const NSSItem nss_builtins_items_309 [] = { +static const NSSItem nss_builtins_items_307 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20715,7 +20564,7 @@ static const NSSItem nss_builtins_items_309 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_310 [] = { +static const NSSItem nss_builtins_items_308 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20813,7 +20662,7 @@ static const NSSItem nss_builtins_items_310 [] = { "\261\050\272" , (PRUint32)1011 } }; -static const NSSItem nss_builtins_items_311 [] = { +static const NSSItem nss_builtins_items_309 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20842,7 +20691,7 @@ static const NSSItem nss_builtins_items_311 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_312 [] = { +static const NSSItem nss_builtins_items_310 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20919,7 +20768,7 @@ static const NSSItem nss_builtins_items_312 [] = { "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357" , (PRUint32)848 } }; -static const NSSItem nss_builtins_items_313 [] = { +static const NSSItem nss_builtins_items_311 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -20943,7 +20792,7 @@ static const NSSItem nss_builtins_items_313 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_314 [] = { +static const NSSItem nss_builtins_items_312 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21020,7 +20869,7 @@ static const NSSItem nss_builtins_items_314 [] = { "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333" , (PRUint32)848 } }; -static const NSSItem nss_builtins_items_315 [] = { +static const NSSItem nss_builtins_items_313 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21044,7 +20893,7 @@ static const NSSItem nss_builtins_items_315 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_316 [] = { +static const NSSItem nss_builtins_items_314 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21153,7 +21002,7 @@ static const NSSItem nss_builtins_items_316 [] = { "\051\340\266\270\011\150\031\034\030\103" , (PRUint32)1354 } }; -static const NSSItem nss_builtins_items_317 [] = { +static const NSSItem nss_builtins_items_315 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21177,7 +21026,7 @@ static const NSSItem nss_builtins_items_317 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_318 [] = { +static const NSSItem nss_builtins_items_316 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21234,7 +21083,7 @@ static const NSSItem nss_builtins_items_318 [] = { "\214\171" , (PRUint32)514 } }; -static const NSSItem nss_builtins_items_319 [] = { +static const NSSItem nss_builtins_items_317 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21258,7 +21107,7 @@ static const NSSItem nss_builtins_items_319 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_320 [] = { +static const NSSItem nss_builtins_items_318 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21348,7 +21197,7 @@ static const NSSItem nss_builtins_items_320 [] = { "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054" , (PRUint32)959 } }; -static const NSSItem nss_builtins_items_321 [] = { +static const NSSItem nss_builtins_items_319 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21375,7 +21224,7 @@ static const NSSItem nss_builtins_items_321 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_322 [] = { +static const NSSItem nss_builtins_items_320 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21493,7 +21342,7 @@ static const NSSItem nss_builtins_items_322 [] = { "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171" , (PRUint32)1440 } }; -static const NSSItem nss_builtins_items_323 [] = { +static const NSSItem nss_builtins_items_321 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21519,7 +21368,7 @@ static const NSSItem nss_builtins_items_323 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_324 [] = { +static const NSSItem nss_builtins_items_322 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21652,7 +21501,7 @@ static const NSSItem nss_builtins_items_324 [] = { "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303" , (PRUint32)1679 } }; -static const NSSItem nss_builtins_items_325 [] = { +static const NSSItem nss_builtins_items_323 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21678,7 +21527,7 @@ static const NSSItem nss_builtins_items_325 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_326 [] = { +static const NSSItem nss_builtins_items_324 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21772,7 +21621,7 @@ static const NSSItem nss_builtins_items_326 [] = { "\204\232\315" , (PRUint32)979 } }; -static const NSSItem nss_builtins_items_327 [] = { +static const NSSItem nss_builtins_items_325 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21800,7 +21649,7 @@ static const NSSItem nss_builtins_items_327 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; -static const NSSItem nss_builtins_items_328 [] = { +static const NSSItem nss_builtins_items_326 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -21884,7 +21733,7 @@ static const NSSItem nss_builtins_items_328 [] = { "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257" , (PRUint32)895 } }; -static const NSSItem nss_builtins_items_329 [] = { +static const NSSItem nss_builtins_items_327 [] = { { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -22242,13 +22091,11 @@ nss_builtins_data[] = { { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, - { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, - { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, - { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} } + { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } }; const PRUint32 #ifdef DEBUG - nss_builtins_nObjects = 329+1; + nss_builtins_nObjects = 327+1; #else - nss_builtins_nObjects = 329; + nss_builtins_nObjects = 327; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index 4d5759ec6..c1bd8d2dd 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -12461,161 +12461,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DigiNotar Root CA" -# -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 "DigiNotar Root CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 -\154 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 -\154 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 -\074\114 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014 -\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 -\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 -\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 -\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 -\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 -\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 -\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 -\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132 -\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060 -\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 -\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 -\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 -\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 -\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 -\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 -\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 -\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 -\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 -\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 -\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 -\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 -\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 -\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 -\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 -\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 -\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 -\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 -\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 -\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 -\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 -\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 -\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 -\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 -\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 -\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 -\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 -\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 -\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 -\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 -\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 -\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 -\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 -\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 -\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 -\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 -\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 -\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 -\243\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\210\150\277\340\216\065\304\073\070\153 -\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 -\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 -\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 -\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 -\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 -\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 -\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 -\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 -\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 -\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 -\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 -\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 -\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 -\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 -\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 -\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 -\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 -\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 -\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 -\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 -\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 -\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 -\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 -\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 -\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 -\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 -\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 -\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 -\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 -\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 -\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 -\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 -\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 -\262\345\214\360\206\231\270\345\305\337\204\301\267\353 -END - -# Trust for Certificate "DigiNotar Root CA" -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 "DigiNotar Root CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317 -\201\147\107\214 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230 -END -CKA_ISSUER MULTILINE_OCTAL -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 -\154 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 -\074\114 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# # Certificate "Network Solutions Certificate Authority" # 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 bc50dcf88..177334698 100644 --- a/security/nss/lib/ckfw/builtins/nssckbi.h +++ b/security/nss/lib/ckfw/builtins/nssckbi.h @@ -77,8 +77,8 @@ * of the comment in the CK_VERSION type definition. */ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84 -#define NSS_BUILTINS_LIBRARY_VERSION "1.84" +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85 +#define NSS_BUILTINS_LIBRARY_VERSION "1.85" /* These version numbers detail the semantic changes to the ckfw engine. */ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 |