$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.10 2011/11/18 23:31:01 nigel Exp $
Don't handmerge it, cd to builtins and run gmake generate after patching certdata.txt
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig	Thu Nov  3 15:11:57 2011
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c	Wed Nov  9 15:21:38 2011
@@ -47,8 +47,10 @@ static const CK_BBOOL ck_true = CK_TRUE;
 static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
 static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
 static const CK_OBJECT_CLASS cko_data = CKO_DATA;
+static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_OBJECT_CLASS cko_nss_builtin_root_list = CKO_NSS_BUILTIN_ROOT_LIST;
 static const CK_OBJECT_CLASS cko_nss_trust = CKO_NSS_TRUST;
+static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 static const CK_TRUST ckt_nss_must_verify_trust = CKT_NSS_MUST_VERIFY_TRUST;
 static const CK_TRUST ckt_nss_not_trusted = CKT_NSS_NOT_TRUSTED;
 static const CK_TRUST ckt_nss_trust_unknown = CKT_NSS_TRUST_UNKNOWN;
@@ -1087,6 +1089,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = {
  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_344 [] = {
+ 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_345 [] = {
+ 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_346 [] = {
+ 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_347 [] = {
+ 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) },
@@ -14792,6 +14806,332 @@ static const NSSItem nss_builtins_items_222 [] = {
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
+"\103"
+, (PRUint32)1857 }
+};
+static const NSSItem nss_builtins_items_223 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
+"\166\316\217\063"
+, (PRUint32)20 },
+  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
+, (PRUint32)16 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_224 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
+"\063\040\122\157\157\164"
+, (PRUint32)86 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
+"\322\156\245\033\231\047\200\347\013\251\250\000"
+, (PRUint32)1548 }
+};
+static const NSSItem nss_builtins_items_225 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
+"\030\116\052\055"
+, (PRUint32)20 },
+  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
+, (PRUint32)16 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_226 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"ePKI Root Certification Authority", (PRUint32)34 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061"
@@ -14906,7 +15246,7 @@ static const NSSItem nss_builtins_items_222 [] = {
 "\201\370\021\234"
 , (PRUint32)1460 }
 };
