diff --git a/mozilla-nss.changes b/mozilla-nss.changes index f662684..340c14c 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 9 05:44:15 UTC 2011 - wr@rosenauer.org + +- explicitely distrust/override DigiNotar certs (bmo#683261) + (trustdb version 1.87) + ------------------------------------------------------------------- Fri Sep 2 14:40:07 UTC 2011 - pcerny@suse.com -- removed DigiNotar root certifiate from trusted db +- removed DigiNotar root certificate from trusted db (bmo#682927, bnc#714931) ------------------------------------------------------------------- diff --git a/nss-3.12.11-diginotar.patch b/nss-3.12.11-diginotar.patch index fc31e7a..49c1dc9 100644 --- a/nss-3.12.11-diginotar.patch +++ b/nss-3.12.11-diginotar.patch @@ -1,38 +1,62 @@ -diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c ---- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c -+++ nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c +diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/certdata.c +--- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-01 08:40:03.000000000 +0200 ++++ nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-09-08 23:30:41.318475050 +0200 @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $"; -+static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $"; #endif /* DEBUG */ #ifndef BUILTINS_H -@@ -1057,12 +1057,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_332 [] = { - static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { +@@ -1045,6 +1045,36 @@ static const CK_ATTRIBUTE_TYPE nss_built + static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED }; --static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = { -- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE --}; --static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = { -- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED --}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_330 [] = { ++ 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_331 [] = { ++ 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_332 [] = { ++ 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_333 [] = { ++ 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_334 [] = { ++ 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_335 [] = { ++ 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_336 [] = { ++ 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_337 [] = { ++ 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_338 [] = { ++ 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_339 [] = { ++ 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) }, -@@ -1071,7 +1065,7 @@ static const NSSItem nss_builtins_items_0 [] = { +@@ -1053,7 +1083,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"CVS ID", (PRUint32)7 }, { (void *)"NSS", (PRUint32)4 }, - { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 } -+ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $", (PRUint32)165 } ++ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $", (PRUint32)165 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { -@@ -12524,151 +12518,6 @@ static const NSSItem nss_builtins_items_186 [] = { +@@ -12506,151 +12536,6 @@ static const NSSItem nss_builtins_items_ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, @@ -184,7 +208,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" -@@ -12756,7 +12605,7 @@ static const NSSItem nss_builtins_items_188 [] = { +@@ -12738,7 +12623,7 @@ static const NSSItem nss_builtins_items_ "\244\140\114\260\125\240\240\173\127\262" , (PRUint32)1002 } }; @@ -193,7 +217,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12783,7 +12632,7 @@ static const NSSItem nss_builtins_items_189 [] = { +@@ -12765,7 +12650,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -202,7 +226,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12892,7 +12741,7 @@ static const NSSItem nss_builtins_items_190 [] = { +@@ -12874,7 +12759,7 @@ static const NSSItem nss_builtins_items_ "\333" , (PRUint32)1217 } }; @@ -211,7 +235,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12920,7 +12769,7 @@ static const NSSItem nss_builtins_items_191 [] = { +@@ -12902,7 +12787,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -220,7 +244,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12994,7 +12843,7 @@ static const NSSItem nss_builtins_items_192 [] = { +@@ -12976,7 +12861,7 @@ static const NSSItem nss_builtins_items_ "\334\335\363\377\035\054\072\026\127\331\222\071\326" , (PRUint32)653 } }; @@ -229,7 +253,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13023,7 +12872,7 @@ static const NSSItem nss_builtins_items_193 [] = { +@@ -13005,7 +12890,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -238,7 +262,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13115,7 +12964,7 @@ static const NSSItem nss_builtins_items_194 [] = { +@@ -13097,7 +12982,7 @@ static const NSSItem nss_builtins_items_ "\321\236\164\310\166\147" , (PRUint32)1078 } }; @@ -247,7 +271,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13140,7 +12989,7 @@ static const NSSItem nss_builtins_items_195 [] = { +@@ -13122,7 +13007,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -256,7 +280,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13237,7 +13086,7 @@ static const NSSItem nss_builtins_items_196 [] = { +@@ -13219,7 +13104,7 @@ static const NSSItem nss_builtins_items_ "\253\205\322\140\126\132" , (PRUint32)1030 } }; @@ -265,7 +289,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13265,7 +13114,7 @@ static const NSSItem nss_builtins_items_197 [] = { +@@ -13247,7 +13132,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -274,7 +298,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13350,7 +13199,7 @@ static const NSSItem nss_builtins_items_198 [] = { +@@ -13332,7 +13217,7 @@ static const NSSItem nss_builtins_items_ "\164" , (PRUint32)897 } }; @@ -283,7 +307,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13376,7 +13225,7 @@ static const NSSItem nss_builtins_items_199 [] = { +@@ -13358,7 +13243,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -292,7 +316,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13473,7 +13322,7 @@ static const NSSItem nss_builtins_items_200 [] = { +@@ -13455,7 +13340,7 @@ static const NSSItem nss_builtins_items_ "\374\276\337\012\015" , (PRUint32)1013 } }; @@ -301,7 +325,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13502,7 +13351,7 @@ static const NSSItem nss_builtins_items_201 [] = { +@@ -13484,7 +13369,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -310,7 +334,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13613,7 +13462,7 @@ static const NSSItem nss_builtins_items_202 [] = { +@@ -13595,7 +13480,7 @@ static const NSSItem nss_builtins_items_ "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" , (PRUint32)1151 } }; @@ -319,7 +343,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13645,7 +13494,7 @@ static const NSSItem nss_builtins_items_203 [] = { +@@ -13627,7 +13512,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -328,7 +352,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13799,7 +13648,7 @@ static const NSSItem nss_builtins_items_204 [] = { +@@ -13781,7 +13666,7 @@ static const NSSItem nss_builtins_items_ "\103\307\003\340\067\116\135\012\334\131\040\045" , (PRUint32)1964 } }; @@ -337,7 +361,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13827,7 +13676,7 @@ static const NSSItem nss_builtins_items_205 [] = { +@@ -13809,7 +13694,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -346,7 +370,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13908,7 +13757,7 @@ static const NSSItem nss_builtins_items_206 [] = { +@@ -13890,7 +13775,7 @@ static const NSSItem nss_builtins_items_ "\300\226\130\057\352\273\106\327\273\344\331\056" , (PRUint32)940 } }; @@ -355,7 +379,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13931,7 +13780,7 @@ static const NSSItem nss_builtins_items_207 [] = { +@@ -13913,7 +13798,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -364,7 +388,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14065,7 +13914,7 @@ static const NSSItem nss_builtins_items_208 [] = { +@@ -14047,7 +13932,7 @@ static const NSSItem nss_builtins_items_ "\005\211\374\170\326\134\054\046\103\251" , (PRUint32)1642 } }; @@ -373,7 +397,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14093,7 +13942,7 @@ static const NSSItem nss_builtins_items_209 [] = { +@@ -14075,7 +13960,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -382,7 +406,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14198,7 +14047,7 @@ static const NSSItem nss_builtins_items_210 [] = { +@@ -14180,7 +14065,7 @@ static const NSSItem nss_builtins_items_ "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" , (PRUint32)1198 } }; @@ -391,7 +415,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14225,7 +14074,7 @@ static const NSSItem nss_builtins_items_211 [] = { +@@ -14207,7 +14092,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -400,7 +424,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14330,7 +14179,7 @@ static const NSSItem nss_builtins_items_212 [] = { +@@ -14312,7 +14197,7 @@ static const NSSItem nss_builtins_items_ "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" , (PRUint32)1198 } }; @@ -409,7 +433,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14357,7 +14206,7 @@ static const NSSItem nss_builtins_items_213 [] = { +@@ -14339,7 +14224,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -418,7 +442,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14450,7 +14299,7 @@ static const NSSItem nss_builtins_items_214 [] = { +@@ -14432,7 +14317,7 @@ static const NSSItem nss_builtins_items_ "\230" , (PRUint32)993 } }; @@ -427,7 +451,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14477,7 +14326,7 @@ static const NSSItem nss_builtins_items_215 [] = { +@@ -14459,7 +14344,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -436,7 +460,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14566,7 +14415,7 @@ static const NSSItem nss_builtins_items_216 [] = { +@@ -14548,7 +14433,7 @@ static const NSSItem nss_builtins_items_ "\126\144\127" , (PRUint32)931 } }; @@ -445,7 +469,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14593,7 +14442,7 @@ static const NSSItem nss_builtins_items_217 [] = { +@@ -14575,7 +14460,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -454,7 +478,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14674,7 +14523,7 @@ static const NSSItem nss_builtins_items_218 [] = { +@@ -14656,7 +14541,7 @@ static const NSSItem nss_builtins_items_ "\000\147\240\161\000\202\110" , (PRUint32)919 } }; @@ -463,7 +487,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14698,7 +14547,7 @@ static const NSSItem nss_builtins_items_219 [] = { +@@ -14680,7 +14565,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -472,7 +496,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14780,7 +14629,7 @@ static const NSSItem nss_builtins_items_220 [] = { +@@ -14762,7 +14647,7 @@ static const NSSItem nss_builtins_items_ "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" , (PRUint32)943 } }; @@ -481,7 +505,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14804,7 +14653,7 @@ static const NSSItem nss_builtins_items_221 [] = { +@@ -14786,7 +14671,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -490,7 +514,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14885,7 +14734,7 @@ static const NSSItem nss_builtins_items_222 [] = { +@@ -14867,7 +14752,7 @@ static const NSSItem nss_builtins_items_ "\246\210\070\316\125" , (PRUint32)933 } }; @@ -499,7 +523,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14908,7 +14757,7 @@ static const NSSItem nss_builtins_items_223 [] = { +@@ -14890,7 +14775,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -508,7 +532,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15027,7 +14876,7 @@ static const NSSItem nss_builtins_items_224 [] = { +@@ -15009,7 +14894,7 @@ static const NSSItem nss_builtins_items_ "\201\370\021\234" , (PRUint32)1460 } }; @@ -517,7 +541,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15053,7 +14902,7 @@ static const NSSItem nss_builtins_items_225 [] = { +@@ -15035,7 +14920,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -526,7 +550,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15187,7 +15036,7 @@ static const NSSItem nss_builtins_items_226 [] = { +@@ -15169,7 +15054,7 @@ static const NSSItem nss_builtins_items_ "\311\234\220\332\354\251\102\074\255\266\002" , (PRUint32)1307 } }; @@ -535,7 +559,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15225,7 +15074,7 @@ static const NSSItem nss_builtins_items_227 [] = { +@@ -15207,7 +15092,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -544,7 +568,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15303,7 +15152,7 @@ static const NSSItem nss_builtins_items_228 [] = { +@@ -15285,7 +15170,7 @@ static const NSSItem nss_builtins_items_ "\366\324\357\277\114\210\150" , (PRUint32)855 } }; @@ -553,7 +577,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15327,7 +15176,7 @@ static const NSSItem nss_builtins_items_229 [] = { +@@ -15309,7 +15194,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -562,7 +586,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15405,7 +15254,7 @@ static const NSSItem nss_builtins_items_230 [] = { +@@ -15387,7 +15272,7 @@ static const NSSItem nss_builtins_items_ "\246\347\313\100\003\335\171" , (PRUint32)855 } }; @@ -571,7 +595,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15429,7 +15278,7 @@ static const NSSItem nss_builtins_items_231 [] = { +@@ -15411,7 +15296,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -580,7 +604,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15556,7 +15405,7 @@ static const NSSItem nss_builtins_items_232 [] = { +@@ -15538,7 +15423,7 @@ static const NSSItem nss_builtins_items_ "\320\352\111\242\034\215\122\024\246\012\223" , (PRUint32)1515 } }; @@ -589,7 +613,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15584,7 +15433,7 @@ static const NSSItem nss_builtins_items_233 [] = { +@@ -15566,7 +15451,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -598,7 +622,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15658,7 +15507,7 @@ static const NSSItem nss_builtins_items_234 [] = { +@@ -15640,7 +15525,7 @@ static const NSSItem nss_builtins_items_ "\366\356\260\132\116\111\104\124\130\137\102\203" , (PRUint32)828 } }; @@ -607,7 +631,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15681,7 +15530,7 @@ static const NSSItem nss_builtins_items_235 [] = { +@@ -15663,7 +15548,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -616,7 +640,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15757,7 +15606,7 @@ static const NSSItem nss_builtins_items_236 [] = { +@@ -15739,7 +15624,7 @@ static const NSSItem nss_builtins_items_ "\011\333\212\101\202\236\146\233\021" , (PRUint32)857 } }; @@ -625,7 +649,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15780,7 +15629,7 @@ static const NSSItem nss_builtins_items_237 [] = { +@@ -15762,7 +15647,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -634,7 +658,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15863,7 +15712,7 @@ static const NSSItem nss_builtins_items_238 [] = { +@@ -15845,7 +15730,7 @@ static const NSSItem nss_builtins_items_ "\262\033\211\124" , (PRUint32)932 } }; @@ -643,7 +667,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15887,7 +15736,7 @@ static const NSSItem nss_builtins_items_239 [] = { +@@ -15869,7 +15754,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -652,7 +676,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15987,7 +15836,7 @@ static const NSSItem nss_builtins_items_240 [] = { +@@ -15969,7 +15854,7 @@ static const NSSItem nss_builtins_items_ "\021\055" , (PRUint32)1026 } }; @@ -661,7 +685,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16017,7 +15866,7 @@ static const NSSItem nss_builtins_items_241 [] = { +@@ -15999,7 +15884,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -670,7 +694,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16091,7 +15940,7 @@ static const NSSItem nss_builtins_items_242 [] = { +@@ -16073,7 +15958,7 @@ static const NSSItem nss_builtins_items_ "\367\130\077\056\162\002\127\243\217\241\024\056" , (PRUint32)652 } }; @@ -679,7 +703,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16120,7 +15969,7 @@ static const NSSItem nss_builtins_items_243 [] = { +@@ -16102,7 +15987,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -688,7 +712,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16226,7 +16075,7 @@ static const NSSItem nss_builtins_items_244 [] = { +@@ -16208,7 +16093,7 @@ static const NSSItem nss_builtins_items_ "\061\324\100\032\142\064\066\077\065\001\256\254\143\240" , (PRUint32)1070 } }; @@ -697,7 +721,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16258,7 +16107,7 @@ static const NSSItem nss_builtins_items_245 [] = { +@@ -16240,7 +16125,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -706,7 +730,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16337,7 +16186,7 @@ static const NSSItem nss_builtins_items_246 [] = { +@@ -16319,7 +16204,7 @@ static const NSSItem nss_builtins_items_ "\017\212" , (PRUint32)690 } }; @@ -715,7 +739,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16367,7 +16216,7 @@ static const NSSItem nss_builtins_items_247 [] = { +@@ -16349,7 +16234,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -724,7 +748,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16482,7 +16331,7 @@ static const NSSItem nss_builtins_items_248 [] = { +@@ -16464,7 +16349,7 @@ static const NSSItem nss_builtins_items_ "\354\315\202\141\361\070\346\117\227\230\052\132\215" , (PRUint32)1213 } }; @@ -733,7 +757,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16514,7 +16363,7 @@ static const NSSItem nss_builtins_items_249 [] = { +@@ -16496,7 +16381,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -742,7 +766,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16612,7 +16461,7 @@ static const NSSItem nss_builtins_items_250 [] = { +@@ -16594,7 +16479,7 @@ static const NSSItem nss_builtins_items_ "\055\247\330\206\052\335\056\020" , (PRUint32)904 } }; @@ -751,7 +775,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16645,7 +16494,7 @@ static const NSSItem nss_builtins_items_251 [] = { +@@ -16627,7 +16512,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -760,7 +784,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16747,7 +16596,7 @@ static const NSSItem nss_builtins_items_252 [] = { +@@ -16729,7 +16614,7 @@ static const NSSItem nss_builtins_items_ "\330\316\304\143\165\077\131\107\261" , (PRUint32)1049 } }; @@ -769,7 +793,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16777,7 +16626,7 @@ static const NSSItem nss_builtins_items_253 [] = { +@@ -16759,7 +16644,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -778,7 +802,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16896,7 +16745,7 @@ static const NSSItem nss_builtins_items_254 [] = { +@@ -16878,7 +16763,7 @@ static const NSSItem nss_builtins_items_ "\370\161\012\334\271\374\175\062\140\346\353\257\212\001" , (PRUint32)1486 } }; @@ -787,7 +811,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16921,7 +16770,7 @@ static const NSSItem nss_builtins_items_255 [] = { +@@ -16903,7 +16788,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -796,7 +820,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17011,7 +16860,7 @@ static const NSSItem nss_builtins_items_256 [] = { +@@ -16993,7 +16878,7 @@ static const NSSItem nss_builtins_items_ "\315\345\250" , (PRUint32)1043 } }; @@ -805,7 +829,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17035,7 +16884,7 @@ static const NSSItem nss_builtins_items_257 [] = { +@@ -17017,7 +16902,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -814,7 +838,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17140,7 +16989,7 @@ static const NSSItem nss_builtins_items_258 [] = { +@@ -17122,7 +17007,7 @@ static const NSSItem nss_builtins_items_ "\115\273\306\104\333\066\313\052\234\216" , (PRUint32)1258 } }; @@ -823,7 +847,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17165,7 +17014,7 @@ static const NSSItem nss_builtins_items_259 [] = { +@@ -17147,7 +17032,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -832,7 +856,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17241,7 +17090,7 @@ static const NSSItem nss_builtins_items_260 [] = { +@@ -17223,7 +17108,7 @@ static const NSSItem nss_builtins_items_ "\002\153\331\132" , (PRUint32)820 } }; @@ -841,7 +865,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17265,7 +17114,7 @@ static const NSSItem nss_builtins_items_261 [] = { +@@ -17247,7 +17132,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -850,7 +874,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17347,7 +17196,7 @@ static const NSSItem nss_builtins_items_262 [] = { +@@ -17329,7 +17214,7 @@ static const NSSItem nss_builtins_items_ "\362" , (PRUint32)881 } }; @@ -859,7 +883,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17372,7 +17221,7 @@ static const NSSItem nss_builtins_items_263 [] = { +@@ -17354,7 +17239,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -868,7 +892,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17488,7 +17337,7 @@ static const NSSItem nss_builtins_items_264 [] = { +@@ -17470,7 +17355,7 @@ static const NSSItem nss_builtins_items_ "\113\076\053\070\007\125\230\136\244" , (PRUint32)1465 } }; @@ -877,7 +901,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17512,7 +17361,7 @@ static const NSSItem nss_builtins_items_265 [] = { +@@ -17494,7 +17379,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -886,7 +910,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17577,7 +17426,7 @@ static const NSSItem nss_builtins_items_266 [] = { +@@ -17559,7 +17444,7 @@ static const NSSItem nss_builtins_items_ "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" , (PRUint32)576 } }; @@ -895,7 +919,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17604,7 +17453,7 @@ static const NSSItem nss_builtins_items_267 [] = { +@@ -17586,7 +17471,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -904,7 +928,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17669,7 +17518,7 @@ static const NSSItem nss_builtins_items_268 [] = { +@@ -17651,7 +17536,7 @@ static const NSSItem nss_builtins_items_ "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" , (PRUint32)576 } }; @@ -913,7 +937,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17696,7 +17545,7 @@ static const NSSItem nss_builtins_items_269 [] = { +@@ -17678,7 +17563,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -922,7 +946,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17793,7 +17642,7 @@ static const NSSItem nss_builtins_items_270 [] = { +@@ -17775,7 +17660,7 @@ static const NSSItem nss_builtins_items_ "\202\042\055\172\124\253\160\303\175\042\145\202\160\226" , (PRUint32)1038 } }; @@ -931,7 +955,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17821,7 +17670,7 @@ static const NSSItem nss_builtins_items_271 [] = { +@@ -17803,7 +17688,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -940,7 +964,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17912,7 +17761,7 @@ static const NSSItem nss_builtins_items_272 [] = { +@@ -17894,7 +17779,7 @@ static const NSSItem nss_builtins_items_ "\336\102\343\055\202\361\017\345\372\227" , (PRUint32)954 } }; @@ -949,7 +973,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17940,7 +17789,7 @@ static const NSSItem nss_builtins_items_273 [] = { +@@ -17922,7 +17807,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -958,7 +982,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18019,7 +17868,7 @@ static const NSSItem nss_builtins_items_274 [] = { +@@ -18001,7 +17886,7 @@ static const NSSItem nss_builtins_items_ "\130\077\137" , (PRUint32)867 } }; @@ -967,7 +991,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18043,7 +17892,7 @@ static const NSSItem nss_builtins_items_275 [] = { +@@ -18025,7 +17910,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -976,7 +1000,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18136,7 +17985,7 @@ static const NSSItem nss_builtins_items_276 [] = { +@@ -18118,7 +18003,7 @@ static const NSSItem nss_builtins_items_ "\045\361\224\264\146" , (PRUint32)997 } }; @@ -985,7 +1009,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18163,7 +18012,7 @@ static const NSSItem nss_builtins_items_277 [] = { +@@ -18145,7 +18030,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -994,7 +1018,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18287,7 +18136,7 @@ static const NSSItem nss_builtins_items_278 [] = { +@@ -18269,7 +18154,7 @@ static const NSSItem nss_builtins_items_ "\156\117\022\176\012\074\235\225" , (PRUint32)1560 } }; @@ -1003,7 +1027,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18312,7 +18161,7 @@ static const NSSItem nss_builtins_items_279 [] = { +@@ -18294,7 +18179,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1012,7 +1036,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18431,7 +18280,7 @@ static const NSSItem nss_builtins_items_280 [] = { +@@ -18413,7 +18298,7 @@ static const NSSItem nss_builtins_items_ "\333\374\046\210\307" , (PRUint32)1525 } }; @@ -1021,7 +1045,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18455,7 +18304,7 @@ static const NSSItem nss_builtins_items_281 [] = { +@@ -18437,7 +18322,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1030,7 +1054,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18611,7 +18460,7 @@ static const NSSItem nss_builtins_items_282 [] = { +@@ -18593,7 +18478,7 @@ static const NSSItem nss_builtins_items_ "\167\110\320" , (PRUint32)1875 } }; @@ -1039,7 +1063,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18642,7 +18491,7 @@ static const NSSItem nss_builtins_items_283 [] = { +@@ -18624,7 +18509,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1048,7 +1072,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18795,7 +18644,7 @@ static const NSSItem nss_builtins_items_284 [] = { +@@ -18777,7 +18662,7 @@ static const NSSItem nss_builtins_items_ "\351\233\256\325\124\300\164\200\321\013\102\237\301" , (PRUint32)1869 } }; @@ -1057,7 +1081,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18825,7 +18674,7 @@ static const NSSItem nss_builtins_items_285 [] = { +@@ -18807,7 +18692,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1066,7 +1090,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18961,7 +18810,7 @@ static const NSSItem nss_builtins_items_286 [] = { +@@ -18943,7 +18828,7 @@ static const NSSItem nss_builtins_items_ "\242\355\264\324\265\145\103\267\223\106\212\323" , (PRUint32)1532 } }; @@ -1075,7 +1099,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18991,7 +18840,7 @@ static const NSSItem nss_builtins_items_287 [] = { +@@ -18973,7 +18858,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1084,7 +1108,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19142,7 +18991,7 @@ static const NSSItem nss_builtins_items_288 [] = { +@@ -19124,7 +19009,7 @@ static const NSSItem nss_builtins_items_ "\264" , (PRUint32)1761 } }; @@ -1093,7 +1117,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19172,7 +19021,7 @@ static const NSSItem nss_builtins_items_289 [] = { +@@ -19154,7 +19039,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1102,7 +1126,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19308,7 +19157,7 @@ static const NSSItem nss_builtins_items_290 [] = { +@@ -19290,7 +19175,7 @@ static const NSSItem nss_builtins_items_ "\111\043" , (PRUint32)1522 } }; @@ -1111,7 +1135,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19338,7 +19187,7 @@ static const NSSItem nss_builtins_items_291 [] = { +@@ -19320,7 +19205,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1120,7 +1144,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19473,7 +19322,7 @@ static const NSSItem nss_builtins_items_292 [] = { +@@ -19455,7 +19340,7 @@ static const NSSItem nss_builtins_items_ "\172\244\047\023\326\117\364\151" , (PRUint32)1512 } }; @@ -1129,7 +1153,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19503,7 +19352,7 @@ static const NSSItem nss_builtins_items_293 [] = { +@@ -19485,7 +19370,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1138,7 +1162,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19639,7 +19488,7 @@ static const NSSItem nss_builtins_items_294 [] = { +@@ -19621,7 +19506,7 @@ static const NSSItem nss_builtins_items_ "\302\021\254" , (PRUint32)1523 } }; @@ -1147,7 +1171,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19669,7 +19518,7 @@ static const NSSItem nss_builtins_items_295 [] = { +@@ -19651,7 +19536,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1156,7 +1180,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19805,7 +19654,7 @@ static const NSSItem nss_builtins_items_296 [] = { +@@ -19787,7 +19672,7 @@ static const NSSItem nss_builtins_items_ "\147\024\060" , (PRUint32)1523 } }; @@ -1165,7 +1189,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19835,7 +19684,7 @@ static const NSSItem nss_builtins_items_297 [] = { +@@ -19817,7 +19702,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1174,7 +1198,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19969,7 +19818,7 @@ static const NSSItem nss_builtins_items_298 [] = { +@@ -19951,7 +19836,7 @@ static const NSSItem nss_builtins_items_ "\217\116\235\306\066\347\134\246\253\022\017\326\317" , (PRUint32)1501 } }; @@ -1183,7 +1207,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19999,7 +19848,7 @@ static const NSSItem nss_builtins_items_299 [] = { +@@ -19981,7 +19866,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1192,7 +1216,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20133,7 +19982,7 @@ static const NSSItem nss_builtins_items_300 [] = { +@@ -20115,7 +20000,7 @@ static const NSSItem nss_builtins_items_ "\130\113\161\203\237\146\346\254\171\110\376\376\107" , (PRUint32)1501 } }; @@ -1201,7 +1225,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20163,7 +20012,7 @@ static const NSSItem nss_builtins_items_301 [] = { +@@ -20145,7 +20030,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1210,7 +1234,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20298,7 +20147,7 @@ static const NSSItem nss_builtins_items_302 [] = { +@@ -20280,7 +20165,7 @@ static const NSSItem nss_builtins_items_ "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352" , (PRUint32)1520 } }; @@ -1219,7 +1243,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20328,7 +20177,7 @@ static const NSSItem nss_builtins_items_303 [] = { +@@ -20310,7 +20195,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1228,7 +1252,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20456,7 +20305,7 @@ static const NSSItem nss_builtins_items_304 [] = { +@@ -20438,7 +20323,7 @@ static const NSSItem nss_builtins_items_ "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221" , (PRUint32)1392 } }; @@ -1237,7 +1261,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20486,7 +20335,7 @@ static const NSSItem nss_builtins_items_305 [] = { +@@ -20468,7 +20353,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1246,7 +1270,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20579,7 +20428,7 @@ static const NSSItem nss_builtins_items_306 [] = { +@@ -20561,7 +20446,7 @@ static const NSSItem nss_builtins_items_ "\342\342\104\276\134\367\352\034\365" , (PRUint32)969 } }; @@ -1255,7 +1279,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20607,7 +20456,7 @@ static const NSSItem nss_builtins_items_307 [] = { +@@ -20589,7 +20474,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1264,7 +1288,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20704,7 +20553,7 @@ static const NSSItem nss_builtins_items_308 [] = { +@@ -20686,7 +20571,7 @@ static const NSSItem nss_builtins_items_ "\364" , (PRUint32)993 } }; @@ -1273,7 +1297,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20733,7 +20582,7 @@ static const NSSItem nss_builtins_items_309 [] = { +@@ -20715,7 +20600,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1282,7 +1306,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20831,7 +20680,7 @@ static const NSSItem nss_builtins_items_310 [] = { +@@ -20813,7 +20698,7 @@ static const NSSItem nss_builtins_items_ "\261\050\272" , (PRUint32)1011 } }; @@ -1291,7 +1315,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20860,7 +20709,7 @@ static const NSSItem nss_builtins_items_311 [] = { +@@ -20842,7 +20727,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1300,7 +1324,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20937,7 +20786,7 @@ static const NSSItem nss_builtins_items_312 [] = { +@@ -20919,7 +20804,7 @@ static const NSSItem nss_builtins_items_ "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357" , (PRUint32)848 } }; @@ -1309,7 +1333,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20961,7 +20810,7 @@ static const NSSItem nss_builtins_items_313 [] = { +@@ -20943,7 +20828,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1318,7 +1342,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21038,7 +20887,7 @@ static const NSSItem nss_builtins_items_314 [] = { +@@ -21020,7 +20905,7 @@ static const NSSItem nss_builtins_items_ "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333" , (PRUint32)848 } }; @@ -1327,7 +1351,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21062,7 +20911,7 @@ static const NSSItem nss_builtins_items_315 [] = { +@@ -21044,7 +20929,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1336,7 +1360,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21171,7 +21020,7 @@ static const NSSItem nss_builtins_items_316 [] = { +@@ -21153,7 +21038,7 @@ static const NSSItem nss_builtins_items_ "\051\340\266\270\011\150\031\034\030\103" , (PRUint32)1354 } }; @@ -1345,7 +1369,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21195,7 +21044,7 @@ static const NSSItem nss_builtins_items_317 [] = { +@@ -21177,7 +21062,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1354,7 +1378,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21252,7 +21101,7 @@ static const NSSItem nss_builtins_items_318 [] = { +@@ -21234,7 +21119,7 @@ static const NSSItem nss_builtins_items_ "\214\171" , (PRUint32)514 } }; @@ -1363,7 +1387,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21276,7 +21125,7 @@ static const NSSItem nss_builtins_items_319 [] = { +@@ -21258,7 +21143,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1372,7 +1396,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21366,7 +21215,7 @@ static const NSSItem nss_builtins_items_320 [] = { +@@ -21348,7 +21233,7 @@ static const NSSItem nss_builtins_items_ "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054" , (PRUint32)959 } }; @@ -1381,7 +1405,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21393,7 +21242,7 @@ static const NSSItem nss_builtins_items_321 [] = { +@@ -21375,7 +21260,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1390,7 +1414,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21511,7 +21360,7 @@ static const NSSItem nss_builtins_items_322 [] = { +@@ -21493,7 +21378,7 @@ static const NSSItem nss_builtins_items_ "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171" , (PRUint32)1440 } }; @@ -1399,7 +1423,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21537,7 +21386,7 @@ static const NSSItem nss_builtins_items_323 [] = { +@@ -21519,7 +21404,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1408,7 +1432,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21670,7 +21519,7 @@ static const NSSItem nss_builtins_items_324 [] = { +@@ -21652,7 +21537,7 @@ static const NSSItem nss_builtins_items_ "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303" , (PRUint32)1679 } }; @@ -1417,7 +1441,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21696,7 +21545,7 @@ static const NSSItem nss_builtins_items_325 [] = { +@@ -21678,7 +21563,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1426,7 +1450,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21790,7 +21639,7 @@ static const NSSItem nss_builtins_items_326 [] = { +@@ -21772,7 +21657,7 @@ static const NSSItem nss_builtins_items_ "\204\232\315" , (PRUint32)979 } }; @@ -1435,7 +1459,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21818,7 +21667,7 @@ static const NSSItem nss_builtins_items_327 [] = { +@@ -21800,7 +21685,7 @@ static const NSSItem nss_builtins_items_ { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; @@ -1444,7 +1468,7 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21902,7 +21751,7 @@ static const NSSItem nss_builtins_items_328 [] = { +@@ -21884,7 +21769,7 @@ static const NSSItem nss_builtins_items_ "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257" , (PRUint32)895 } }; @@ -1453,27 +1477,856 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.1 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -22791,13 +22640,11 @@ nss_builtins_data[] = { - { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, - { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, +@@ -21910,6 +21795,811 @@ static const NSSItem nss_builtins_items_ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrust DigiNotar Root CA", (PRUint32)38 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" ++"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" ++"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" ++"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" ++"\154" ++, (PRUint32)97 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" ++"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" ++"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" ++"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" ++"\154" ++, (PRUint32)97 }, ++ { (void *)"\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377" ++"\377\377" ++, (PRUint32)18 }, ++ { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\017" ++"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\060" ++"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" ++"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" ++"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" ++"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" ++"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" ++"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" ++"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" ++"\036\027\015\060\067\060\067\062\067\061\067\061\071\063\067\132" ++"\027\015\062\065\060\063\063\061\061\070\061\071\062\062\132\060" ++"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" ++"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" ++"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" ++"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" ++"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" ++"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" ++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" ++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" ++"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" ++"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" ++"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" ++"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" ++"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" ++"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" ++"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" ++"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" ++"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" ++"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" ++"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" ++"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" ++"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" ++"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" ++"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" ++"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" ++"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" ++"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" ++"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" ++"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" ++"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" ++"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" ++"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" ++"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" ++"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" ++"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" ++"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" ++"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" ++"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" ++"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" ++"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" ++"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" ++"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" ++"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" ++"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" ++"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153" ++"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" ++"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" ++"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" ++"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" ++"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" ++"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" ++"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" ++"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" ++"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" ++"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" ++"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" ++"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" ++"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" ++"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" ++"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" ++"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" ++"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" ++"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" ++"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" ++"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" ++"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" ++"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" ++"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" ++"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" ++"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" ++"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" ++"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" ++"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" ++"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" ++"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" ++"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" ++"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" ++"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" ++"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" ++, (PRUint32)1422 } ++}; ++static const NSSItem nss_builtins_items_329 [] = { ++ { (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 *)"Explicitly Distrust DigiNotar Root CA", (PRUint32)38 }, ++ { (void *)"\301\167\313\113\340\264\046\216\365\307\317\105\231\042\271\260" ++"\316\272\041\057" ++, (PRUint32)20 }, ++ { (void *)"\012\244\325\314\272\264\373\243\131\343\346\001\335\123\331\116" ++, (PRUint32)16 }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" ++"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" ++"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" ++"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" ++"\154" ++, (PRUint32)97 }, ++ { (void *)"\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377" ++"\377\377" ++, (PRUint32)18 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrust DigiNotar Services 1024 CA", (PRUint32)47 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151" ++"\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163" ++"\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206" ++"\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151" ++"\147\151\156\157\164\141\162\056\156\154" ++, (PRUint32)106 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151" ++"\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163" ++"\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206" ++"\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151" ++"\147\151\156\157\164\141\162\056\156\154" ++, (PRUint32)106 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)"\060\202\003\161\060\202\002\332\240\003\002\001\002\002\004\017" ++"\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\150\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151" ++"\116\157\164\141\162\061\043\060\041\006\003\125\004\003\023\032" ++"\104\151\147\151\116\157\164\141\162\040\123\145\162\166\151\143" ++"\145\163\040\061\060\062\064\040\103\101\061\040\060\036\006\011" ++"\052\206\110\206\367\015\001\011\001\026\021\151\156\146\157\100" ++"\144\151\147\151\156\157\164\141\162\056\156\154\060\036\027\015" ++"\060\067\060\067\062\066\061\065\065\071\060\061\132\027\015\061" ++"\063\060\070\062\066\061\066\062\071\060\061\132\060\150\061\013" ++"\060\011\006\003\125\004\006\023\002\116\114\061\022\060\020\006" ++"\003\125\004\012\023\011\104\151\147\151\116\157\164\141\162\061" ++"\043\060\041\006\003\125\004\003\023\032\104\151\147\151\116\157" ++"\164\141\162\040\123\145\162\166\151\143\145\163\040\061\060\062" ++"\064\040\103\101\061\040\060\036\006\011\052\206\110\206\367\015" ++"\001\011\001\026\021\151\156\146\157\100\144\151\147\151\156\157" ++"\164\141\162\056\156\154\060\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\332\233\115\135\074\371\321\342\213\306\306\010\040" ++"\305\331\036\110\354\146\130\147\171\142\053\101\143\364\211\215" ++"\150\332\257\270\224\066\213\031\044\244\240\223\322\231\017\262" ++"\255\055\065\115\315\057\152\341\371\233\031\053\274\004\032\176" ++"\055\075\122\144\315\361\076\147\017\211\056\350\362\117\256\246" ++"\010\241\205\376\241\251\011\346\306\253\076\103\374\257\172\003" ++"\221\332\246\071\246\141\356\230\117\030\250\323\263\257\146\202" ++"\351\237\274\335\162\371\006\004\275\022\331\030\044\347\253\223" ++"\123\213\131\002\003\001\000\001\243\202\001\046\060\202\001\042" ++"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001" ++"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006" ++"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005" ++"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\021\006" ++"\003\125\035\040\004\012\060\010\060\006\006\004\125\035\040\000" ++"\060\063\006\010\053\006\001\005\005\007\001\001\004\047\060\045" ++"\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\145\156\164\162\165\163" ++"\164\056\156\145\164\060\063\006\003\125\035\037\004\054\060\052" ++"\060\050\240\046\240\044\206\042\150\164\164\160\072\057\057\143" ++"\162\154\056\145\156\164\162\165\163\164\056\156\145\164\057\163" ++"\145\162\166\145\162\061\056\143\162\154\060\035\006\003\125\035" ++"\016\004\026\004\024\376\334\224\111\014\157\357\134\177\306\361" ++"\022\231\117\026\111\255\373\202\145\060\013\006\003\125\035\017" ++"\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060" ++"\026\200\024\360\027\142\023\125\075\263\377\012\000\153\373\120" ++"\204\227\363\355\142\320\032\060\031\006\011\052\206\110\206\366" ++"\175\007\101\000\004\014\060\012\033\004\126\067\056\061\003\002" ++"\000\201\060\015\006\011\052\206\110\206\367\015\001\001\005\005" ++"\000\003\201\201\000\143\164\152\067\251\077\226\234\146\310\130" ++"\254\011\311\357\365\145\224\177\243\002\304\070\061\275\135\043" ++"\207\354\324\126\262\311\262\156\344\005\006\374\354\365\372\210" ++"\160\131\324\356\346\335\265\172\240\243\140\057\002\014\253\336" ++"\022\135\257\360\065\113\252\212\107\221\032\365\205\054\102\307" ++"\035\357\225\103\263\136\270\225\223\245\332\305\050\252\255\162" ++"\055\061\255\231\153\154\377\214\041\047\257\255\232\221\053\307" ++"\335\130\303\156\007\305\237\171\322\307\214\125\277\114\307\047" ++"\136\121\026\053\076" ++, (PRUint32)885 } ++}; ++static const NSSItem nss_builtins_items_331 [] = { ++ { (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 *)"Explicitly Distrust DigiNotar Services 1024 CA", (PRUint32)47 }, ++ { (void *)"\022\073\352\312\146\147\167\141\340\353\150\362\376\355\242\017" ++"\040\005\125\160" ++, (PRUint32)20 }, ++ { (void *)"\057\026\150\227\114\150\117\316\122\212\354\123\217\223\111\370" ++, (PRUint32)16 }, ++ { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151" ++"\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163" ++"\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206" ++"\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151" ++"\147\151\156\157\164\141\162\056\156\154" ++, (PRUint32)106 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrust DigiNotar Cyber CA", (PRUint32)39 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++"\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026" ++"\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056" ++"\156\154" ++, (PRUint32)98 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++"\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026" ++"\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056" ++"\156\154" ++, (PRUint32)98 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)"\060\202\005\105\060\202\004\256\240\003\002\001\002\002\004\017" ++"\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\140\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151" ++"\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022" ++"\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040" ++"\103\101\061\040\060\036\006\011\052\206\110\206\367\015\001\011" ++"\001\026\021\151\156\146\157\100\144\151\147\151\156\157\164\141" ++"\162\056\156\154\060\036\027\015\060\066\061\060\060\064\061\060" ++"\065\064\061\062\132\027\015\061\061\061\060\060\064\061\060\065" ++"\063\061\062\132\060\140\061\013\060\011\006\003\125\004\006\023" ++"\002\116\114\061\022\060\020\006\003\125\004\012\023\011\104\151" ++"\147\151\116\157\164\141\162\061\033\060\031\006\003\125\004\003" ++"\023\022\104\151\147\151\116\157\164\141\162\040\103\171\142\145" ++"\162\040\103\101\061\040\060\036\006\011\052\206\110\206\367\015" ++"\001\011\001\026\021\151\156\146\157\100\144\151\147\151\156\157" ++"\164\141\162\056\156\154\060\202\002\042\060\015\006\011\052\206" ++"\110\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202" ++"\002\012\002\202\002\001\000\322\316\025\012\055\250\136\204\147" ++"\255\375\276\357\106\307\310\271\317\163\374\364\064\271\371\054" ++"\103\347\140\023\075\172\343\262\317\073\147\154\220\255\300\271" ++"\077\204\122\360\065\102\334\164\334\050\073\275\122\264\247\254" ++"\162\105\027\306\360\211\353\264\252\045\362\135\113\136\321\331" ++"\207\272\326\175\174\365\316\062\237\020\063\305\261\112\273\136" ++"\221\061\302\320\351\101\302\221\144\176\011\101\073\333\213\010" ++"\067\152\252\312\122\336\265\071\036\300\210\003\245\077\213\231" ++"\023\141\103\265\233\202\263\356\040\157\317\241\104\242\352\057" ++"\153\100\237\217\053\127\255\241\123\302\205\042\151\235\240\077" ++"\121\337\013\101\221\015\245\341\250\252\134\111\010\135\275\336" ++"\160\101\261\017\311\143\153\323\177\064\164\002\057\064\132\170" ++"\165\034\150\172\201\147\212\363\332\100\360\140\143\364\222\040" ++"\327\003\246\075\243\036\147\304\204\033\101\245\311\214\346\275" ++"\352\110\266\005\026\010\263\067\022\132\367\141\074\367\070\157" ++"\056\227\340\157\126\070\124\323\050\265\255\024\156\056\113\144" ++"\265\047\145\267\165\045\011\266\007\075\225\126\002\012\202\140" ++"\262\163\105\340\063\046\121\164\232\271\324\120\034\366\115\133" ++"\133\122\122\023\132\246\177\247\016\341\350\101\124\147\230\214" ++"\207\325\311\323\154\313\323\124\222\006\011\064\101\367\201\157" ++"\077\236\311\174\165\125\260\347\301\263\167\350\303\304\000\065" ++"\225\100\160\020\112\005\336\045\273\237\131\245\144\274\107\140" ++"\277\140\343\166\213\023\125\335\341\164\172\271\317\044\246\152" ++"\177\336\144\042\104\130\150\202\152\020\371\075\345\076\033\271" ++"\275\374\042\364\140\004\211\273\125\155\050\125\372\336\216\215" ++"\033\041\024\327\067\213\064\173\115\366\262\262\020\317\063\261" ++"\175\034\142\231\110\313\053\154\166\226\125\277\031\015\035\037" ++"\273\145\252\033\216\231\265\306\050\220\345\202\055\170\120\040" ++"\232\375\171\057\044\177\360\211\051\151\364\175\315\163\276\263" ++"\355\116\301\321\355\122\136\217\367\270\327\215\207\255\262\331" ++"\033\121\022\377\126\263\341\257\064\175\134\244\170\210\020\236" ++"\235\003\306\245\252\242\044\121\367\111\024\305\261\356\131\103" ++"\225\337\253\150\050\060\077\002\003\001\000\001\243\202\001\206" ++"\060\202\001\202\060\022\006\003\125\035\023\001\001\377\004\010" ++"\060\006\001\001\377\002\001\001\060\123\006\003\125\035\040\004" ++"\114\060\112\060\110\006\011\053\006\001\004\001\261\076\001\000" ++"\060\073\060\071\006\010\053\006\001\005\005\007\002\001\026\055" ++"\150\164\164\160\072\057\057\167\167\167\056\160\165\142\154\151" ++"\143\055\164\162\165\163\164\056\143\157\155\057\103\120\123\057" ++"\117\155\156\151\122\157\157\164\056\150\164\155\154\060\016\006" ++"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\201\240" ++"\006\003\125\035\043\004\201\230\060\201\225\200\024\246\014\035" ++"\237\141\377\007\027\265\277\070\106\333\103\060\325\216\260\122" ++"\006\241\171\244\167\060\165\061\013\060\011\006\003\125\004\006" ++"\023\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107" ++"\124\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047" ++"\060\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142" ++"\145\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156" ++"\163\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003" ++"\023\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164" ++"\040\107\154\157\142\141\154\040\122\157\157\164\202\002\001\245" ++"\060\105\006\003\125\035\037\004\076\060\074\060\072\240\070\240" ++"\066\206\064\150\164\164\160\072\057\057\167\167\167\056\160\165" ++"\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143" ++"\147\151\055\142\151\156\057\103\122\114\057\062\060\061\070\057" ++"\143\144\160\056\143\162\154\060\035\006\003\125\035\016\004\026" ++"\004\024\253\371\150\337\317\112\067\327\173\105\214\137\162\336" ++"\100\104\303\145\273\302\060\015\006\011\052\206\110\206\367\015" ++"\001\001\005\005\000\003\201\201\000\217\150\153\245\133\007\272" ++"\104\146\016\034\250\134\060\173\063\344\012\046\004\374\357\236" ++"\032\070\326\056\241\037\320\231\107\302\165\144\044\375\236\073" ++"\050\166\271\046\050\141\221\014\155\054\370\004\237\174\120\001" ++"\325\343\151\257\357\025\322\105\233\044\011\052\146\005\117\045" ++"\201\312\135\276\252\301\131\047\256\063\216\202\367\337\164\260" ++"\125\263\216\370\347\067\310\156\252\126\104\366\275\123\201\043" ++"\226\075\264\372\062\212\123\146\104\045\242\045\306\246\074\045" ++"\214\360\340\050\006\042\267\046\101" ++, (PRUint32)1353 } ++}; ++static const NSSItem nss_builtins_items_333 [] = { ++ { (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 *)"Explicitly Distrust DigiNotar Cyber CA", (PRUint32)39 }, ++ { (void *)"\245\216\240\354\366\104\126\065\031\035\150\133\307\240\344\034" ++"\260\115\171\056" ++, (PRUint32)20 }, ++ { (void *)"\274\275\211\022\264\377\345\371\046\107\310\140\066\133\331\124" ++, (PRUint32)16 }, ++ { (void *)"\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++"\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026" ++"\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056" ++"\156\154" ++, (PRUint32)98 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrust DigiNotar Cyber CA 2nd", (PRUint32)43 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++, (PRUint32)64 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++, (PRUint32)64 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)"\060\202\005\001\060\202\004\152\240\003\002\001\002\002\004\017" ++"\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\076\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151" ++"\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022" ++"\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040" ++"\103\101\060\036\027\015\060\066\060\071\062\067\061\060\065\063" ++"\065\063\132\027\015\061\063\060\071\062\060\060\071\064\064\060" ++"\067\132\060\076\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151" ++"\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022" ++"\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040" ++"\103\101\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\322\316\025\012\055\250\136\204\147\255\375\276\357" ++"\106\307\310\271\317\163\374\364\064\271\371\054\103\347\140\023" ++"\075\172\343\262\317\073\147\154\220\255\300\271\077\204\122\360" ++"\065\102\334\164\334\050\073\275\122\264\247\254\162\105\027\306" ++"\360\211\353\264\252\045\362\135\113\136\321\331\207\272\326\175" ++"\174\365\316\062\237\020\063\305\261\112\273\136\221\061\302\320" ++"\351\101\302\221\144\176\011\101\073\333\213\010\067\152\252\312" ++"\122\336\265\071\036\300\210\003\245\077\213\231\023\141\103\265" ++"\233\202\263\356\040\157\317\241\104\242\352\057\153\100\237\217" ++"\053\127\255\241\123\302\205\042\151\235\240\077\121\337\013\101" ++"\221\015\245\341\250\252\134\111\010\135\275\336\160\101\261\017" ++"\311\143\153\323\177\064\164\002\057\064\132\170\165\034\150\172" ++"\201\147\212\363\332\100\360\140\143\364\222\040\327\003\246\075" ++"\243\036\147\304\204\033\101\245\311\214\346\275\352\110\266\005" ++"\026\010\263\067\022\132\367\141\074\367\070\157\056\227\340\157" ++"\126\070\124\323\050\265\255\024\156\056\113\144\265\047\145\267" ++"\165\045\011\266\007\075\225\126\002\012\202\140\262\163\105\340" ++"\063\046\121\164\232\271\324\120\034\366\115\133\133\122\122\023" ++"\132\246\177\247\016\341\350\101\124\147\230\214\207\325\311\323" ++"\154\313\323\124\222\006\011\064\101\367\201\157\077\236\311\174" ++"\165\125\260\347\301\263\167\350\303\304\000\065\225\100\160\020" ++"\112\005\336\045\273\237\131\245\144\274\107\140\277\140\343\166" ++"\213\023\125\335\341\164\172\271\317\044\246\152\177\336\144\042" ++"\104\130\150\202\152\020\371\075\345\076\033\271\275\374\042\364" ++"\140\004\211\273\125\155\050\125\372\336\216\215\033\041\024\327" ++"\067\213\064\173\115\366\262\262\020\317\063\261\175\034\142\231" ++"\110\313\053\154\166\226\125\277\031\015\035\037\273\145\252\033" ++"\216\231\265\306\050\220\345\202\055\170\120\040\232\375\171\057" ++"\044\177\360\211\051\151\364\175\315\163\276\263\355\116\301\321" ++"\355\122\136\217\367\270\327\215\207\255\262\331\033\121\022\377" ++"\126\263\341\257\064\175\134\244\170\210\020\236\235\003\306\245" ++"\252\242\044\121\367\111\024\305\261\356\131\103\225\337\253\150" ++"\050\060\077\002\003\001\000\001\243\202\001\206\060\202\001\202" ++"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001" ++"\377\002\001\001\060\123\006\003\125\035\040\004\114\060\112\060" ++"\110\006\011\053\006\001\004\001\261\076\001\000\060\073\060\071" ++"\006\010\053\006\001\005\005\007\002\001\026\055\150\164\164\160" ++"\072\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162" ++"\165\163\164\056\143\157\155\057\103\120\123\057\117\155\156\151" ++"\122\157\157\164\056\150\164\155\154\060\016\006\003\125\035\017" ++"\001\001\377\004\004\003\002\001\006\060\201\240\006\003\125\035" ++"\043\004\201\230\060\201\225\200\024\246\014\035\237\141\377\007" ++"\027\265\277\070\106\333\103\060\325\216\260\122\006\241\171\244" ++"\167\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103" ++"\157\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003" ++"\125\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162" ++"\165\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111" ++"\156\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124" ++"\105\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157" ++"\142\141\154\040\122\157\157\164\202\002\001\245\060\105\006\003" ++"\125\035\037\004\076\060\074\060\072\240\070\240\066\206\064\150" ++"\164\164\160\072\057\057\167\167\167\056\160\165\142\154\151\143" ++"\055\164\162\165\163\164\056\143\157\155\057\143\147\151\055\142" ++"\151\156\057\103\122\114\057\062\060\061\070\057\143\144\160\056" ++"\143\162\154\060\035\006\003\125\035\016\004\026\004\024\253\371" ++"\150\337\317\112\067\327\173\105\214\137\162\336\100\104\303\145" ++"\273\302\060\015\006\011\052\206\110\206\367\015\001\001\005\005" ++"\000\003\201\201\000\011\312\142\017\215\273\112\340\324\172\065" ++"\053\006\055\321\050\141\266\254\001\373\203\111\274\256\324\057" ++"\055\206\256\031\203\245\326\035\023\342\027\276\376\062\164\351" ++"\172\024\070\312\224\136\367\051\001\151\161\033\221\032\375\243" ++"\273\252\035\312\173\342\026\375\241\243\016\363\014\137\262\341" ++"\040\061\224\053\136\222\166\355\372\351\265\043\246\277\012\073" ++"\003\251\157\122\140\124\315\137\351\267\057\174\242\047\375\101" ++"\203\165\266\015\373\170\046\363\261\105\351\062\225\052\032\065" ++"\041\225\305\242\165" ++, (PRUint32)1285 } ++}; ++static const NSSItem nss_builtins_items_335 [] = { ++ { (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 *)"Explicitly Distrust DigiNotar Cyber CA 2nd", (PRUint32)43 }, ++ { (void *)"\210\036\105\005\017\230\331\131\373\012\065\371\114\016\050\227" ++"\125\026\051\263" ++, (PRUint32)20 }, ++ { (void *)"\360\256\251\075\362\054\210\334\174\205\033\226\175\132\034\021" ++, (PRUint32)16 }, ++ { (void *)"\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" ++"\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151" ++"\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101" ++, (PRUint32)64 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrusted DigiNotar PKIoverheid", (PRUint32)44 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004" ++"\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162" ++"\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145" ++"\156" ++, (PRUint32)97 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004" ++"\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162" ++"\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145" ++"\156" ++, (PRUint32)97 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)"\060\202\004\216\060\202\003\166\240\003\002\001\002\002\004\017" ++"\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005" ++"\005\000\060\137\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\027\060\025\006\003\125\004\012\023\016\104\151\147\151" ++"\116\157\164\141\162\040\102\056\126\056\061\067\060\065\006\003" ++"\125\004\003\023\056\104\151\147\151\116\157\164\141\162\040\120" ++"\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117\166" ++"\145\162\150\145\151\144\040\145\156\040\102\145\144\162\151\152" ++"\166\145\156\060\036\027\015\060\067\060\067\060\065\060\070\064" ++"\062\060\070\132\027\015\061\065\060\067\062\067\060\070\063\071" ++"\064\067\132\060\137\061\013\060\011\006\003\125\004\006\023\002" ++"\116\114\061\027\060\025\006\003\125\004\012\023\016\104\151\147" ++"\151\116\157\164\141\162\040\102\056\126\056\061\067\060\065\006" ++"\003\125\004\003\023\056\104\151\147\151\116\157\164\141\162\040" ++"\120\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117" ++"\166\145\162\150\145\151\144\040\145\156\040\102\145\144\162\151" ++"\152\166\145\156\060\202\001\042\060\015\006\011\052\206\110\206" ++"\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012" ++"\002\202\001\001\000\334\275\322\247\116\152\012\273\073\242\205" ++"\341\177\000\255\276\264\060\150\230\007\315\240\172\304\224\317" ++"\161\371\212\067\344\123\353\127\166\314\213\346\154\376\356\207" ++"\125\310\076\273\004\071\000\247\200\170\254\133\117\176\364\275" ++"\270\124\270\161\073\007\061\111\071\223\124\174\040\073\171\053" ++"\217\273\141\220\175\261\254\346\037\220\056\235\105\001\251\144" ++"\055\115\303\057\271\347\120\325\116\052\134\253\166\166\067\106" ++"\327\171\354\102\231\367\242\354\244\211\160\334\070\053\207\246" ++"\252\044\346\235\222\044\033\276\366\375\324\057\031\027\172\346" ++"\062\007\224\124\005\123\103\351\154\274\257\107\313\274\313\375" ++"\275\073\104\022\201\361\153\113\273\355\264\317\253\045\117\030" ++"\322\314\002\374\243\117\265\102\063\313\131\315\011\334\323\120" ++"\375\240\166\214\254\176\146\212\102\366\255\034\222\363\266\373" ++"\024\106\353\115\327\057\060\340\155\356\133\066\276\104\164\267" ++"\040\005\127\205\115\350\000\031\242\366\014\346\256\241\300\102" ++"\337\247\254\202\135\307\150\267\030\346\211\113\232\153\372\316" ++"\171\371\363\054\247\002\003\001\000\001\243\202\001\120\060\202" ++"\001\114\060\110\006\003\125\035\040\004\101\060\077\060\075\006" ++"\004\125\035\040\000\060\065\060\063\006\010\053\006\001\005\005" ++"\007\002\001\026\047\150\164\164\160\072\057\057\167\167\167\056" ++"\144\151\147\151\156\157\164\141\162\056\156\154\057\143\160\163" ++"\057\160\153\151\157\166\145\162\150\145\151\144\060\017\006\003" ++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006" ++"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\201\200" ++"\006\003\125\035\043\004\171\060\167\200\024\013\206\326\017\167" ++"\243\150\261\373\144\011\303\210\156\134\004\034\127\351\075\241" ++"\131\244\127\060\125\061\013\060\011\006\003\125\004\006\023\002" ++"\116\114\061\036\060\034\006\003\125\004\012\023\025\123\164\141" ++"\141\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144" ++"\145\156\061\046\060\044\006\003\125\004\003\023\035\123\164\141" ++"\141\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144" ++"\145\156\040\122\157\157\164\040\103\101\202\004\000\230\232\171" ++"\060\075\006\003\125\035\037\004\066\060\064\060\062\240\060\240" ++"\056\206\054\150\164\164\160\072\057\057\143\162\154\056\160\153" ++"\151\157\166\145\162\150\145\151\144\056\156\154\057\104\157\155" ++"\117\166\114\141\164\145\163\164\103\122\114\056\143\162\154\060" ++"\035\006\003\125\035\016\004\026\004\024\114\010\311\215\166\361" ++"\230\307\076\337\074\327\057\165\015\261\166\171\227\314\060\015" ++"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001" ++"\001\000\014\224\207\032\277\115\343\205\342\356\327\330\143\171" ++"\016\120\337\306\204\133\322\273\331\365\061\012\032\065\227\164" ++"\337\024\372\052\017\076\355\240\343\010\366\325\116\133\257\246" ++"\256\045\342\105\153\042\017\267\124\050\176\222\336\215\024\154" ++"\321\034\345\156\164\004\234\267\357\064\104\105\337\311\203\035" ++"\031\037\300\051\151\337\211\325\077\302\260\123\155\345\116\027" ++"\344\163\141\043\023\046\161\103\375\114\131\313\303\337\042\252" ++"\041\053\331\277\225\021\032\212\244\342\253\247\135\113\157\051" ++"\365\122\321\344\322\025\261\213\376\360\003\317\247\175\351\231" ++"\207\070\263\015\163\024\344\162\054\341\316\365\255\006\110\144" ++"\372\323\051\271\242\330\273\364\325\013\245\100\104\103\216\240" ++"\277\316\132\245\122\114\144\323\027\061\141\314\350\244\212\350" ++"\344\210\373\351\345\057\006\063\063\233\224\146\146\261\253\120" ++"\072\241\011\201\164\123\132\047\271\246\322\045\317\323\303\247" ++"\377\226\320\057\352\340\036\215\122\351\030\034\040\012\107\240" ++"\226\126\016\100\220\121\104\254\032\375\361\356\205\037\367\102" ++"\132\145" ++, (PRUint32)1170 } ++}; ++static const NSSItem nss_builtins_items_337 [] = { ++ { (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 *)"Explicitly Distrusted DigiNotar PKIoverheid", (PRUint32)44 }, ++ { (void *)"\247\250\311\254\364\137\220\222\166\206\270\300\242\016\223\130" ++"\175\336\060\344" ++, (PRUint32)20 }, ++ { (void *)"\243\317\263\377\371\117\247\261\353\072\165\130\116\056\237\352" ++, (PRUint32)16 }, ++ { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004" ++"\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162" ++"\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145" ++"\156" ++, (PRUint32)97 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++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) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Explicitly Distrusted DigiNotar PKIoverheid G2", (PRUint32)47 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004" ++"\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141" ++"\156\151\163\141\164\151\145\040\055\040\107\062" ++, (PRUint32)92 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004" ++"\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141" ++"\156\151\163\141\164\151\145\040\055\040\107\062" ++, (PRUint32)92 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)"\060\202\006\225\060\202\004\175\240\003\002\001\002\002\004\017" ++"\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\013" ++"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116" ++"\114\061\027\060\025\006\003\125\004\012\014\016\104\151\147\151" ++"\116\157\164\141\162\040\102\056\126\056\061\062\060\060\006\003" ++"\125\004\003\014\051\104\151\147\151\116\157\164\141\162\040\120" ++"\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117\162" ++"\147\141\156\151\163\141\164\151\145\040\055\040\107\062\060\036" ++"\027\015\061\060\060\065\061\062\060\070\065\061\063\071\132\027" ++"\015\062\060\060\063\062\063\060\071\065\060\060\065\132\060\132" ++"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\027\060" ++"\025\006\003\125\004\012\014\016\104\151\147\151\116\157\164\141" ++"\162\040\102\056\126\056\061\062\060\060\006\003\125\004\003\014" ++"\051\104\151\147\151\116\157\164\141\162\040\120\113\111\157\166" ++"\145\162\150\145\151\144\040\103\101\040\117\162\147\141\156\151" ++"\163\141\164\151\145\040\055\040\107\062\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\261\023\031\017\047" ++"\346\154\324\125\206\113\320\354\211\212\105\221\170\254\107\275" ++"\107\053\344\374\105\353\117\264\046\163\133\067\323\303\177\366" ++"\343\336\327\243\370\055\150\305\010\076\113\224\326\344\207\045" ++"\066\153\204\265\030\164\363\050\130\163\057\233\152\317\274\004" ++"\036\366\336\335\257\374\113\252\365\333\146\142\045\001\045\202" ++"\336\362\227\132\020\156\335\135\251\042\261\004\251\043\163\072" ++"\370\161\255\035\317\204\104\353\107\321\257\155\310\174\050\253" ++"\307\362\067\172\164\137\137\305\002\024\212\243\132\343\033\154" ++"\001\343\135\216\331\150\326\364\011\033\062\334\221\265\054\365" ++"\040\353\214\003\155\046\111\270\223\304\205\135\330\322\233\257" ++"\126\152\314\005\063\314\240\102\236\064\125\104\234\153\240\324" ++"\022\320\053\124\315\267\211\015\345\366\353\350\373\205\001\063" ++"\117\172\153\361\235\162\063\226\016\367\262\204\245\245\047\304" ++"\047\361\121\163\051\167\272\147\156\376\114\334\264\342\241\241" ++"\201\057\071\111\215\103\070\023\316\320\245\134\302\207\072\000" ++"\147\145\102\043\361\066\131\012\035\243\121\310\274\243\224\052" ++"\061\337\343\074\362\235\032\074\004\260\357\261\012\060\023\163" ++"\266\327\363\243\114\001\165\024\205\170\300\327\212\071\130\205" ++"\120\372\056\346\305\276\317\213\077\257\217\066\324\045\011\055" ++"\322\017\254\162\223\362\277\213\324\120\263\371\025\120\233\231" ++"\365\024\331\373\213\221\243\062\046\046\240\370\337\073\140\201" ++"\206\203\171\133\053\353\023\075\051\072\301\155\335\275\236\216" ++"\207\326\112\256\064\227\005\356\024\246\366\334\070\176\112\351" ++"\044\124\007\075\227\150\067\106\153\015\307\250\041\257\023\124" ++"\344\011\152\361\115\106\012\311\135\373\233\117\275\336\373\267" ++"\124\313\270\070\234\247\071\373\152\055\300\173\215\253\245\247" ++"\127\354\112\222\212\063\305\341\040\134\163\330\220\222\053\200" ++"\325\017\206\030\151\174\071\117\204\206\274\367\114\133\363\325" ++"\264\312\240\302\360\067\042\312\171\122\037\123\346\252\363\220" ++"\260\073\335\362\050\375\254\353\305\006\044\240\311\324\057\017" ++"\130\375\265\236\354\017\317\262\131\320\242\004\172\070\152\256" ++"\162\373\275\360\045\142\224\011\247\005\013\002\003\001\000\001" ++"\243\202\001\141\060\202\001\135\060\110\006\003\125\035\040\004" ++"\101\060\077\060\075\006\004\125\035\040\000\060\065\060\063\006" ++"\010\053\006\001\005\005\007\002\001\026\047\150\164\164\160\072" ++"\057\057\167\167\167\056\144\151\147\151\156\157\164\141\162\056" ++"\156\154\057\143\160\163\057\160\153\151\157\166\145\162\150\145" ++"\151\144\060\017\006\003\125\035\023\001\001\377\004\005\060\003" ++"\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003" ++"\002\001\006\060\201\205\006\003\125\035\043\004\176\060\174\200" ++"\024\071\020\213\111\222\134\333\141\022\040\315\111\235\032\216" ++"\332\234\147\100\271\241\136\244\134\060\132\061\013\060\011\006" ++"\003\125\004\006\023\002\116\114\061\036\060\034\006\003\125\004" ++"\012\014\025\123\164\141\141\164\040\144\145\162\040\116\145\144" ++"\145\162\154\141\156\144\145\156\061\053\060\051\006\003\125\004" ++"\003\014\042\123\164\141\141\164\040\144\145\162\040\116\145\144" ++"\145\162\154\141\156\144\145\156\040\122\157\157\164\040\103\101" ++"\040\055\040\107\062\202\004\000\230\226\364\060\111\006\003\125" ++"\035\037\004\102\060\100\060\076\240\074\240\072\206\070\150\164" ++"\164\160\072\057\057\143\162\154\056\160\153\151\157\166\145\162" ++"\150\145\151\144\056\156\154\057\104\157\155\117\162\147\141\156" ++"\151\163\141\164\151\145\114\141\164\145\163\164\103\122\114\055" ++"\107\062\056\143\162\154\060\035\006\003\125\035\016\004\026\004" ++"\024\274\135\224\073\331\253\173\003\045\163\141\302\333\055\356" ++"\374\253\217\145\241\060\015\006\011\052\206\110\206\367\015\001" ++"\001\013\005\000\003\202\002\001\000\217\374\055\114\267\331\055" ++"\325\037\275\357\313\364\267\150\027\165\235\116\325\367\335\234" ++"\361\052\046\355\237\242\266\034\003\325\123\263\354\010\317\064" ++"\342\343\303\364\265\026\057\310\303\276\327\323\163\253\000\066" ++"\371\032\112\176\326\143\351\136\106\272\245\266\216\025\267\243" ++"\052\330\103\035\357\135\310\037\201\205\263\213\367\377\074\364" ++"\331\364\106\010\077\234\274\035\240\331\250\114\315\045\122\116" ++"\012\261\040\367\037\351\103\331\124\106\201\023\232\300\136\164" ++"\154\052\230\062\352\374\167\273\015\245\242\061\230\042\176\174" ++"\174\347\332\244\255\354\267\056\032\031\161\370\110\120\332\103" ++"\217\054\204\335\301\100\047\343\265\360\025\116\226\324\370\134" ++"\343\206\051\106\053\327\073\007\353\070\177\310\206\127\227\323" ++"\357\052\063\304\027\120\325\144\151\153\053\153\105\136\135\057" ++"\027\312\132\116\317\303\327\071\074\365\073\237\106\271\233\347" ++"\016\111\227\235\326\325\343\033\017\352\217\001\116\232\023\224" ++"\131\012\002\007\110\113\032\140\253\177\117\355\013\330\125\015" ++"\150\157\125\234\151\145\025\102\354\300\334\335\154\254\303\026" ++"\316\013\035\126\233\244\304\304\322\056\340\017\342\104\047\053" ++"\120\151\244\334\142\350\212\041\051\102\154\314\000\072\226\166" ++"\233\357\100\300\244\136\167\204\062\154\046\052\071\146\256\135" ++"\343\271\271\262\054\150\037\036\232\220\003\071\360\252\263\244" ++"\314\111\213\030\064\351\067\311\173\051\307\204\174\157\104\025" ++"\057\354\141\131\004\311\105\313\242\326\122\242\174\177\051\222" ++"\326\112\305\213\102\250\324\376\352\330\307\207\043\030\344\235" ++"\172\175\163\100\122\230\240\256\156\343\005\077\005\017\340\245" ++"\306\155\115\355\203\067\210\234\307\363\334\102\232\152\266\327" ++"\041\111\066\167\362\357\030\117\305\160\331\236\351\336\267\053" ++"\213\364\274\176\050\337\015\100\311\205\134\256\235\305\061\377" ++"\320\134\016\265\250\176\360\351\057\272\257\210\256\345\265\321" ++"\130\245\257\234\161\247\051\001\220\203\151\067\202\005\272\374" ++"\011\301\010\156\214\170\073\303\063\002\200\077\104\205\010\035" ++"\337\125\126\010\255\054\205\055\135\261\003\341\256\252\164\305" ++"\244\363\116\272\067\230\173\202\271" ++, (PRUint32)1689 } ++}; ++static const NSSItem nss_builtins_items_339 [] = { ++ { (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 *)"Explicitly Distrusted DigiNotar PKIoverheid G2", (PRUint32)47 }, ++ { (void *)"\325\362\127\251\277\055\320\077\213\106\127\371\053\311\244\306" ++"\222\341\102\102" ++, (PRUint32)20 }, ++ { (void *)"\056\141\242\321\170\316\356\277\131\063\260\043\024\017\224\034" ++, (PRUint32)16 }, ++ { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061" ++"\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157" ++"\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004" ++"\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111" ++"\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141" ++"\156\151\163\141\164\151\145\040\055\040\107\062" ++, (PRUint32)92 }, ++ { (void *)"\002\004\017\377\377\377" ++, (PRUint32)6 }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; + + builtinsInternalObject + nss_builtins_data[] = { +@@ -22244,11 +22934,21 @@ nss_builtins_data[] = { { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, -- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, -- { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, + { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, + { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, - { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} } -+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } ++ { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }, ++ { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} }, ++ { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} }, ++ { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} }, ++ { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} }, ++ { 11, nss_builtins_types_334, nss_builtins_items_334, {NULL} }, ++ { 13, nss_builtins_types_335, nss_builtins_items_335, {NULL} }, ++ { 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} }, ++ { 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} }, ++ { 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} }, ++ { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} } }; const PRUint32 #ifdef DEBUG - nss_builtins_nObjects = 329+1; -+ nss_builtins_nObjects = 327+1; ++ nss_builtins_nObjects = 339+1; #else - nss_builtins_nObjects = 329; -+ nss_builtins_nObjects = 327; ++ nss_builtins_nObjects = 339; #endif /* DEBUG */ -diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt ---- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -+++ nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -@@ -12461,161 +12461,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +--- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-01 08:40:04.000000000 +0200 ++++ nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-09-08 23:30:49.043588615 +0200 +@@ -34,7 +34,7 @@ + # the terms of any one of the MPL, the GPL or the LGPL. + # + # ***** END LICENSE BLOCK ***** +-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $" ++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.13 $ $Date: 2011/09/02 19:39:06 $" + + # + # certdata.txt +@@ -12461,161 +12461,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETS CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # @@ -1635,3 +2488,886 @@ diff --git nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3 # Certificate "Network Solutions Certificate Authority" # CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +@@ -22589,3 +22434,868 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSC + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrust DigiNotar Root CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 ++\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 ++\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 ++\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 ++\154 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 ++\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 ++\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 ++\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 ++\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377 ++\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\017 ++\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\060 ++\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 ++\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 ++\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 ++\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 ++\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 ++\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 ++\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 ++\036\027\015\060\067\060\067\062\067\061\067\061\071\063\067\132 ++\027\015\062\065\060\063\063\061\061\070\061\071\062\062\132\060 ++\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 ++\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 ++\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 ++\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 ++\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 ++\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 ++\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 ++\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 ++\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 ++\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 ++\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 ++\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 ++\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 ++\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 ++\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 ++\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 ++\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 ++\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 ++\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 ++\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 ++\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 ++\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 ++\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 ++\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 ++\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 ++\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 ++\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 ++\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 ++\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 ++\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 ++\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 ++\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 ++\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 ++\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 ++\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 ++\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 ++\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 ++\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 ++\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 ++\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 ++\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 ++\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 ++\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 ++\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153 ++\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 ++\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 ++\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 ++\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 ++\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 ++\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 ++\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 ++\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 ++\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 ++\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 ++\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 ++\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 ++\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 ++\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 ++\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 ++\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 ++\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 ++\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 ++\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 ++\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 ++\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 ++\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 ++\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 ++\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 ++\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 ++\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 ++\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 ++\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 ++\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 ++\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 ++\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 ++\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 ++\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 ++\262\345\214\360\206\231\270\345\305\337\204\301\267\353 ++END ++ ++# Trust for Certificate "Explicitly Distrust DigiNotar Root CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\301\167\313\113\340\264\046\216\365\307\317\105\231\042\271\260 ++\316\272\041\057 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\012\244\325\314\272\264\373\243\131\343\346\001\335\123\331\116 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 ++\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 ++\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 ++\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 ++\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\020\017\377\377\377\377\377\377\377\377\377\377\377\377\377 ++\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrust DigiNotar Services 1024 CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Services 1024 CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151 ++\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163 ++\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206 ++\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151 ++\147\151\156\157\164\141\162\056\156\154 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151 ++\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163 ++\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206 ++\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151 ++\147\151\156\157\164\141\162\056\156\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\003\161\060\202\002\332\240\003\002\001\002\002\004\017 ++\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\150\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151 ++\116\157\164\141\162\061\043\060\041\006\003\125\004\003\023\032 ++\104\151\147\151\116\157\164\141\162\040\123\145\162\166\151\143 ++\145\163\040\061\060\062\064\040\103\101\061\040\060\036\006\011 ++\052\206\110\206\367\015\001\011\001\026\021\151\156\146\157\100 ++\144\151\147\151\156\157\164\141\162\056\156\154\060\036\027\015 ++\060\067\060\067\062\066\061\065\065\071\060\061\132\027\015\061 ++\063\060\070\062\066\061\066\062\071\060\061\132\060\150\061\013 ++\060\011\006\003\125\004\006\023\002\116\114\061\022\060\020\006 ++\003\125\004\012\023\011\104\151\147\151\116\157\164\141\162\061 ++\043\060\041\006\003\125\004\003\023\032\104\151\147\151\116\157 ++\164\141\162\040\123\145\162\166\151\143\145\163\040\061\060\062 ++\064\040\103\101\061\040\060\036\006\011\052\206\110\206\367\015 ++\001\011\001\026\021\151\156\146\157\100\144\151\147\151\156\157 ++\164\141\162\056\156\154\060\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\332\233\115\135\074\371\321\342\213\306\306\010\040 ++\305\331\036\110\354\146\130\147\171\142\053\101\143\364\211\215 ++\150\332\257\270\224\066\213\031\044\244\240\223\322\231\017\262 ++\255\055\065\115\315\057\152\341\371\233\031\053\274\004\032\176 ++\055\075\122\144\315\361\076\147\017\211\056\350\362\117\256\246 ++\010\241\205\376\241\251\011\346\306\253\076\103\374\257\172\003 ++\221\332\246\071\246\141\356\230\117\030\250\323\263\257\146\202 ++\351\237\274\335\162\371\006\004\275\022\331\030\044\347\253\223 ++\123\213\131\002\003\001\000\001\243\202\001\046\060\202\001\042 ++\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001 ++\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006 ++\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005 ++\007\003\002\006\010\053\006\001\005\005\007\003\004\060\021\006 ++\003\125\035\040\004\012\060\010\060\006\006\004\125\035\040\000 ++\060\063\006\010\053\006\001\005\005\007\001\001\004\047\060\045 ++\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\145\156\164\162\165\163 ++\164\056\156\145\164\060\063\006\003\125\035\037\004\054\060\052 ++\060\050\240\046\240\044\206\042\150\164\164\160\072\057\057\143 ++\162\154\056\145\156\164\162\165\163\164\056\156\145\164\057\163 ++\145\162\166\145\162\061\056\143\162\154\060\035\006\003\125\035 ++\016\004\026\004\024\376\334\224\111\014\157\357\134\177\306\361 ++\022\231\117\026\111\255\373\202\145\060\013\006\003\125\035\017 ++\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060 ++\026\200\024\360\027\142\023\125\075\263\377\012\000\153\373\120 ++\204\227\363\355\142\320\032\060\031\006\011\052\206\110\206\366 ++\175\007\101\000\004\014\060\012\033\004\126\067\056\061\003\002 ++\000\201\060\015\006\011\052\206\110\206\367\015\001\001\005\005 ++\000\003\201\201\000\143\164\152\067\251\077\226\234\146\310\130 ++\254\011\311\357\365\145\224\177\243\002\304\070\061\275\135\043 ++\207\354\324\126\262\311\262\156\344\005\006\374\354\365\372\210 ++\160\131\324\356\346\335\265\172\240\243\140\057\002\014\253\336 ++\022\135\257\360\065\113\252\212\107\221\032\365\205\054\102\307 ++\035\357\225\103\263\136\270\225\223\245\332\305\050\252\255\162 ++\055\061\255\231\153\154\377\214\041\047\257\255\232\221\053\307 ++\335\130\303\156\007\305\237\171\322\307\214\125\277\114\307\047 ++\136\121\026\053\076 ++END ++ ++# Trust for Certificate "Explicitly Distrust DigiNotar Services 1024 CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Services 1024 CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\022\073\352\312\146\147\167\141\340\353\150\362\376\355\242\017 ++\040\005\125\160 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\057\026\150\227\114\150\117\316\122\212\354\123\217\223\111\370 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\150\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\043\060\041\006\003\125\004\003\023\032\104\151 ++\147\151\116\157\164\141\162\040\123\145\162\166\151\143\145\163 ++\040\061\060\062\064\040\103\101\061\040\060\036\006\011\052\206 ++\110\206\367\015\001\011\001\026\021\151\156\146\157\100\144\151 ++\147\151\156\157\164\141\162\056\156\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrust DigiNotar Cyber CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Cyber CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026 ++\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056 ++\156\154 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026 ++\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056 ++\156\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\005\105\060\202\004\256\240\003\002\001\002\002\004\017 ++\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\140\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151 ++\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022 ++\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040 ++\103\101\061\040\060\036\006\011\052\206\110\206\367\015\001\011 ++\001\026\021\151\156\146\157\100\144\151\147\151\156\157\164\141 ++\162\056\156\154\060\036\027\015\060\066\061\060\060\064\061\060 ++\065\064\061\062\132\027\015\061\061\061\060\060\064\061\060\065 ++\063\061\062\132\060\140\061\013\060\011\006\003\125\004\006\023 ++\002\116\114\061\022\060\020\006\003\125\004\012\023\011\104\151 ++\147\151\116\157\164\141\162\061\033\060\031\006\003\125\004\003 ++\023\022\104\151\147\151\116\157\164\141\162\040\103\171\142\145 ++\162\040\103\101\061\040\060\036\006\011\052\206\110\206\367\015 ++\001\011\001\026\021\151\156\146\157\100\144\151\147\151\156\157 ++\164\141\162\056\156\154\060\202\002\042\060\015\006\011\052\206 ++\110\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202 ++\002\012\002\202\002\001\000\322\316\025\012\055\250\136\204\147 ++\255\375\276\357\106\307\310\271\317\163\374\364\064\271\371\054 ++\103\347\140\023\075\172\343\262\317\073\147\154\220\255\300\271 ++\077\204\122\360\065\102\334\164\334\050\073\275\122\264\247\254 ++\162\105\027\306\360\211\353\264\252\045\362\135\113\136\321\331 ++\207\272\326\175\174\365\316\062\237\020\063\305\261\112\273\136 ++\221\061\302\320\351\101\302\221\144\176\011\101\073\333\213\010 ++\067\152\252\312\122\336\265\071\036\300\210\003\245\077\213\231 ++\023\141\103\265\233\202\263\356\040\157\317\241\104\242\352\057 ++\153\100\237\217\053\127\255\241\123\302\205\042\151\235\240\077 ++\121\337\013\101\221\015\245\341\250\252\134\111\010\135\275\336 ++\160\101\261\017\311\143\153\323\177\064\164\002\057\064\132\170 ++\165\034\150\172\201\147\212\363\332\100\360\140\143\364\222\040 ++\327\003\246\075\243\036\147\304\204\033\101\245\311\214\346\275 ++\352\110\266\005\026\010\263\067\022\132\367\141\074\367\070\157 ++\056\227\340\157\126\070\124\323\050\265\255\024\156\056\113\144 ++\265\047\145\267\165\045\011\266\007\075\225\126\002\012\202\140 ++\262\163\105\340\063\046\121\164\232\271\324\120\034\366\115\133 ++\133\122\122\023\132\246\177\247\016\341\350\101\124\147\230\214 ++\207\325\311\323\154\313\323\124\222\006\011\064\101\367\201\157 ++\077\236\311\174\165\125\260\347\301\263\167\350\303\304\000\065 ++\225\100\160\020\112\005\336\045\273\237\131\245\144\274\107\140 ++\277\140\343\166\213\023\125\335\341\164\172\271\317\044\246\152 ++\177\336\144\042\104\130\150\202\152\020\371\075\345\076\033\271 ++\275\374\042\364\140\004\211\273\125\155\050\125\372\336\216\215 ++\033\041\024\327\067\213\064\173\115\366\262\262\020\317\063\261 ++\175\034\142\231\110\313\053\154\166\226\125\277\031\015\035\037 ++\273\145\252\033\216\231\265\306\050\220\345\202\055\170\120\040 ++\232\375\171\057\044\177\360\211\051\151\364\175\315\163\276\263 ++\355\116\301\321\355\122\136\217\367\270\327\215\207\255\262\331 ++\033\121\022\377\126\263\341\257\064\175\134\244\170\210\020\236 ++\235\003\306\245\252\242\044\121\367\111\024\305\261\356\131\103 ++\225\337\253\150\050\060\077\002\003\001\000\001\243\202\001\206 ++\060\202\001\202\060\022\006\003\125\035\023\001\001\377\004\010 ++\060\006\001\001\377\002\001\001\060\123\006\003\125\035\040\004 ++\114\060\112\060\110\006\011\053\006\001\004\001\261\076\001\000 ++\060\073\060\071\006\010\053\006\001\005\005\007\002\001\026\055 ++\150\164\164\160\072\057\057\167\167\167\056\160\165\142\154\151 ++\143\055\164\162\165\163\164\056\143\157\155\057\103\120\123\057 ++\117\155\156\151\122\157\157\164\056\150\164\155\154\060\016\006 ++\003\125\035\017\001\001\377\004\004\003\002\001\006\060\201\240 ++\006\003\125\035\043\004\201\230\060\201\225\200\024\246\014\035 ++\237\141\377\007\027\265\277\070\106\333\103\060\325\216\260\122 ++\006\241\171\244\167\060\165\061\013\060\011\006\003\125\004\006 ++\023\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107 ++\124\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047 ++\060\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142 ++\145\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156 ++\163\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003 ++\023\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164 ++\040\107\154\157\142\141\154\040\122\157\157\164\202\002\001\245 ++\060\105\006\003\125\035\037\004\076\060\074\060\072\240\070\240 ++\066\206\064\150\164\164\160\072\057\057\167\167\167\056\160\165 ++\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143 ++\147\151\055\142\151\156\057\103\122\114\057\062\060\061\070\057 ++\143\144\160\056\143\162\154\060\035\006\003\125\035\016\004\026 ++\004\024\253\371\150\337\317\112\067\327\173\105\214\137\162\336 ++\100\104\303\145\273\302\060\015\006\011\052\206\110\206\367\015 ++\001\001\005\005\000\003\201\201\000\217\150\153\245\133\007\272 ++\104\146\016\034\250\134\060\173\063\344\012\046\004\374\357\236 ++\032\070\326\056\241\037\320\231\107\302\165\144\044\375\236\073 ++\050\166\271\046\050\141\221\014\155\054\370\004\237\174\120\001 ++\325\343\151\257\357\025\322\105\233\044\011\052\146\005\117\045 ++\201\312\135\276\252\301\131\047\256\063\216\202\367\337\164\260 ++\125\263\216\370\347\067\310\156\252\126\104\366\275\123\201\043 ++\226\075\264\372\062\212\123\146\104\045\242\045\306\246\074\045 ++\214\360\340\050\006\042\267\046\101 ++END ++ ++# Trust for Certificate "Explicitly Distrust DigiNotar Cyber CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Cyber CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\245\216\240\354\366\104\126\065\031\035\150\133\307\240\344\034 ++\260\115\171\056 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\274\275\211\022\264\377\345\371\046\107\310\140\066\133\331\124 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\140\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++\061\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026 ++\021\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056 ++\156\154 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrust DigiNotar Cyber CA 2nd" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Cyber CA 2nd" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\005\001\060\202\004\152\240\003\002\001\002\002\004\017 ++\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\076\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151 ++\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022 ++\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040 ++\103\101\060\036\027\015\060\066\060\071\062\067\061\060\065\063 ++\065\063\132\027\015\061\063\060\071\062\060\060\071\064\064\060 ++\067\132\060\076\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\022\060\020\006\003\125\004\012\023\011\104\151\147\151 ++\116\157\164\141\162\061\033\060\031\006\003\125\004\003\023\022 ++\104\151\147\151\116\157\164\141\162\040\103\171\142\145\162\040 ++\103\101\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\322\316\025\012\055\250\136\204\147\255\375\276\357 ++\106\307\310\271\317\163\374\364\064\271\371\054\103\347\140\023 ++\075\172\343\262\317\073\147\154\220\255\300\271\077\204\122\360 ++\065\102\334\164\334\050\073\275\122\264\247\254\162\105\027\306 ++\360\211\353\264\252\045\362\135\113\136\321\331\207\272\326\175 ++\174\365\316\062\237\020\063\305\261\112\273\136\221\061\302\320 ++\351\101\302\221\144\176\011\101\073\333\213\010\067\152\252\312 ++\122\336\265\071\036\300\210\003\245\077\213\231\023\141\103\265 ++\233\202\263\356\040\157\317\241\104\242\352\057\153\100\237\217 ++\053\127\255\241\123\302\205\042\151\235\240\077\121\337\013\101 ++\221\015\245\341\250\252\134\111\010\135\275\336\160\101\261\017 ++\311\143\153\323\177\064\164\002\057\064\132\170\165\034\150\172 ++\201\147\212\363\332\100\360\140\143\364\222\040\327\003\246\075 ++\243\036\147\304\204\033\101\245\311\214\346\275\352\110\266\005 ++\026\010\263\067\022\132\367\141\074\367\070\157\056\227\340\157 ++\126\070\124\323\050\265\255\024\156\056\113\144\265\047\145\267 ++\165\045\011\266\007\075\225\126\002\012\202\140\262\163\105\340 ++\063\046\121\164\232\271\324\120\034\366\115\133\133\122\122\023 ++\132\246\177\247\016\341\350\101\124\147\230\214\207\325\311\323 ++\154\313\323\124\222\006\011\064\101\367\201\157\077\236\311\174 ++\165\125\260\347\301\263\167\350\303\304\000\065\225\100\160\020 ++\112\005\336\045\273\237\131\245\144\274\107\140\277\140\343\166 ++\213\023\125\335\341\164\172\271\317\044\246\152\177\336\144\042 ++\104\130\150\202\152\020\371\075\345\076\033\271\275\374\042\364 ++\140\004\211\273\125\155\050\125\372\336\216\215\033\041\024\327 ++\067\213\064\173\115\366\262\262\020\317\063\261\175\034\142\231 ++\110\313\053\154\166\226\125\277\031\015\035\037\273\145\252\033 ++\216\231\265\306\050\220\345\202\055\170\120\040\232\375\171\057 ++\044\177\360\211\051\151\364\175\315\163\276\263\355\116\301\321 ++\355\122\136\217\367\270\327\215\207\255\262\331\033\121\022\377 ++\126\263\341\257\064\175\134\244\170\210\020\236\235\003\306\245 ++\252\242\044\121\367\111\024\305\261\356\131\103\225\337\253\150 ++\050\060\077\002\003\001\000\001\243\202\001\206\060\202\001\202 ++\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001 ++\377\002\001\001\060\123\006\003\125\035\040\004\114\060\112\060 ++\110\006\011\053\006\001\004\001\261\076\001\000\060\073\060\071 ++\006\010\053\006\001\005\005\007\002\001\026\055\150\164\164\160 ++\072\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162 ++\165\163\164\056\143\157\155\057\103\120\123\057\117\155\156\151 ++\122\157\157\164\056\150\164\155\154\060\016\006\003\125\035\017 ++\001\001\377\004\004\003\002\001\006\060\201\240\006\003\125\035 ++\043\004\201\230\060\201\225\200\024\246\014\035\237\141\377\007 ++\027\265\277\070\106\333\103\060\325\216\260\122\006\241\171\244 ++\167\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103 ++\157\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003 ++\125\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162 ++\165\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111 ++\156\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124 ++\105\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157 ++\142\141\154\040\122\157\157\164\202\002\001\245\060\105\006\003 ++\125\035\037\004\076\060\074\060\072\240\070\240\066\206\064\150 ++\164\164\160\072\057\057\167\167\167\056\160\165\142\154\151\143 ++\055\164\162\165\163\164\056\143\157\155\057\143\147\151\055\142 ++\151\156\057\103\122\114\057\062\060\061\070\057\143\144\160\056 ++\143\162\154\060\035\006\003\125\035\016\004\026\004\024\253\371 ++\150\337\317\112\067\327\173\105\214\137\162\336\100\104\303\145 ++\273\302\060\015\006\011\052\206\110\206\367\015\001\001\005\005 ++\000\003\201\201\000\011\312\142\017\215\273\112\340\324\172\065 ++\053\006\055\321\050\141\266\254\001\373\203\111\274\256\324\057 ++\055\206\256\031\203\245\326\035\023\342\027\276\376\062\164\351 ++\172\024\070\312\224\136\367\051\001\151\161\033\221\032\375\243 ++\273\252\035\312\173\342\026\375\241\243\016\363\014\137\262\341 ++\040\061\224\053\136\222\166\355\372\351\265\043\246\277\012\073 ++\003\251\157\122\140\124\315\137\351\267\057\174\242\047\375\101 ++\203\165\266\015\373\170\046\363\261\105\351\062\225\052\032\065 ++\041\225\305\242\165 ++END ++ ++# Trust for Certificate "Explicitly Distrust DigiNotar Cyber CA 2nd" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrust DigiNotar Cyber CA 2nd" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\210\036\105\005\017\230\331\131\373\012\065\371\114\016\050\227 ++\125\026\051\263 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\360\256\251\075\362\054\210\334\174\205\033\226\175\132\034\021 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\076\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 ++\164\141\162\061\033\060\031\006\003\125\004\003\023\022\104\151 ++\147\151\116\157\164\141\162\040\103\171\142\145\162\040\103\101 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrusted DigiNotar PKIoverheid" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrusted DigiNotar PKIoverheid" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004 ++\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162 ++\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145 ++\156 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004 ++\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162 ++\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145 ++\156 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\004\216\060\202\003\166\240\003\002\001\002\002\004\017 ++\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\005 ++\005\000\060\137\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\027\060\025\006\003\125\004\012\023\016\104\151\147\151 ++\116\157\164\141\162\040\102\056\126\056\061\067\060\065\006\003 ++\125\004\003\023\056\104\151\147\151\116\157\164\141\162\040\120 ++\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117\166 ++\145\162\150\145\151\144\040\145\156\040\102\145\144\162\151\152 ++\166\145\156\060\036\027\015\060\067\060\067\060\065\060\070\064 ++\062\060\070\132\027\015\061\065\060\067\062\067\060\070\063\071 ++\064\067\132\060\137\061\013\060\011\006\003\125\004\006\023\002 ++\116\114\061\027\060\025\006\003\125\004\012\023\016\104\151\147 ++\151\116\157\164\141\162\040\102\056\126\056\061\067\060\065\006 ++\003\125\004\003\023\056\104\151\147\151\116\157\164\141\162\040 ++\120\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117 ++\166\145\162\150\145\151\144\040\145\156\040\102\145\144\162\151 ++\152\166\145\156\060\202\001\042\060\015\006\011\052\206\110\206 ++\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012 ++\002\202\001\001\000\334\275\322\247\116\152\012\273\073\242\205 ++\341\177\000\255\276\264\060\150\230\007\315\240\172\304\224\317 ++\161\371\212\067\344\123\353\127\166\314\213\346\154\376\356\207 ++\125\310\076\273\004\071\000\247\200\170\254\133\117\176\364\275 ++\270\124\270\161\073\007\061\111\071\223\124\174\040\073\171\053 ++\217\273\141\220\175\261\254\346\037\220\056\235\105\001\251\144 ++\055\115\303\057\271\347\120\325\116\052\134\253\166\166\067\106 ++\327\171\354\102\231\367\242\354\244\211\160\334\070\053\207\246 ++\252\044\346\235\222\044\033\276\366\375\324\057\031\027\172\346 ++\062\007\224\124\005\123\103\351\154\274\257\107\313\274\313\375 ++\275\073\104\022\201\361\153\113\273\355\264\317\253\045\117\030 ++\322\314\002\374\243\117\265\102\063\313\131\315\011\334\323\120 ++\375\240\166\214\254\176\146\212\102\366\255\034\222\363\266\373 ++\024\106\353\115\327\057\060\340\155\356\133\066\276\104\164\267 ++\040\005\127\205\115\350\000\031\242\366\014\346\256\241\300\102 ++\337\247\254\202\135\307\150\267\030\346\211\113\232\153\372\316 ++\171\371\363\054\247\002\003\001\000\001\243\202\001\120\060\202 ++\001\114\060\110\006\003\125\035\040\004\101\060\077\060\075\006 ++\004\125\035\040\000\060\065\060\063\006\010\053\006\001\005\005 ++\007\002\001\026\047\150\164\164\160\072\057\057\167\167\167\056 ++\144\151\147\151\156\157\164\141\162\056\156\154\057\143\160\163 ++\057\160\153\151\157\166\145\162\150\145\151\144\060\017\006\003 ++\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 ++\003\125\035\017\001\001\377\004\004\003\002\001\006\060\201\200 ++\006\003\125\035\043\004\171\060\167\200\024\013\206\326\017\167 ++\243\150\261\373\144\011\303\210\156\134\004\034\127\351\075\241 ++\131\244\127\060\125\061\013\060\011\006\003\125\004\006\023\002 ++\116\114\061\036\060\034\006\003\125\004\012\023\025\123\164\141 ++\141\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144 ++\145\156\061\046\060\044\006\003\125\004\003\023\035\123\164\141 ++\141\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144 ++\145\156\040\122\157\157\164\040\103\101\202\004\000\230\232\171 ++\060\075\006\003\125\035\037\004\066\060\064\060\062\240\060\240 ++\056\206\054\150\164\164\160\072\057\057\143\162\154\056\160\153 ++\151\157\166\145\162\150\145\151\144\056\156\154\057\104\157\155 ++\117\166\114\141\164\145\163\164\103\122\114\056\143\162\154\060 ++\035\006\003\125\035\016\004\026\004\024\114\010\311\215\166\361 ++\230\307\076\337\074\327\057\165\015\261\166\171\227\314\060\015 ++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001 ++\001\000\014\224\207\032\277\115\343\205\342\356\327\330\143\171 ++\016\120\337\306\204\133\322\273\331\365\061\012\032\065\227\164 ++\337\024\372\052\017\076\355\240\343\010\366\325\116\133\257\246 ++\256\045\342\105\153\042\017\267\124\050\176\222\336\215\024\154 ++\321\034\345\156\164\004\234\267\357\064\104\105\337\311\203\035 ++\031\037\300\051\151\337\211\325\077\302\260\123\155\345\116\027 ++\344\163\141\043\023\046\161\103\375\114\131\313\303\337\042\252 ++\041\053\331\277\225\021\032\212\244\342\253\247\135\113\157\051 ++\365\122\321\344\322\025\261\213\376\360\003\317\247\175\351\231 ++\207\070\263\015\163\024\344\162\054\341\316\365\255\006\110\144 ++\372\323\051\271\242\330\273\364\325\013\245\100\104\103\216\240 ++\277\316\132\245\122\114\144\323\027\061\141\314\350\244\212\350 ++\344\210\373\351\345\057\006\063\063\233\224\146\146\261\253\120 ++\072\241\011\201\164\123\132\047\271\246\322\045\317\323\303\247 ++\377\226\320\057\352\340\036\215\122\351\030\034\040\012\107\240 ++\226\126\016\100\220\121\104\254\032\375\361\356\205\037\367\102 ++\132\145 ++END ++ ++# Trust for Certificate "Explicitly Distrusted DigiNotar PKIoverheid" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrusted DigiNotar PKIoverheid" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\247\250\311\254\364\137\220\222\166\206\270\300\242\016\223\130 ++\175\336\060\344 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\243\317\263\377\371\117\247\261\353\072\165\130\116\056\237\352 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\023\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\067\060\065\006\003\125\004 ++\003\023\056\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\166\145\162 ++\150\145\151\144\040\145\156\040\102\145\144\162\151\152\166\145 ++\156 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Explicitly Distrusted DigiNotar PKIoverheid G2" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrusted DigiNotar PKIoverheid G2" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004 ++\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141 ++\156\151\163\141\164\151\145\040\055\040\107\062 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004 ++\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141 ++\156\151\163\141\164\151\145\040\055\040\107\062 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\006\225\060\202\004\175\240\003\002\001\002\002\004\017 ++\377\377\377\060\015\006\011\052\206\110\206\367\015\001\001\013 ++\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116 ++\114\061\027\060\025\006\003\125\004\012\014\016\104\151\147\151 ++\116\157\164\141\162\040\102\056\126\056\061\062\060\060\006\003 ++\125\004\003\014\051\104\151\147\151\116\157\164\141\162\040\120 ++\113\111\157\166\145\162\150\145\151\144\040\103\101\040\117\162 ++\147\141\156\151\163\141\164\151\145\040\055\040\107\062\060\036 ++\027\015\061\060\060\065\061\062\060\070\065\061\063\071\132\027 ++\015\062\060\060\063\062\063\060\071\065\060\060\065\132\060\132 ++\061\013\060\011\006\003\125\004\006\023\002\116\114\061\027\060 ++\025\006\003\125\004\012\014\016\104\151\147\151\116\157\164\141 ++\162\040\102\056\126\056\061\062\060\060\006\003\125\004\003\014 ++\051\104\151\147\151\116\157\164\141\162\040\120\113\111\157\166 ++\145\162\150\145\151\144\040\103\101\040\117\162\147\141\156\151 ++\163\141\164\151\145\040\055\040\107\062\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\261\023\031\017\047 ++\346\154\324\125\206\113\320\354\211\212\105\221\170\254\107\275 ++\107\053\344\374\105\353\117\264\046\163\133\067\323\303\177\366 ++\343\336\327\243\370\055\150\305\010\076\113\224\326\344\207\045 ++\066\153\204\265\030\164\363\050\130\163\057\233\152\317\274\004 ++\036\366\336\335\257\374\113\252\365\333\146\142\045\001\045\202 ++\336\362\227\132\020\156\335\135\251\042\261\004\251\043\163\072 ++\370\161\255\035\317\204\104\353\107\321\257\155\310\174\050\253 ++\307\362\067\172\164\137\137\305\002\024\212\243\132\343\033\154 ++\001\343\135\216\331\150\326\364\011\033\062\334\221\265\054\365 ++\040\353\214\003\155\046\111\270\223\304\205\135\330\322\233\257 ++\126\152\314\005\063\314\240\102\236\064\125\104\234\153\240\324 ++\022\320\053\124\315\267\211\015\345\366\353\350\373\205\001\063 ++\117\172\153\361\235\162\063\226\016\367\262\204\245\245\047\304 ++\047\361\121\163\051\167\272\147\156\376\114\334\264\342\241\241 ++\201\057\071\111\215\103\070\023\316\320\245\134\302\207\072\000 ++\147\145\102\043\361\066\131\012\035\243\121\310\274\243\224\052 ++\061\337\343\074\362\235\032\074\004\260\357\261\012\060\023\163 ++\266\327\363\243\114\001\165\024\205\170\300\327\212\071\130\205 ++\120\372\056\346\305\276\317\213\077\257\217\066\324\045\011\055 ++\322\017\254\162\223\362\277\213\324\120\263\371\025\120\233\231 ++\365\024\331\373\213\221\243\062\046\046\240\370\337\073\140\201 ++\206\203\171\133\053\353\023\075\051\072\301\155\335\275\236\216 ++\207\326\112\256\064\227\005\356\024\246\366\334\070\176\112\351 ++\044\124\007\075\227\150\067\106\153\015\307\250\041\257\023\124 ++\344\011\152\361\115\106\012\311\135\373\233\117\275\336\373\267 ++\124\313\270\070\234\247\071\373\152\055\300\173\215\253\245\247 ++\127\354\112\222\212\063\305\341\040\134\163\330\220\222\053\200 ++\325\017\206\030\151\174\071\117\204\206\274\367\114\133\363\325 ++\264\312\240\302\360\067\042\312\171\122\037\123\346\252\363\220 ++\260\073\335\362\050\375\254\353\305\006\044\240\311\324\057\017 ++\130\375\265\236\354\017\317\262\131\320\242\004\172\070\152\256 ++\162\373\275\360\045\142\224\011\247\005\013\002\003\001\000\001 ++\243\202\001\141\060\202\001\135\060\110\006\003\125\035\040\004 ++\101\060\077\060\075\006\004\125\035\040\000\060\065\060\063\006 ++\010\053\006\001\005\005\007\002\001\026\047\150\164\164\160\072 ++\057\057\167\167\167\056\144\151\147\151\156\157\164\141\162\056 ++\156\154\057\143\160\163\057\160\153\151\157\166\145\162\150\145 ++\151\144\060\017\006\003\125\035\023\001\001\377\004\005\060\003 ++\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003 ++\002\001\006\060\201\205\006\003\125\035\043\004\176\060\174\200 ++\024\071\020\213\111\222\134\333\141\022\040\315\111\235\032\216 ++\332\234\147\100\271\241\136\244\134\060\132\061\013\060\011\006 ++\003\125\004\006\023\002\116\114\061\036\060\034\006\003\125\004 ++\012\014\025\123\164\141\141\164\040\144\145\162\040\116\145\144 ++\145\162\154\141\156\144\145\156\061\053\060\051\006\003\125\004 ++\003\014\042\123\164\141\141\164\040\144\145\162\040\116\145\144 ++\145\162\154\141\156\144\145\156\040\122\157\157\164\040\103\101 ++\040\055\040\107\062\202\004\000\230\226\364\060\111\006\003\125 ++\035\037\004\102\060\100\060\076\240\074\240\072\206\070\150\164 ++\164\160\072\057\057\143\162\154\056\160\153\151\157\166\145\162 ++\150\145\151\144\056\156\154\057\104\157\155\117\162\147\141\156 ++\151\163\141\164\151\145\114\141\164\145\163\164\103\122\114\055 ++\107\062\056\143\162\154\060\035\006\003\125\035\016\004\026\004 ++\024\274\135\224\073\331\253\173\003\045\163\141\302\333\055\356 ++\374\253\217\145\241\060\015\006\011\052\206\110\206\367\015\001 ++\001\013\005\000\003\202\002\001\000\217\374\055\114\267\331\055 ++\325\037\275\357\313\364\267\150\027\165\235\116\325\367\335\234 ++\361\052\046\355\237\242\266\034\003\325\123\263\354\010\317\064 ++\342\343\303\364\265\026\057\310\303\276\327\323\163\253\000\066 ++\371\032\112\176\326\143\351\136\106\272\245\266\216\025\267\243 ++\052\330\103\035\357\135\310\037\201\205\263\213\367\377\074\364 ++\331\364\106\010\077\234\274\035\240\331\250\114\315\045\122\116 ++\012\261\040\367\037\351\103\331\124\106\201\023\232\300\136\164 ++\154\052\230\062\352\374\167\273\015\245\242\061\230\042\176\174 ++\174\347\332\244\255\354\267\056\032\031\161\370\110\120\332\103 ++\217\054\204\335\301\100\047\343\265\360\025\116\226\324\370\134 ++\343\206\051\106\053\327\073\007\353\070\177\310\206\127\227\323 ++\357\052\063\304\027\120\325\144\151\153\053\153\105\136\135\057 ++\027\312\132\116\317\303\327\071\074\365\073\237\106\271\233\347 ++\016\111\227\235\326\325\343\033\017\352\217\001\116\232\023\224 ++\131\012\002\007\110\113\032\140\253\177\117\355\013\330\125\015 ++\150\157\125\234\151\145\025\102\354\300\334\335\154\254\303\026 ++\316\013\035\126\233\244\304\304\322\056\340\017\342\104\047\053 ++\120\151\244\334\142\350\212\041\051\102\154\314\000\072\226\166 ++\233\357\100\300\244\136\167\204\062\154\046\052\071\146\256\135 ++\343\271\271\262\054\150\037\036\232\220\003\071\360\252\263\244 ++\314\111\213\030\064\351\067\311\173\051\307\204\174\157\104\025 ++\057\354\141\131\004\311\105\313\242\326\122\242\174\177\051\222 ++\326\112\305\213\102\250\324\376\352\330\307\207\043\030\344\235 ++\172\175\163\100\122\230\240\256\156\343\005\077\005\017\340\245 ++\306\155\115\355\203\067\210\234\307\363\334\102\232\152\266\327 ++\041\111\066\167\362\357\030\117\305\160\331\236\351\336\267\053 ++\213\364\274\176\050\337\015\100\311\205\134\256\235\305\061\377 ++\320\134\016\265\250\176\360\351\057\272\257\210\256\345\265\321 ++\130\245\257\234\161\247\051\001\220\203\151\067\202\005\272\374 ++\011\301\010\156\214\170\073\303\063\002\200\077\104\205\010\035 ++\337\125\126\010\255\054\205\055\135\261\003\341\256\252\164\305 ++\244\363\116\272\067\230\173\202\271 ++END ++ ++# Trust for Certificate "Explicitly Distrusted DigiNotar PKIoverheid G2" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Explicitly Distrusted DigiNotar PKIoverheid G2" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\325\362\127\251\277\055\320\077\213\106\127\371\053\311\244\306 ++\222\341\102\102 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\056\141\242\321\170\316\356\277\131\063\260\043\024\017\224\034 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 ++\027\060\025\006\003\125\004\012\014\016\104\151\147\151\116\157 ++\164\141\162\040\102\056\126\056\061\062\060\060\006\003\125\004 ++\003\014\051\104\151\147\151\116\157\164\141\162\040\120\113\111 ++\157\166\145\162\150\145\151\144\040\103\101\040\117\162\147\141 ++\156\151\163\141\164\151\145\040\055\040\107\062 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\004\017\377\377\377 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h +--- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2011-08-01 08:40:04.000000000 +0200 ++++ nss-3.12.11-diginotar/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2011-09-08 23:31:00.998764374 +0200 +@@ -77,8 +77,8 @@ + * of the comment in the CK_VERSION type definition. + */ + #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 +-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84 +-#define NSS_BUILTINS_LIBRARY_VERSION "1.84" ++#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87 ++#define NSS_BUILTINS_LIBRARY_VERSION "1.87" + + /* These version numbers detail the semantic changes to the ckfw engine. */ + #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1