nss: update to 3.12.6

18 files changed, 8571 insertions, 0 deletions

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\23