-static const NSSItem nss_builtins_items_223 [] = {
+static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14932,7 +15272,7 @@ static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_224 [] = {
+static const NSSItem nss_builtins_items_228 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15066,7 +15406,7 @@ static const NSSItem nss_builtins_items_224 [] = {
 "\311\234\220\332\354\251\102\074\255\266\002"
 , (PRUint32)1307 }
 };
-static const NSSItem nss_builtins_items_225 [] = {
+static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15104,7 +15444,7 @@ static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_226 [] = {
+static const NSSItem nss_builtins_items_230 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15182,7 +15522,7 @@ static const NSSItem nss_builtins_items_226 [] = {
 "\366\324\357\277\114\210\150"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_227 [] = {
+static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15206,7 +15546,7 @@ static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_228 [] = {
+static const NSSItem nss_builtins_items_232 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15284,7 +15624,7 @@ static const NSSItem nss_builtins_items_228 [] = {
 "\246\347\313\100\003\335\171"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_229 [] = {
+static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15308,7 +15648,7 @@ static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_230 [] = {
+static const NSSItem nss_builtins_items_234 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15435,7 +15775,7 @@ static const NSSItem nss_builtins_items_230 [] = {
 "\320\352\111\242\034\215\122\024\246\012\223"
 , (PRUint32)1515 }
 };
-static const NSSItem nss_builtins_items_231 [] = {
+static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15463,7 +15803,7 @@ static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_232 [] = {
+static const NSSItem nss_builtins_items_236 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15537,7 +15877,7 @@ static const NSSItem nss_builtins_items_232 [] = {
 "\366\356\260\132\116\111\104\124\130\137\102\203"
 , (PRUint32)828 }
 };
-static const NSSItem nss_builtins_items_233 [] = {
+static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15560,7 +15900,7 @@ static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_234 [] = {
+static const NSSItem nss_builtins_items_238 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15636,7 +15976,7 @@ static const NSSItem nss_builtins_items_234 [] = {
 "\011\333\212\101\202\236\146\233\021"
 , (PRUint32)857 }
 };
-static const NSSItem nss_builtins_items_235 [] = {
+static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15659,7 +15999,7 @@ static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_236 [] = {
+static const NSSItem nss_builtins_items_240 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15742,7 +16082,7 @@ static const NSSItem nss_builtins_items_236 [] = {
 "\262\033\211\124"
 , (PRUint32)932 }
 };
-static const NSSItem nss_builtins_items_237 [] = {
+static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15766,7 +16106,7 @@ static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_238 [] = {
+static const NSSItem nss_builtins_items_242 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15866,7 +16206,7 @@ static const NSSItem nss_builtins_items_238 [] = {
 "\021\055"
 , (PRUint32)1026 }
 };
-static const NSSItem nss_builtins_items_239 [] = {
+static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15896,7 +16236,7 @@ static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_240 [] = {
+static const NSSItem nss_builtins_items_244 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15970,7 +16310,7 @@ static const NSSItem nss_builtins_items_240 [] = {
 "\367\130\077\056\162\002\127\243\217\241\024\056"
 , (PRUint32)652 }
 };
-static const NSSItem nss_builtins_items_241 [] = {
+static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15999,7 +16339,7 @@ static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_242 [] = {
+static const NSSItem nss_builtins_items_246 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16105,7 +16445,7 @@ static const NSSItem nss_builtins_items_242 [] = {
 "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
 , (PRUint32)1070 }
 };
-static const NSSItem nss_builtins_items_243 [] = {
+static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16137,7 +16477,7 @@ static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_244 [] = {
+static const NSSItem nss_builtins_items_248 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16216,7 +16556,7 @@ static const NSSItem nss_builtins_items_244 [] = {
 "\017\212"
 , (PRUint32)690 }
 };
-static const NSSItem nss_builtins_items_245 [] = {
+static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16246,7 +16586,7 @@ static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_246 [] = {
+static const NSSItem nss_builtins_items_250 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16361,7 +16701,7 @@ static const NSSItem nss_builtins_items_246 [] = {
 "\354\315\202\141\361\070\346\117\227\230\052\132\215"
 , (PRUint32)1213 }
 };
-static const NSSItem nss_builtins_items_247 [] = {
+static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16393,7 +16733,7 @@ static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_248 [] = {
+static const NSSItem nss_builtins_items_252 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16491,7 +16831,7 @@ static const NSSItem nss_builtins_items_248 [] = {
 "\055\247\330\206\052\335\056\020"
 , (PRUint32)904 }
 };
-static const NSSItem nss_builtins_items_249 [] = {
+static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16524,7 +16864,7 @@ static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_250 [] = {
+static const NSSItem nss_builtins_items_254 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16626,7 +16966,7 @@ static const NSSItem nss_builtins_items_250 [] = {
 "\330\316\304\143\165\077\131\107\261"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_251 [] = {
+static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16656,7 +16996,7 @@ static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_252 [] = {
+static const NSSItem nss_builtins_items_256 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16775,7 +17115,7 @@ static const NSSItem nss_builtins_items_252 [] = {
 "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
 , (PRUint32)1486 }
 };
-static const NSSItem nss_builtins_items_253 [] = {
+static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16800,7 +17140,7 @@ static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_254 [] = {
+static const NSSItem nss_builtins_items_258 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16890,7 +17230,7 @@ static const NSSItem nss_builtins_items_254 [] = {
 "\315\345\250"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_255 [] = {
+static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16914,7 +17254,7 @@ static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_256 [] = {
+static const NSSItem nss_builtins_items_260 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17019,7 +17359,7 @@ static const NSSItem nss_builtins_items_256 [] = {
 "\115\273\306\104\333\066\313\052\234\216"
 , (PRUint32)1258 }
 };
-static const NSSItem nss_builtins_items_257 [] = {
+static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17044,7 +17384,7 @@ static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_258 [] = {
+static const NSSItem nss_builtins_items_262 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17120,7 +17460,7 @@ static const NSSItem nss_builtins_items_258 [] = {
 "\002\153\331\132"
 , (PRUint32)820 }
 };
-static const NSSItem nss_builtins_items_259 [] = {
+static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17144,7 +17484,7 @@ static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_260 [] = {
+static const NSSItem nss_builtins_items_264 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17226,7 +17566,7 @@ static const NSSItem nss_builtins_items_260 [] = {
 "\362"
 , (PRUint32)881 }
 };
-static const NSSItem nss_builtins_items_261 [] = {
+static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17251,7 +17591,7 @@ static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_262 [] = {
+static const NSSItem nss_builtins_items_266 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17367,7 +17707,7 @@ static const NSSItem nss_builtins_items_262 [] = {
 "\113\076\053\070\007\125\230\136\244"
 , (PRUint32)1465 }
 };
-static const NSSItem nss_builtins_items_263 [] = {
+static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17391,7 +17731,7 @@ static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_264 [] = {
+static const NSSItem nss_builtins_items_268 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17456,7 +17796,7 @@ static const NSSItem nss_builtins_items_264 [] = {
 "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_265 [] = {
+static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17483,7 +17823,7 @@ static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_266 [] = {
+static const NSSItem nss_builtins_items_270 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17548,7 +17888,7 @@ static const NSSItem nss_builtins_items_266 [] = {
 "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_267 [] = {
+static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17575,7 +17915,7 @@ static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_268 [] = {
+static const NSSItem nss_builtins_items_272 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17672,7 +18012,7 @@ static const NSSItem nss_builtins_items_268 [] = {
 "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
 , (PRUint32)1038 }
 };
-static const NSSItem nss_builtins_items_269 [] = {
+static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17700,7 +18040,7 @@ static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_270 [] = {
+static const NSSItem nss_builtins_items_274 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17791,7 +18131,7 @@ static const NSSItem nss_builtins_items_270 [] = {
 "\336\102\343\055\202\361\017\345\372\227"
 , (PRUint32)954 }
 };
-static const NSSItem nss_builtins_items_271 [] = {
+static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17819,7 +18159,7 @@ static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_272 [] = {
+static const NSSItem nss_builtins_items_276 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17898,7 +18238,7 @@ static const NSSItem nss_builtins_items_272 [] = {
 "\130\077\137"
 , (PRUint32)867 }
 };
-static const NSSItem nss_builtins_items_273 [] = {
+static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17922,7 +18262,7 @@ static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_274 [] = {
+static const NSSItem nss_builtins_items_278 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18015,7 +18355,7 @@ static const NSSItem nss_builtins_items_274 [] = {
 "\045\361\224\264\146"
 , (PRUint32)997 }
 };
-static const NSSItem nss_builtins_items_275 [] = {
+static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18042,7 +18382,7 @@ static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_276 [] = {
+static const NSSItem nss_builtins_items_280 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18166,7 +18506,7 @@ static const NSSItem nss_builtins_items_276 [] = {
 "\156\117\022\176\012\074\235\225"
 , (PRUint32)1560 }
 };
-static const NSSItem nss_builtins_items_277 [] = {
+static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18191,7 +18531,7 @@ static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_278 [] = {
+static const NSSItem nss_builtins_items_282 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18310,7 +18650,7 @@ static const NSSItem nss_builtins_items_278 [] = {
 "\333\374\046\210\307"
 , (PRUint32)1525 }
 };
-static const NSSItem nss_builtins_items_279 [] = {
+static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18334,7 +18674,7 @@ static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_280 [] = {
+static const NSSItem nss_builtins_items_284 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18490,7 +18830,7 @@ static const NSSItem nss_builtins_items_280 [] = {
 "\167\110\320"
 , (PRUint32)1875 }
 };
-static const NSSItem nss_builtins_items_281 [] = {
+static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18521,7 +18861,7 @@ static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_282 [] = {
+static const NSSItem nss_builtins_items_286 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18674,7 +19014,7 @@ static const NSSItem nss_builtins_items_282 [] = {
 "\351\233\256\325\124\300\164\200\321\013\102\237\301"
 , (PRUint32)1869 }
 };
-static const NSSItem nss_builtins_items_283 [] = {
+static const NSSItem nss_builtins_items_287 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18704,7 +19044,7 @@ static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_284 [] = {
+static const NSSItem nss_builtins_items_288 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18840,7 +19180,7 @@ static const NSSItem nss_builtins_items_284 [] = {
 "\242\355\264\324\265\145\103\267\223\106\212\323"
 , (PRUint32)1532 }
 };
-static const NSSItem nss_builtins_items_285 [] = {
+static const NSSItem nss_builtins_items_289 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18870,7 +19210,7 @@ static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_286 [] = {
+static const NSSItem nss_builtins_items_290 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19021,7 +19361,7 @@ static const NSSItem nss_builtins_items_286 [] = {
 "\264"
 , (PRUint32)1761 }
 };
-static const NSSItem nss_builtins_items_287 [] = {
+static const NSSItem nss_builtins_items_291 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19051,7 +19391,7 @@ static const NSSItem nss_builtins_items_287 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_288 [] = {
+static const NSSItem nss_builtins_items_292 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19187,7 +19527,7 @@ static const NSSItem nss_builtins_items_288 [] = {
 "\111\043"
 , (PRUint32)1522 }
 };
-static const NSSItem nss_builtins_items_289 [] = {
+static const NSSItem nss_builtins_items_293 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19217,7 +19557,7 @@ static const NSSItem nss_builtins_items_289 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_290 [] = {
+static const NSSItem nss_builtins_items_294 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19352,7 +19692,7 @@ static const NSSItem nss_builtins_items_290 [] = {
 "\172\244\047\023\326\117\364\151"
 , (PRUint32)1512 }
 };
-static const NSSItem nss_builtins_items_291 [] = {
+static const NSSItem nss_builtins_items_295 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19382,7 +19722,7 @@ static const NSSItem nss_builtins_items_291 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_292 [] = {
+static const NSSItem nss_builtins_items_296 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19518,7 +19858,7 @@ static const NSSItem nss_builtins_items_292 [] = {
 "\302\021\254"
 , (PRUint32)1523 }
 };
-static const NSSItem nss_builtins_items_293 [] = {
+static const NSSItem nss_builtins_items_297 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19548,7 +19888,7 @@ static const NSSItem nss_builtins_items_293 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_294 [] = {
+static const NSSItem nss_builtins_items_298 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19684,7 +20024,7 @@ static const NSSItem nss_builtins_items_294 [] = {
 "\147\024\060"
 , (PRUint32)1523 }
 };
-static const NSSItem nss_builtins_items_295 [] = {
+static const NSSItem nss_builtins_items_299 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19714,7 +20054,7 @@ static const NSSItem nss_builtins_items_295 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_296 [] = {
+static const NSSItem nss_builtins_items_300 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19848,7 +20188,7 @@ static const NSSItem nss_builtins_items_296 [] = {
 "\217\116\235\306\066\347\134\246\253\022\017\326\317"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_297 [] = {
+static const NSSItem nss_builtins_items_301 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19878,7 +20218,7 @@ static const NSSItem nss_builtins_items_297 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_298 [] = {
+static const NSSItem nss_builtins_items_302 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20012,7 +20352,7 @@ static const NSSItem nss_builtins_items_298 [] = {
 "\130\113\161\203\237\146\346\254\171\110\376\376\107"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_299 [] = {
+static const NSSItem nss_builtins_items_303 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20042,7 +20382,7 @@ static const NSSItem nss_builtins_items_299 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_300 [] = {
+static const NSSItem nss_builtins_items_304 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20177,7 +20517,7 @@ static const NSSItem nss_builtins_items_300 [] = {
 "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
 , (PRUint32)1520 }
 };
-static const NSSItem nss_builtins_items_301 [] = {
+static const NSSItem nss_builtins_items_305 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20207,7 +20547,7 @@ static const NSSItem nss_builtins_items_301 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_302 [] = {
+static const NSSItem nss_builtins_items_306 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20335,7 +20675,7 @@ static const NSSItem nss_builtins_items_302 [] = {
 "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
 , (PRUint32)1392 }
 };
-static const NSSItem nss_builtins_items_303 [] = {
+static const NSSItem nss_builtins_items_307 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20365,7 +20705,7 @@ static const NSSItem nss_builtins_items_303 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_304 [] = {
+static const NSSItem nss_builtins_items_308 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20458,7 +20798,7 @@ static const NSSItem nss_builtins_items_304 [] = {
 "\342\342\104\276\134\367\352\034\365"
 , (PRUint32)969 }
 };
-static const NSSItem nss_builtins_items_305 [] = {
+static const NSSItem nss_builtins_items_309 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20486,7 +20826,7 @@ static const NSSItem nss_builtins_items_305 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_306 [] = {
+static const NSSItem nss_builtins_items_310 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20583,7 +20923,7 @@ static const NSSItem nss_builtins_items_306 [] = {
 "\364"
 , (PRUint32)993 }
 };
-static const NSSItem nss_builtins_items_307 [] = {
+static const NSSItem nss_builtins_items_311 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20612,7 +20952,7 @@ static const NSSItem nss_builtins_items_307 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_308 [] = {
+static const NSSItem nss_builtins_items_312 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20710,7 +21050,7 @@ static const NSSItem nss_builtins_items_308 [] = {
 "\261\050\272"
 , (PRUint32)1011 }
 };
-static const NSSItem nss_builtins_items_309 [] = {
+static const NSSItem nss_builtins_items_313 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20739,7 +21079,7 @@ static const NSSItem nss_builtins_items_309 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_310 [] = {
+static const NSSItem nss_builtins_items_314 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20816,7 +21156,7 @@ static const NSSItem nss_builtins_items_310 [] = {
 "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
 , (PRUint32)848 }
 };
-static const NSSItem nss_builtins_items_311 [] = {
+static const NSSItem nss_builtins_items_315 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20840,7 +21180,7 @@ static const NSSItem nss_builtins_items_311 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_312 [] = {
+static const NSSItem nss_builtins_items_316 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20917,7 +21257,7 @@ static const NSSItem nss_builtins_items_312 [] = {
 "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
 , (PRUint32)848 }
 };
-static const NSSItem nss_builtins_items_313 [] = {
+static const NSSItem nss_builtins_items_317 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20941,7 +21281,7 @@ static const NSSItem nss_builtins_items_313 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_314 [] = {
+static const NSSItem nss_builtins_items_318 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21050,7 +21390,7 @@ static const NSSItem nss_builtins_items_314 [] = {
 "\051\340\266\270\011\150\031\034\030\103"
 , (PRUint32)1354 }
 };
-static const NSSItem nss_builtins_items_315 [] = {
+static const NSSItem nss_builtins_items_319 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21074,7 +21414,7 @@ static const NSSItem nss_builtins_items_315 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_316 [] = {
+static const NSSItem nss_builtins_items_320 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21131,7 +21471,7 @@ static const NSSItem nss_builtins_items_316 [] = {
 "\214\171"
 , (PRUint32)514 }
 };
-static const NSSItem nss_builtins_items_317 [] = {
+static const NSSItem nss_builtins_items_321 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21155,7 +21495,7 @@ static const NSSItem nss_builtins_items_317 [] = {
   { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_318 [] = {
+static const NSSItem nss_builtins_items_322 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21245,7 +21585,7 @@ static const NSSItem nss_builtins_items_318 [] = {
 "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
 , (PRUint32)959 }
 };
-static const NSSItem nss_builtins_items_319 [] = {
+static const NSSItem nss_builtins_items_323 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21272,7 +21612,7 @@ static const NSSItem nss_builtins_items_319 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_320 [] = {
+static const NSSItem nss_builtins_items_324 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21390,7 +21730,7 @@ static const NSSItem nss_builtins_items_320 [] = {
 "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
 , (PRUint32)1440 }
 };
-static const NSSItem nss_builtins_items_321 [] = {
+static const NSSItem nss_builtins_items_325 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21416,7 +21756,7 @@ static const NSSItem nss_builtins_items_321 [] = {
   { (void *)&ckt_nss_must_verify_trust, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_322 [] = {
+static const NSSItem nss_builtins_items_326 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21549,7 +21889,7 @@ static const NSSItem nss_builtins_items_322 [] = {
 "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
 , (PRUint32)1679 }
 };
-static const NSSItem nss_builtins_items_323 [] = {
+static const NSSItem nss_builtins_items_327 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21575,7 +21915,7 @@ static const NSSItem nss_builtins_items_323 [] = {
   { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_324 [] = {
+static const NSSItem nss_builtins_items_328 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21669,7 +22009,7 @@ static const NSSItem nss_builtins_items_324 [] = {
 "\204\232\315"
 , (PRUint32)979 }
 };
-static const NSSItem nss_builtins_items_325 [] = {
+static const NSSItem nss_builtins_items_329 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21697,7 +22037,7 @@ static const NSSItem nss_builtins_items_325 [] = {
   { (void *)&ckt_nss_must_verify_trust, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_326 [] = {
+static const NSSItem nss_builtins_items_330 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21781,7 +22121,7 @@ static const NSSItem nss_builtins_items_326 [] = {
 "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
 , (PRUint32)895 }
 };
-static const NSSItem nss_builtins_items_327 [] = {
+static const NSSItem nss_builtins_items_331 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21807,7 +22147,7 @@ static const NSSItem nss_builtins_items_327 [] = {
   { (void *)&ckt_nss_must_verify_trust, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_328 [] = {
+static const NSSItem nss_builtins_items_332 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21925,7 +22265,7 @@ static const NSSItem nss_builtins_items_328 [] = {
 "\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
 , (PRUint32)1422 }
 };
-static const NSSItem nss_builtins_items_329 [] = {
+static const NSSItem nss_builtins_items_333 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -21952,7 +22292,7 @@ static const NSSItem nss_builtins_items_329 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_330 [] = {
+static const NSSItem nss_builtins_items_334 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22036,7 +22376,7 @@ static const NSSItem nss_builtins_items_330 [] = {
 "\136\121\026\053\076"
 , (PRUint32)885 }
 };
-static const NSSItem nss_builtins_items_331 [] = {
+static const NSSItem nss_builtins_items_335 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22062,7 +22402,7 @@ static const NSSItem nss_builtins_items_331 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_332 [] = {
+static const NSSItem nss_builtins_items_336 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22175,7 +22515,7 @@ static const NSSItem nss_builtins_items_332 [] = {
 "\214\360\340\050\006\042\267\046\101"
 , (PRUint32)1353 }
 };
-static const NSSItem nss_builtins_items_333 [] = {
+static const NSSItem nss_builtins_items_337 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22201,7 +22541,7 @@ static const NSSItem nss_builtins_items_333 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_334 [] = {
+static const NSSItem nss_builtins_items_338 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22304,7 +22644,7 @@ static const NSSItem nss_builtins_items_334 [] = {
 "\041\225\305\242\165"
 , (PRUint32)1285 }
 };
-static const NSSItem nss_builtins_items_335 [] = {
+static const NSSItem nss_builtins_items_339 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22327,7 +22667,7 @@ static const NSSItem nss_builtins_items_335 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_336 [] = {
+static const NSSItem nss_builtins_items_340 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22429,7 +22769,7 @@ static const NSSItem nss_builtins_items_336 [] = {
 "\132\145"
 , (PRUint32)1170 }
 };
-static const NSSItem nss_builtins_items_337 [] = {
+static const NSSItem nss_builtins_items_341 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22455,7 +22795,7 @@ static const NSSItem nss_builtins_items_337 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_338 [] = {
+static const NSSItem nss_builtins_items_342 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22587,7 +22927,7 @@ static const NSSItem nss_builtins_items_338 [] = {
 "\244\363\116\272\067\230\173\202\271"
 , (PRUint32)1689 }
 };
-static const NSSItem nss_builtins_items_339 [] = {
+static const NSSItem nss_builtins_items_343 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22612,7 +22952,7 @@ static const NSSItem nss_builtins_items_339 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_340 [] = {
+static const NSSItem nss_builtins_items_344 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22703,7 +23043,7 @@ static const NSSItem nss_builtins_items_340 [] = {
 "\131"
 , (PRUint32)977 }
 };
-static const NSSItem nss_builtins_items_341 [] = {
+static const NSSItem nss_builtins_items_345 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22730,7 +23070,7 @@ static const NSSItem nss_builtins_items_341 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_342 [] = {
+static const NSSItem nss_builtins_items_346 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -22841,7 +23181,7 @@ static const NSSItem nss_builtins_items_342 [] = {
 "\355\020\342\305"
 , (PRUint32)1236 }
 };
-static const NSSItem nss_builtins_items_343 [] = {
+static const NSSItem nss_builtins_items_347 [] = {
   { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -23220,11 +23560,15 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} },
   { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} },
   { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} },
-  { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} }
+  { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} },
+  { 11, nss_builtins_types_344, nss_builtins_items_344, {NULL} },
+  { 13, nss_builtins_types_345, nss_builtins_items_345, {NULL} },
+  { 11, nss_builtins_types_346, nss_builtins_items_346, {NULL} },
+  { 13, nss_builtins_types_347, nss_builtins_items_347, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 343+1;
+  nss_builtins_nObjects = 347+1;
 #else
-  nss_builtins_nObjects = 343;
+  nss_builtins_nObjects = 347;
 #endif /* DEBUG */
