From c35a432051fe5e4f42c8b35845af5eddf00ddeb3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 16 Apr 2010 14:44:11 +0200 Subject: nss: update to 3.12.6 --- recipes/mozilla/nss-3.12.6/00_ckbi_1.79.patch | 6386 ++++++++++++++++++++ recipes/mozilla/nss-3.12.6/25_entropy.patch | 22 + recipes/mozilla/nss-3.12.6/38_hurd.patch | 59 + recipes/mozilla/nss-3.12.6/38_kbsd.patch | 152 + recipes/mozilla/nss-3.12.6/38_mips64_build.patch | 27 + recipes/mozilla/nss-3.12.6/80_security_build.patch | 17 + recipes/mozilla/nss-3.12.6/80_security_tools.patch | 26 + recipes/mozilla/nss-3.12.6/81_sonames.patch | 351 ++ recipes/mozilla/nss-3.12.6/85_security_load.patch | 79 + recipes/mozilla/nss-3.12.6/90_realpath.patch | 35 + .../mozilla/nss-3.12.6/91_build_pwdecrypt.patch | 17 + .../nss-3.12.6/95_add_spi+cacert_ca_certs.patch | 1168 ++++ .../mozilla/nss-3.12.6/96_NSS_VersionCheck.patch | 18 + .../97_SSL_RENEGOTIATE_TRANSITIONAL.patch | 21 + recipes/mozilla/nss-3.12.6/build-fix.patch | 63 + recipes/mozilla/nss-3.12.6/nss.pc.in | 11 + recipes/mozilla/nss-3.12.6/series | 14 + recipes/mozilla/nss_3.12.6.bb | 105 + 18 files changed, 8571 insertions(+) create mode 100644 recipes/mozilla/nss-3.12.6/00_ckbi_1.79.patch create mode 100644 recipes/mozilla/nss-3.12.6/25_entropy.patch create mode 100644 recipes/mozilla/nss-3.12.6/38_hurd.patch create mode 100644 recipes/mozilla/nss-3.12.6/38_kbsd.patch create mode 100644 recipes/mozilla/nss-3.12.6/38_mips64_build.patch create mode 100644 recipes/mozilla/nss-3.12.6/80_security_build.patch create mode 100644 recipes/mozilla/nss-3.12.6/80_security_tools.patch create mode 100644 recipes/mozilla/nss-3.12.6/81_sonames.patch create mode 100644 recipes/mozilla/nss-3.12.6/85_security_load.patch create mode 100644 recipes/mozilla/nss-3.12.6/90_realpath.patch create mode 100644 recipes/mozilla/nss-3.12.6/91_build_pwdecrypt.patch create mode 100644 recipes/mozilla/nss-3.12.6/95_add_spi+cacert_ca_certs.patch create mode 100644 recipes/mozilla/nss-3.12.6/96_NSS_VersionCheck.patch create mode 100644 recipes/mozilla/nss-3.12.6/97_SSL_RENEGOTIATE_TRANSITIONAL.patch create mode 100644 recipes/mozilla/nss-3.12.6/build-fix.patch create mode 100644 recipes/mozilla/nss-3.12.6/nss.pc.in create mode 100644 recipes/mozilla/nss-3.12.6/series create mode 100644 recipes/mozilla/nss_3.12.6.bb diff --git a/recipes/mozilla/nss-3.12.6/00_ckbi_1.79.patch b/recipes/mozilla/nss-3.12.6/00_ckbi_1.79.patch new file mode 100644 index 0000000000..65b2e0d776 --- /dev/null +++ b/recipes/mozilla/nss-3.12.6/00_ckbi_1.79.patch @@ -0,0 +1,6386 @@ +diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +index 2c6fdab..52b78ad 100644 +--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c ++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -960,66 +960,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_300 [] = { + static const CK_ATTRIBUTE_TYPE nss_builtins_types_301 [] = { + 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_302 [] = { +- 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_303 [] = { +- 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_304 [] = { +- 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_305 [] = { +- 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_306 [] = { +- 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_307 [] = { +- 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_308 [] = { +- 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_309 [] = { +- 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_310 [] = { +- 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_311 [] = { +- 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_312 [] = { +- 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_313 [] = { +- 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_314 [] = { +- 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_315 [] = { +- 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_316 [] = { +- 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_317 [] = { +- 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_318 [] = { +- 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_319 [] = { +- 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_320 [] = { +- 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_321 [] = { +- 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) }, +@@ -1028,7 +968,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: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -1043,98 +983,6 @@ static const NSSItem nss_builtins_items_2 [] = { + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"Verisign/RSA Secure Server CA", (PRUint32)30 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141" +-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143" +-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165" +-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141" +-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143" +-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165" +-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136" +-"\335\300" +-, (PRUint32)18 }, +- { (void *)"\060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105" +-"\376\136\127\157\074\230\031\136\335\300\060\015\006\011\052\206" +-"\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006" +-"\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004" +-"\012\023\027\122\123\101\040\104\141\164\141\040\123\145\143\165" +-"\162\151\164\171\054\040\111\156\143\056\061\056\060\054\006\003" +-"\125\004\013\023\045\123\145\143\165\162\145\040\123\145\162\166" +-"\145\162\040\103\145\162\164\151\146\151\143\141\164\151\157\156" +-"\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\064" +-"\061\061\060\071\060\060\060\060\060\060\132\027\015\061\060\060" +-"\061\060\067\062\063\065\071\065\071\132\060\137\061\013\060\011" +-"\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125" +-"\004\012\023\027\122\123\101\040\104\141\164\141\040\123\145\143" +-"\165\162\151\164\171\054\040\111\156\143\056\061\056\060\054\006" +-"\003\125\004\013\023\045\123\145\143\165\162\145\040\123\145\162" +-"\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151\157" +-"\156\040\101\165\164\150\157\162\151\164\171\060\201\233\060\015" +-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\211" +-"\000\060\201\205\002\176\000\222\316\172\301\256\203\076\132\252" +-"\211\203\127\254\045\001\166\014\255\256\216\054\067\316\353\065" +-"\170\144\124\003\345\204\100\121\311\277\217\010\342\212\202\010" +-"\322\026\206\067\125\351\261\041\002\255\166\150\201\232\005\242" +-"\113\311\113\045\146\042\126\154\210\007\217\367\201\131\155\204" +-"\007\145\160\023\161\166\076\233\167\114\343\120\211\126\230\110" +-"\271\035\247\051\032\023\056\112\021\131\234\036\025\325\111\124" +-"\054\163\072\151\202\261\227\071\234\155\160\147\110\345\335\055" +-"\326\310\036\173\002\003\001\000\001\060\015\006\011\052\206\110" +-"\206\367\015\001\001\002\005\000\003\176\000\145\335\176\341\262" +-"\354\260\342\072\340\354\161\106\232\031\021\270\323\307\240\264" +-"\003\100\046\002\076\011\234\341\022\263\321\132\366\067\245\267" +-"\141\003\266\133\026\151\073\306\104\010\014\210\123\014\153\227" +-"\111\307\076\065\334\154\271\273\252\337\134\273\072\057\223\140" +-"\266\251\113\115\362\040\367\315\137\177\144\173\216\334\000\134" +-"\327\372\167\312\071\026\131\157\016\352\323\265\203\177\115\115" +-"\102\126\166\264\311\137\004\370\070\370\353\322\137\165\137\315" +-"\173\374\345\216\200\174\374\120" +-, (PRUint32)568 } +-}; +-static const NSSItem nss_builtins_items_3 [] = { +- { (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 *)"Verisign/RSA Secure Server CA", (PRUint32)30 }, +- { (void *)"\104\143\305\061\327\314\301\000\147\224\141\053\266\126\323\277" +-"\202\127\204\157" +-, (PRUint32)20 }, +- { (void *)"\164\173\202\003\103\360\000\236\153\263\354\107\277\205\245\223" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141" +-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143" +-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165" +-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146" +-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" +-"\171" +-, (PRUint32)97 }, +- { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136" +-"\335\300" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_4 [] = { +- { (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 *)"GTE CyberTrust Root CA", (PRUint32)23 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +@@ -1186,7 +1034,7 @@ static const NSSItem nss_builtins_items_4 [] = { + "\264\172\341\345\132\037\204\060\234\323\237\245\045\330" + , (PRUint32)510 } + }; +-static const NSSItem nss_builtins_items_5 [] = { ++static const NSSItem nss_builtins_items_3 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1205,12 +1053,12 @@ static const NSSItem nss_builtins_items_5 [] = { + , (PRUint32)71 }, + { (void *)"\002\002\001\243" + , (PRUint32)4 }, +- { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_6 [] = { ++static const NSSItem nss_builtins_items_4 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1278,7 +1126,7 @@ static const NSSItem nss_builtins_items_6 [] = { + "\037\042\265\315\225\255\272\247\314\371\253\013\172\177" + , (PRUint32)606 } + }; +-static const NSSItem nss_builtins_items_7 [] = { ++static const NSSItem nss_builtins_items_5 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1303,258 +1151,9 @@ static const NSSItem nss_builtins_items_7 [] = { + { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_8 [] = { +- { (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 *)"Thawte Personal Basic CA", (PRUint32)25 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" +-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" +-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" +-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" +-, (PRUint32)206 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" +-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" +-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" +-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" +-, (PRUint32)206 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101\061" +-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162" +-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023" +-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003" +-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" +-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023" +-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123" +-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156" +-"\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167\164" +-"\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151\143" +-"\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001" +-"\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163" +-"\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027" +-"\015\071\066\060\061\060\061\060\060\060\060\060\060\132\027\015" +-"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\313" +-"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060" +-"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040" +-"\103\141\160\145\061\022\060\020\006\003\125\004\007\023\011\103" +-"\141\160\145\040\124\157\167\156\061\032\060\030\006\003\125\004" +-"\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154" +-"\164\151\156\147\061\050\060\046\006\003\125\004\013\023\037\103" +-"\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162" +-"\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061\041" +-"\060\037\006\003\125\004\003\023\030\124\150\141\167\164\145\040" +-"\120\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103" +-"\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001" +-"\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143" +-"\100\164\150\141\167\164\145\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\274\274\223\123\155\300\120\117" +-"\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167" +-"\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151" +-"\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067" +-"\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112" +-"\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323" +-"\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271" +-"\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373" +-"\033\133\030\321\277\043\223\041\002\003\001\000\001\243\023\060" +-"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001" +-"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005" +-"\000\003\201\201\000\055\342\231\153\260\075\172\211\327\131\242" +-"\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221" +-"\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373" +-"\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205" +-"\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267" +-"\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117" +-"\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006" +-"\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143" +-"\126\241\337\042\261" +-, (PRUint32)805 } +-}; +-static const NSSItem nss_builtins_items_9 [] = { +- { (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 *)"Thawte Personal Basic CA", (PRUint32)25 }, +- { (void *)"\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074" +-"\272\241\133\374" +-, (PRUint32)20 }, +- { (void *)"\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101" +-, (PRUint32)16 }, +- { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151" +-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015" +-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" +-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155" +-, (PRUint32)206 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (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_10 [] = { +- { (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 *)"Thawte Personal Premium CA", (PRUint32)27 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" +-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" +-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" +-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" +-"\157\155" +-, (PRUint32)210 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" +-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" +-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" +-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" +-"\157\155" +-, (PRUint32)210 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000" +-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" +-"\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101\061" +-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162" +-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023" +-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003" +-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163" +-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023" +-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123" +-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156" +-"\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164" +-"\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151" +-"\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367" +-"\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160" +-"\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157" +-"\155\060\036\027\015\071\066\060\061\060\061\060\060\060\060\060" +-"\060\132\027\015\062\060\061\062\063\061\062\063\065\071\065\071" +-"\132\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132" +-"\101\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164" +-"\145\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004" +-"\007\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030" +-"\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157" +-"\156\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004" +-"\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156" +-"\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151" +-"\157\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141" +-"\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145" +-"\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110" +-"\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154" +-"\055\160\162\145\155\151\165\155\100\164\150\141\167\164\145\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" +-"\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154" +-"\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175" +-"\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256" +-"\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210" +-"\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116" +-"\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377" +-"\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003" +-"\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165" +-"\002\003\001\000\001\243\023\060\021\060\017\006\003\125\035\023" +-"\001\001\377\004\005\060\003\001\001\377\060\015\006\011\052\206" +-"\110\206\367\015\001\001\004\005\000\003\201\201\000\151\066\211" +-"\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066" +-"\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007" +-"\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000" +-"\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164" +-"\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141" +-"\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122" +-"\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057" +-"\120\333\007\303\352\037\253\063\340\365\053\061\211" +-, (PRUint32)813 } +-}; +-static const NSSItem nss_builtins_items_11 [] = { +- { (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 *)"Thawte Personal Premium CA", (PRUint32)27 }, +- { (void *)"\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066" +-"\150\010\154\316" +-, (PRUint32)20 }, +- { (void *)"\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015" +-, (PRUint32)16 }, +- { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101" +-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145" +-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007" +-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006" +-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156" +-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013" +-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040" +-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157" +-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167" +-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155" +-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206" +-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055" +-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" +-"\157\155" +-, (PRUint32)210 }, +- { (void *)"\002\001\000" +-, (PRUint32)3 }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (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_12 [] = { ++static const NSSItem nss_builtins_items_6 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1648,7 +1247,7 @@ static const NSSItem nss_builtins_items_12 [] = { + "\201" + , (PRUint32)817 } + }; +-static const NSSItem nss_builtins_items_13 [] = { ++static const NSSItem nss_builtins_items_7 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1681,7 +1280,7 @@ static const NSSItem nss_builtins_items_13 [] = { + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_14 [] = { ++static const NSSItem nss_builtins_items_8 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1771,7 +1370,7 @@ static const NSSItem nss_builtins_items_14 [] = { + "\243\377\212\043\056\160\107" + , (PRUint32)791 } + }; +-static const NSSItem nss_builtins_items_15 [] = { ++static const NSSItem nss_builtins_items_9 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1801,9 +1400,9 @@ static const NSSItem nss_builtins_items_15 [] = { + { (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_true, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_16 [] = { ++static const NSSItem nss_builtins_items_10 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1896,7 +1495,7 @@ static const NSSItem nss_builtins_items_16 [] = { + "\246\015\246\043\371\273\313\246\007\024\102" + , (PRUint32)811 } + }; +-static const NSSItem nss_builtins_items_17 [] = { ++static const NSSItem nss_builtins_items_11 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -1927,9 +1526,9 @@ static const NSSItem nss_builtins_items_17 [] = { + { (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_true, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_18 [] = { ++static const NSSItem nss_builtins_items_12 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2004,7 +1603,7 @@ static const NSSItem nss_builtins_items_18 [] = { + "\254\007\167\070" + , (PRUint32)804 } + }; +-static const NSSItem nss_builtins_items_19 [] = { ++static const NSSItem nss_builtins_items_13 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2028,129 +1627,7 @@ static const NSSItem nss_builtins_items_19 [] = { + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_20 [] = { +- { (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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060" +-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164" +-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101" +-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006" +-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122" +-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206" +-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)140 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060" +-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164" +-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101" +-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006" +-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122" +-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206" +-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)140 }, +- { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000" +-"\000\000\004" +-, (PRUint32)19 }, +- { (void *)"\060\202\003\265\060\202\002\235\240\003\002\001\002\002\021\000" +-"\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000\004" +-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" +-"\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +-"\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060\021" +-"\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164\157" +-"\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101\056" +-"\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006\003" +-"\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122\157" +-"\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206\367" +-"\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147\163" +-"\151\147\164\162\165\163\164\056\143\157\155\060\036\027\015\071" +-"\071\060\067\061\062\061\067\063\063\065\063\132\027\015\060\071" +-"\060\067\060\071\061\067\063\063\065\063\132\060\201\211\061\013" +-"\060\011\006\003\125\004\006\023\002\125\123\061\013\060\011\006" +-"\003\125\004\010\023\002\104\103\061\023\060\021\006\003\125\004" +-"\007\023\012\127\141\163\150\151\156\147\164\157\156\061\027\060" +-"\025\006\003\125\004\012\023\016\101\102\101\056\105\103\117\115" +-"\054\040\111\116\103\056\061\031\060\027\006\003\125\004\003\023" +-"\020\101\102\101\056\105\103\117\115\040\122\157\157\164\040\103" +-"\101\061\044\060\042\006\011\052\206\110\206\367\015\001\011\001" +-"\026\025\141\144\155\151\156\100\144\151\147\163\151\147\164\162" +-"\165\163\164\056\143\157\155\060\202\001\042\060\015\006\011\052" +-"\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060" +-"\202\001\012\002\202\001\001\000\261\323\021\340\171\125\103\007" +-"\010\114\313\005\102\000\342\015\203\106\075\344\223\272\266\006" +-"\323\015\131\275\076\301\316\103\147\001\212\041\250\357\274\314" +-"\320\242\314\260\125\226\123\204\146\005\000\332\104\111\200\330" +-"\124\012\245\045\206\224\355\143\126\377\160\154\243\241\031\322" +-"\170\276\150\052\104\136\057\317\314\030\136\107\274\072\261\106" +-"\075\036\360\271\054\064\137\214\174\114\010\051\235\100\125\353" +-"\074\175\203\336\265\360\367\212\203\016\241\114\264\072\245\263" +-"\137\132\042\227\354\031\233\301\005\150\375\346\267\251\221\224" +-"\054\344\170\110\044\032\045\031\072\353\225\234\071\012\212\317" +-"\102\262\360\034\325\137\373\153\355\150\126\173\071\054\162\070" +-"\260\356\223\251\323\173\167\074\353\161\003\251\070\112\026\154" +-"\211\052\312\332\063\023\171\302\125\214\355\234\273\362\313\133" +-"\020\370\056\141\065\306\051\114\052\320\052\143\321\145\131\264" +-"\370\315\371\364\000\204\266\127\102\205\235\062\250\371\052\124" +-"\373\377\170\101\274\275\161\050\364\273\220\274\377\226\064\004" +-"\343\105\236\241\106\050\100\201\002\003\001\000\001\243\026\060" +-"\024\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001" +-"\001\377\002\001\010\060\015\006\011\052\206\110\206\367\015\001" +-"\001\005\005\000\003\202\001\001\000\004\157\045\206\344\346\226" +-"\047\264\331\102\300\320\311\000\261\177\124\076\207\262\155\044" +-"\251\057\012\176\375\244\104\260\370\124\007\275\033\235\235\312" +-"\173\120\044\173\021\133\111\243\246\277\022\164\325\211\267\267" +-"\057\230\144\045\024\267\141\351\177\140\200\153\323\144\350\253" +-"\275\032\326\121\372\300\264\135\167\032\177\144\010\136\171\306" +-"\005\114\361\172\335\115\175\316\346\110\173\124\322\141\222\201" +-"\326\033\326\000\360\016\236\050\167\240\115\210\307\042\166\031" +-"\303\307\236\033\246\167\170\370\137\233\126\321\360\362\027\254" +-"\216\235\131\346\037\376\127\266\331\136\341\135\237\105\354\141" +-"\150\031\101\341\262\040\046\376\132\060\166\044\377\100\162\074" +-"\171\237\174\042\110\253\106\315\333\263\206\054\217\277\005\101" +-"\323\301\343\024\343\101\027\046\320\174\247\161\114\031\350\112" +-"\017\162\130\061\175\354\140\172\243\042\050\275\031\044\140\077" +-"\073\207\163\300\153\344\313\256\267\253\045\103\262\125\055\173" +-"\253\006\016\165\135\064\345\135\163\155\236\262\165\100\245\131" +-"\311\117\061\161\210\331\210\177\124" +-, (PRUint32)953 } +-}; +-static const NSSItem nss_builtins_items_21 [] = { +- { (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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 }, +- { (void *)"\172\164\101\017\260\315\134\227\052\066\113\161\277\003\035\210" +-"\246\121\016\236" +-, (PRUint32)20 }, +- { (void *)"\101\270\007\367\250\321\011\356\264\232\216\160\115\374\033\170" +-, (PRUint32)16 }, +- { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123" +-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060" +-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164" +-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101" +-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006" +-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122" +-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206" +-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)140 }, +- { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000" +-"\000\000\004" +-, (PRUint32)19 }, +- { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_22 [] = { ++static const NSSItem nss_builtins_items_14 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2225,7 +1702,7 @@ static const NSSItem nss_builtins_items_22 [] = { + "\241\223\004\273\206\237\072\133\103\172\303\212\145" + , (PRUint32)813 } + }; +-static const NSSItem nss_builtins_items_23 [] = { ++static const NSSItem nss_builtins_items_15 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2247,9 +1724,9 @@ static const NSSItem nss_builtins_items_23 [] = { + { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_24 [] = { ++static const NSSItem nss_builtins_items_16 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2324,7 +1801,7 @@ static const NSSItem nss_builtins_items_24 [] = { + "\307\177\033\033\326\006\040\002\130\241\303\242\003" + , (PRUint32)813 } + }; +-static const NSSItem nss_builtins_items_25 [] = { ++static const NSSItem nss_builtins_items_17 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2346,269 +1823,9 @@ static const NSSItem nss_builtins_items_25 [] = { + { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_26 [] = { +- { (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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000" +-"\000\000\001" +-, (PRUint32)19 }, +- { (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000" +-"\000\002\174\000\000\000\002\000\000\000\001\060\015\006\011\052" +-"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060" +-"\011\006\003\125\004\006\023\002\165\163\061\015\060\013\006\003" +-"\125\004\010\023\004\125\164\141\150\061\027\060\025\006\003\125" +-"\004\007\023\016\123\141\154\164\040\114\141\153\145\040\103\151" +-"\164\171\061\044\060\042\006\003\125\004\012\023\033\104\151\147" +-"\151\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124" +-"\162\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004" +-"\013\023\010\104\123\124\103\101\040\130\061\061\026\060\024\006" +-"\003\125\004\003\023\015\104\123\124\040\122\157\157\164\103\101" +-"\040\130\061\061\041\060\037\006\011\052\206\110\206\367\015\001" +-"\011\001\026\022\143\141\100\144\151\147\163\151\147\164\162\165" +-"\163\164\056\143\157\155\060\036\027\015\071\070\061\062\060\061" +-"\061\070\061\070\065\065\132\027\015\060\070\061\061\062\070\061" +-"\070\061\070\065\065\132\060\201\251\061\013\060\011\006\003\125" +-"\004\006\023\002\165\163\061\015\060\013\006\003\125\004\010\023" +-"\004\125\164\141\150\061\027\060\025\006\003\125\004\007\023\016" +-"\123\141\154\164\040\114\141\153\145\040\103\151\164\171\061\044" +-"\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141\154" +-"\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163\164" +-"\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010\104" +-"\123\124\103\101\040\130\061\061\026\060\024\006\003\125\004\003" +-"\023\015\104\123\124\040\122\157\157\164\103\101\040\130\061\061" +-"\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022" +-"\143\141\100\144\151\147\163\151\147\164\162\165\163\164\056\143" +-"\157\155\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\322\306\046\266\347\245\075\301\304\150\325\120\157" +-"\123\305\157\111\023\011\270\257\054\110\215\024\152\243\027\137" +-"\132\371\323\056\165\057\330\050\142\321\223\057\374\115\324\253" +-"\207\345\010\307\231\347\222\077\165\275\353\045\264\025\301\233" +-"\031\075\322\104\215\327\164\040\155\067\002\217\151\223\133\212" +-"\304\031\235\364\262\016\374\026\154\271\261\005\222\203\321\205" +-"\054\140\224\076\105\125\240\331\253\010\041\346\140\350\073\164" +-"\362\231\120\121\150\320\003\055\261\200\276\243\330\122\260\104" +-"\315\103\112\160\216\130\205\225\341\116\054\326\055\101\157\326" +-"\204\347\310\230\104\312\107\333\054\044\245\151\046\317\153\270" +-"\047\142\303\364\311\172\222\043\355\023\147\202\256\105\056\105" +-"\345\176\162\077\205\235\224\142\020\346\074\221\241\255\167\000" +-"\340\025\354\363\204\200\162\172\216\156\140\227\307\044\131\020" +-"\064\203\133\341\245\244\151\266\127\065\034\170\131\306\323\057" +-"\072\163\147\356\224\312\004\023\005\142\006\160\043\263\364\174" +-"\356\105\331\144\013\133\111\252\244\103\316\046\304\104\022\154" +-"\270\335\171\002\003\001\000\001\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\242\067\262\077" +-"\151\373\327\206\171\124\111\061\225\063\053\363\321\011\024\111" +-"\142\140\206\245\260\021\342\120\302\035\006\127\076\055\350\063" +-"\144\276\233\252\255\137\033\115\324\231\225\242\213\232\311\142" +-"\162\265\151\352\331\130\253\065\355\025\242\103\326\266\274\007" +-"\171\145\144\163\175\327\171\312\173\325\132\121\306\341\123\004" +-"\226\215\070\317\243\027\254\071\161\153\001\303\213\123\074\143" +-"\351\356\171\300\344\276\222\062\144\172\263\037\227\224\142\275" +-"\352\262\040\025\225\373\227\362\170\057\143\066\100\070\343\106" +-"\017\035\335\254\225\312\347\113\220\173\261\113\251\324\305\353" +-"\232\332\252\325\243\224\024\106\215\055\037\363\072\326\223\072" +-"\366\076\171\374\350\346\260\165\355\356\075\311\160\307\135\252" +-"\201\113\106\045\034\307\154\025\343\225\116\017\252\062\067\224" +-"\012\027\044\222\023\204\130\322\143\157\053\367\346\133\142\013" +-"\023\027\260\015\122\114\376\376\157\134\342\221\156\035\375\244" +-"\142\327\150\372\216\172\117\322\010\332\223\334\360\222\021\172" +-"\320\334\162\223\014\163\223\142\205\150\320\364" +-, (PRUint32)988 } +-}; +-static const NSSItem nss_builtins_items_27 [] = { +- { (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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 }, +- { (void *)"\267\057\377\222\322\316\103\336\012\215\114\124\214\120\067\046" +-"\250\036\053\223" +-, (PRUint32)20 }, +- { (void *)"\154\311\247\156\107\361\014\343\123\073\170\114\115\302\152\305" +-, (PRUint32)16 }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000" +-"\000\000\001" +-, (PRUint32)19 }, +- { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_28 [] = { +- { (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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000" +-"\000\000\004" +-, (PRUint32)19 }, +- { (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000" +-"\000\167\155\000\000\000\001\000\000\000\004\060\015\006\011\052" +-"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060" +-"\011\006\003\125\004\006\023\002\165\163\061\015\060\013\006\003" +-"\125\004\010\023\004\125\164\141\150\061\027\060\025\006\003\125" +-"\004\007\023\016\123\141\154\164\040\114\141\153\145\040\103\151" +-"\164\171\061\044\060\042\006\003\125\004\012\023\033\104\151\147" +-"\151\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124" +-"\162\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004" +-"\013\023\010\104\123\124\103\101\040\130\062\061\026\060\024\006" +-"\003\125\004\003\023\015\104\123\124\040\122\157\157\164\103\101" +-"\040\130\062\061\041\060\037\006\011\052\206\110\206\367\015\001" +-"\011\001\026\022\143\141\100\144\151\147\163\151\147\164\162\165" +-"\163\164\056\143\157\155\060\036\027\015\071\070\061\061\063\060" +-"\062\062\064\066\061\066\132\027\015\060\070\061\061\062\067\062" +-"\062\064\066\061\066\132\060\201\251\061\013\060\011\006\003\125" +-"\004\006\023\002\165\163\061\015\060\013\006\003\125\004\010\023" +-"\004\125\164\141\150\061\027\060\025\006\003\125\004\007\023\016" +-"\123\141\154\164\040\114\141\153\145\040\103\151\164\171\061\044" +-"\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141\154" +-"\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163\164" +-"\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010\104" +-"\123\124\103\101\040\130\062\061\026\060\024\006\003\125\004\003" +-"\023\015\104\123\124\040\122\157\157\164\103\101\040\130\062\061" +-"\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022" +-"\143\141\100\144\151\147\163\151\147\164\162\165\163\164\056\143" +-"\157\155\060\202\001\042\060\015\006\011\052\206\110\206\367\015" +-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" +-"\001\001\000\334\165\360\214\300\165\226\232\300\142\037\046\367" +-"\304\341\232\352\340\126\163\133\231\315\001\104\250\010\266\325" +-"\247\332\032\004\030\071\222\112\170\243\201\302\365\167\172\120" +-"\264\160\377\232\253\306\307\312\156\203\117\102\230\373\046\013" +-"\332\334\155\326\251\231\125\122\147\351\050\003\222\334\345\260" +-"\005\232\017\025\371\153\131\162\126\362\372\071\374\252\150\356" +-"\017\037\020\203\057\374\235\372\027\226\335\202\343\346\105\175" +-"\300\113\200\104\037\355\054\340\204\375\221\134\222\124\151\045" +-"\345\142\151\334\345\356\000\122\275\063\013\255\165\002\205\247" +-"\144\120\055\305\031\031\060\300\046\333\311\323\375\056\231\255" +-"\131\265\013\115\324\101\256\205\110\103\131\334\267\250\342\242" +-"\336\303\217\327\270\241\142\246\150\120\122\344\317\061\247\224" +-"\205\332\237\106\062\027\126\345\362\353\146\075\022\377\103\333" +-"\230\357\167\317\313\201\215\064\261\306\120\112\046\321\344\076" +-"\101\120\257\154\256\042\064\056\325\153\156\203\272\171\270\166" +-"\145\110\332\011\051\144\143\042\271\373\107\166\205\214\206\104" +-"\313\011\333\002\003\001\000\001\060\015\006\011\052\206\110\206" +-"\367\015\001\001\005\005\000\003\202\001\001\000\265\066\016\135" +-"\341\141\050\132\021\145\300\077\203\003\171\115\276\050\246\013" +-"\007\002\122\205\315\370\221\320\020\154\265\152\040\133\034\220" +-"\331\060\074\306\110\236\212\136\144\371\241\161\167\357\004\047" +-"\037\007\353\344\046\367\163\164\311\104\030\032\146\323\340\103" +-"\257\221\073\321\313\054\330\164\124\072\034\115\312\324\150\315" +-"\043\174\035\020\236\105\351\366\000\156\246\315\031\377\117\054" +-"\051\217\127\115\304\167\222\276\340\114\011\373\135\104\206\146" +-"\041\250\271\062\242\126\325\351\214\203\174\131\077\304\361\013" +-"\347\235\354\236\275\234\030\016\076\302\071\171\050\267\003\015" +-"\010\313\306\347\331\001\067\120\020\354\314\141\026\100\324\257" +-"\061\164\173\374\077\061\247\320\107\163\063\071\033\314\116\152" +-"\327\111\203\021\006\376\353\202\130\063\062\114\360\126\254\036" +-"\234\057\126\232\173\301\112\034\245\375\125\066\316\374\226\115" +-"\364\260\360\354\267\154\202\355\057\061\231\102\114\251\262\015" +-"\270\025\135\361\337\272\311\265\112\324\144\230\263\046\251\060" +-"\310\375\246\354\253\226\041\255\177\302\170\266" +-, (PRUint32)988 } +-}; +-static const NSSItem nss_builtins_items_29 [] = { +- { (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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 }, +- { (void *)"\147\353\063\173\150\114\353\016\302\260\166\012\264\210\047\214" +-"\335\225\227\335" +-, (PRUint32)20 }, +- { (void *)"\315\073\075\142\133\011\270\011\066\207\236\022\057\161\144\272" +-, (PRUint32)16 }, +- { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163" +-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061" +-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114" +-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004" +-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141" +-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021" +-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130" +-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040" +-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052" +-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147" +-"\163\151\147\164\162\165\163\164\056\143\157\155" +-, (PRUint32)172 }, +- { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000" +-"\000\000\004" +-, (PRUint32)19 }, +- { (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) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) } ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_30 [] = { ++static const NSSItem nss_builtins_items_18 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2674,7 +1891,7 @@ static const NSSItem nss_builtins_items_30 [] = { + "\224" + , (PRUint32)577 } + }; +-static const NSSItem nss_builtins_items_31 [] = { ++static const NSSItem nss_builtins_items_19 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2701,7 +1918,7 @@ static const NSSItem nss_builtins_items_31 [] = { + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_32 [] = { ++static const NSSItem nss_builtins_items_20 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -2766,7 +1983,7 @@ static const NSSItem nss_builtins_items_3