From 84b82c7866d3ec361aa2dc9020d03690f13ffb8c3d31a0bba7f27f56d4f14e22 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 5 Nov 2011 10:51:17 +0000
Subject: [PATCH 1/2] - explicitely distrust DigiCert Sdn. Bhd (bnc#728520,
 bmo#698753)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=85
---
 ...3.12.11-diginotar.patch => ckbi-1_88.patch | 885 ++++++++++++++----
 mozilla-nss.changes                           |   7 +-
 mozilla-nss.spec                              |   4 +-
 3 files changed, 729 insertions(+), 167 deletions(-)
 rename nss-3.12.11-diginotar.patch => ckbi-1_88.patch (79%)

diff --git a/nss-3.12.11-diginotar.patch b/ckbi-1_88.patch
similarity index 79%
rename from nss-3.12.11-diginotar.patch
rename to ckbi-1_88.patch
index 49c1dc9..412ef87 100644
--- a/nss-3.12.11-diginotar.patch
+++ b/ckbi-1_88.patch
@@ -1,16 +1,16 @@
-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
+diff -urpN '--exclude=CVS' mozilla/security/nss/lib/ckfw/builtins/certdata.c mozilla-ckbi//security/nss/lib/ckfw/builtins/certdata.c
+--- mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-11-05 11:40:37.125761635 +0100
++++ mozilla-ckbi//security/nss/lib/ckfw/builtins/certdata.c	2011-11-05 11:41:26.781677811 +0100
 @@ -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.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 $";
++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $";
  #endif /* DEBUG */
  
  #ifndef BUILTINS_H
-@@ -1045,6 +1045,36 @@ static const CK_ATTRIBUTE_TYPE nss_built
+@@ -1045,6 +1045,48 @@ 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
  };
@@ -43,20 +43,32 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
 +};
 +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
++};
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = {
++ 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_341 [] = {
++ 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_342 [] = {
++ 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_343 [] = {
++ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 +};
  #ifdef DEBUG
  static const NSSItem nss_builtins_items_0 [] = {
    { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -1053,7 +1083,7 @@ static const NSSItem nss_builtins_items_
+@@ -1053,7 +1095,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.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 }
++  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $", (PRUint32)165 }
  };
  #endif /* DEBUG */
  static const NSSItem nss_builtins_items_1 [] = {
-@@ -12506,151 +12536,6 @@ static const NSSItem nss_builtins_items_
+@@ -12506,151 +12548,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) },
@@ -208,7 +220,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
    { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
    { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-@@ -12738,7 +12623,7 @@ static const NSSItem nss_builtins_items_
+@@ -12738,7 +12635,7 @@ static const NSSItem nss_builtins_items_
  "\244\140\114\260\125\240\240\173\127\262"
  , (PRUint32)1002 }
  };
@@ -217,7 +229,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12765,7 +12650,7 @@ static const NSSItem nss_builtins_items_
+@@ -12765,7 +12662,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -226,7 +238,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12874,7 +12759,7 @@ static const NSSItem nss_builtins_items_
+@@ -12874,7 +12771,7 @@ static const NSSItem nss_builtins_items_
  "\333"
  , (PRUint32)1217 }
  };
@@ -235,7 +247,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12902,7 +12787,7 @@ static const NSSItem nss_builtins_items_
+@@ -12902,7 +12799,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -244,7 +256,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12976,7 +12861,7 @@ static const NSSItem nss_builtins_items_
+@@ -12976,7 +12873,7 @@ static const NSSItem nss_builtins_items_
  "\334\335\363\377\035\054\072\026\127\331\222\071\326"
  , (PRUint32)653 }
  };
@@ -253,7 +265,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13005,7 +12890,7 @@ static const NSSItem nss_builtins_items_
+@@ -13005,7 +12902,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -262,7 +274,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13097,7 +12982,7 @@ static const NSSItem nss_builtins_items_
+@@ -13097,7 +12994,7 @@ static const NSSItem nss_builtins_items_
  "\321\236\164\310\166\147"
  , (PRUint32)1078 }
  };
@@ -271,7 +283,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13122,7 +13007,7 @@ static const NSSItem nss_builtins_items_
+@@ -13122,7 +13019,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -280,7 +292,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13219,7 +13104,7 @@ static const NSSItem nss_builtins_items_
+@@ -13219,7 +13116,7 @@ static const NSSItem nss_builtins_items_
  "\253\205\322\140\126\132"
  , (PRUint32)1030 }
  };
@@ -289,7 +301,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13247,7 +13132,7 @@ static const NSSItem nss_builtins_items_
+@@ -13247,7 +13144,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -298,7 +310,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13332,7 +13217,7 @@ static const NSSItem nss_builtins_items_
+@@ -13332,7 +13229,7 @@ static const NSSItem nss_builtins_items_
  "\164"
  , (PRUint32)897 }
  };
@@ -307,7 +319,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13358,7 +13243,7 @@ static const NSSItem nss_builtins_items_
+@@ -13358,7 +13255,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -316,7 +328,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13455,7 +13340,7 @@ static const NSSItem nss_builtins_items_
+@@ -13455,7 +13352,7 @@ static const NSSItem nss_builtins_items_
  "\374\276\337\012\015"
  , (PRUint32)1013 }
  };
@@ -325,7 +337,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13484,7 +13369,7 @@ static const NSSItem nss_builtins_items_
+@@ -13484,7 +13381,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -334,7 +346,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13595,7 +13480,7 @@ static const NSSItem nss_builtins_items_
+@@ -13595,7 +13492,7 @@ static const NSSItem nss_builtins_items_
  "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
  , (PRUint32)1151 }
  };
@@ -343,7 +355,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13627,7 +13512,7 @@ static const NSSItem nss_builtins_items_
+@@ -13627,7 +13524,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -352,7 +364,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13781,7 +13666,7 @@ static const NSSItem nss_builtins_items_
+@@ -13781,7 +13678,7 @@ static const NSSItem nss_builtins_items_
  "\103\307\003\340\067\116\135\012\334\131\040\045"
  , (PRUint32)1964 }
  };
@@ -361,7 +373,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13809,7 +13694,7 @@ static const NSSItem nss_builtins_items_
+@@ -13809,7 +13706,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -370,7 +382,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13890,7 +13775,7 @@ static const NSSItem nss_builtins_items_
+@@ -13890,7 +13787,7 @@ static const NSSItem nss_builtins_items_
  "\300\226\130\057\352\273\106\327\273\344\331\056"
  , (PRUint32)940 }
  };
@@ -379,7 +391,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13913,7 +13798,7 @@ static const NSSItem nss_builtins_items_
+@@ -13913,7 +13810,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -388,7 +400,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14047,7 +13932,7 @@ static const NSSItem nss_builtins_items_
+@@ -14047,7 +13944,7 @@ static const NSSItem nss_builtins_items_
  "\005\211\374\170\326\134\054\046\103\251"
  , (PRUint32)1642 }
  };
@@ -397,7 +409,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14075,7 +13960,7 @@ static const NSSItem nss_builtins_items_
+@@ -14075,7 +13972,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -406,7 +418,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14180,7 +14065,7 @@ static const NSSItem nss_builtins_items_
+@@ -14180,7 +14077,7 @@ static const NSSItem nss_builtins_items_
  "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
  , (PRUint32)1198 }
  };
@@ -415,7 +427,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14207,7 +14092,7 @@ static const NSSItem nss_builtins_items_
+@@ -14207,7 +14104,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -424,7 +436,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14312,7 +14197,7 @@ static const NSSItem nss_builtins_items_
+@@ -14312,7 +14209,7 @@ static const NSSItem nss_builtins_items_
  "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
  , (PRUint32)1198 }
  };
@@ -433,7 +445,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14339,7 +14224,7 @@ static const NSSItem nss_builtins_items_
+@@ -14339,7 +14236,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -442,7 +454,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14432,7 +14317,7 @@ static const NSSItem nss_builtins_items_
+@@ -14432,7 +14329,7 @@ static const NSSItem nss_builtins_items_
  "\230"
  , (PRUint32)993 }
  };
@@ -451,7 +463,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14459,7 +14344,7 @@ static const NSSItem nss_builtins_items_
+@@ -14459,7 +14356,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -460,7 +472,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14548,7 +14433,7 @@ static const NSSItem nss_builtins_items_
+@@ -14548,7 +14445,7 @@ static const NSSItem nss_builtins_items_
  "\126\144\127"
  , (PRUint32)931 }
  };
@@ -469,7 +481,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14575,7 +14460,7 @@ static const NSSItem nss_builtins_items_
+@@ -14575,7 +14472,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -478,7 +490,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14656,7 +14541,7 @@ static const NSSItem nss_builtins_items_
+@@ -14656,7 +14553,7 @@ static const NSSItem nss_builtins_items_
  "\000\147\240\161\000\202\110"
  , (PRUint32)919 }
  };
@@ -487,7 +499,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14680,7 +14565,7 @@ static const NSSItem nss_builtins_items_
+@@ -14680,7 +14577,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -496,7 +508,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14762,7 +14647,7 @@ static const NSSItem nss_builtins_items_
+@@ -14762,7 +14659,7 @@ static const NSSItem nss_builtins_items_
  "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
  , (PRUint32)943 }
  };
@@ -505,7 +517,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14786,7 +14671,7 @@ static const NSSItem nss_builtins_items_
+@@ -14786,7 +14683,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -514,7 +526,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14867,7 +14752,7 @@ static const NSSItem nss_builtins_items_
+@@ -14867,7 +14764,7 @@ static const NSSItem nss_builtins_items_
  "\246\210\070\316\125"
  , (PRUint32)933 }
  };
@@ -523,7 +535,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14890,7 +14775,7 @@ static const NSSItem nss_builtins_items_
+@@ -14890,7 +14787,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -532,7 +544,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15009,7 +14894,7 @@ static const NSSItem nss_builtins_items_
+@@ -15009,7 +14906,7 @@ static const NSSItem nss_builtins_items_
  "\201\370\021\234"
  , (PRUint32)1460 }
  };
@@ -541,7 +553,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15035,7 +14920,7 @@ static const NSSItem nss_builtins_items_
+@@ -15035,7 +14932,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -550,7 +562,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15169,7 +15054,7 @@ static const NSSItem nss_builtins_items_
+@@ -15169,7 +15066,7 @@ static const NSSItem nss_builtins_items_
  "\311\234\220\332\354\251\102\074\255\266\002"
  , (PRUint32)1307 }
  };
@@ -559,7 +571,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15207,7 +15092,7 @@ static const NSSItem nss_builtins_items_
+@@ -15207,7 +15104,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -568,7 +580,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15285,7 +15170,7 @@ static const NSSItem nss_builtins_items_
+@@ -15285,7 +15182,7 @@ static const NSSItem nss_builtins_items_
  "\366\324\357\277\114\210\150"
  , (PRUint32)855 }
  };
@@ -577,7 +589,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15309,7 +15194,7 @@ static const NSSItem nss_builtins_items_
+@@ -15309,7 +15206,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -586,7 +598,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15387,7 +15272,7 @@ static const NSSItem nss_builtins_items_
+@@ -15387,7 +15284,7 @@ static const NSSItem nss_builtins_items_
  "\246\347\313\100\003\335\171"
  , (PRUint32)855 }
  };
@@ -595,7 +607,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15411,7 +15296,7 @@ static const NSSItem nss_builtins_items_
+@@ -15411,7 +15308,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -604,7 +616,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15538,7 +15423,7 @@ static const NSSItem nss_builtins_items_
+@@ -15538,7 +15435,7 @@ static const NSSItem nss_builtins_items_
  "\320\352\111\242\034\215\122\024\246\012\223"
  , (PRUint32)1515 }
  };
@@ -613,7 +625,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15566,7 +15451,7 @@ static const NSSItem nss_builtins_items_
+@@ -15566,7 +15463,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -622,7 +634,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15640,7 +15525,7 @@ static const NSSItem nss_builtins_items_
+@@ -15640,7 +15537,7 @@ static const NSSItem nss_builtins_items_
  "\366\356\260\132\116\111\104\124\130\137\102\203"
  , (PRUint32)828 }
  };
@@ -631,7 +643,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15663,7 +15548,7 @@ static const NSSItem nss_builtins_items_
+@@ -15663,7 +15560,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -640,7 +652,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15739,7 +15624,7 @@ static const NSSItem nss_builtins_items_
+@@ -15739,7 +15636,7 @@ static const NSSItem nss_builtins_items_
  "\011\333\212\101\202\236\146\233\021"
  , (PRUint32)857 }
  };
@@ -649,7 +661,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15762,7 +15647,7 @@ static const NSSItem nss_builtins_items_
+@@ -15762,7 +15659,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -658,7 +670,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15845,7 +15730,7 @@ static const NSSItem nss_builtins_items_
+@@ -15845,7 +15742,7 @@ static const NSSItem nss_builtins_items_
  "\262\033\211\124"
  , (PRUint32)932 }
  };
@@ -667,7 +679,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15869,7 +15754,7 @@ static const NSSItem nss_builtins_items_
+@@ -15869,7 +15766,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -676,7 +688,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15969,7 +15854,7 @@ static const NSSItem nss_builtins_items_
+@@ -15969,7 +15866,7 @@ static const NSSItem nss_builtins_items_
  "\021\055"
  , (PRUint32)1026 }
  };
@@ -685,7 +697,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15999,7 +15884,7 @@ static const NSSItem nss_builtins_items_
+@@ -15999,7 +15896,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -694,7 +706,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16073,7 +15958,7 @@ static const NSSItem nss_builtins_items_
+@@ -16073,7 +15970,7 @@ static const NSSItem nss_builtins_items_
  "\367\130\077\056\162\002\127\243\217\241\024\056"
  , (PRUint32)652 }
  };
@@ -703,7 +715,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16102,7 +15987,7 @@ static const NSSItem nss_builtins_items_
+@@ -16102,7 +15999,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -712,7 +724,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16208,7 +16093,7 @@ static const NSSItem nss_builtins_items_
+@@ -16208,7 +16105,7 @@ static const NSSItem nss_builtins_items_
  "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
  , (PRUint32)1070 }
  };
@@ -721,7 +733,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16240,7 +16125,7 @@ static const NSSItem nss_builtins_items_
+@@ -16240,7 +16137,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -730,7 +742,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16319,7 +16204,7 @@ static const NSSItem nss_builtins_items_
+@@ -16319,7 +16216,7 @@ static const NSSItem nss_builtins_items_
  "\017\212"
  , (PRUint32)690 }
  };
@@ -739,7 +751,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16349,7 +16234,7 @@ static const NSSItem nss_builtins_items_
+@@ -16349,7 +16246,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -748,7 +760,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16464,7 +16349,7 @@ static const NSSItem nss_builtins_items_
+@@ -16464,7 +16361,7 @@ static const NSSItem nss_builtins_items_
  "\354\315\202\141\361\070\346\117\227\230\052\132\215"
  , (PRUint32)1213 }
  };
@@ -757,7 +769,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16496,7 +16381,7 @@ static const NSSItem nss_builtins_items_
+@@ -16496,7 +16393,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -766,7 +778,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16594,7 +16479,7 @@ static const NSSItem nss_builtins_items_
+@@ -16594,7 +16491,7 @@ static const NSSItem nss_builtins_items_
  "\055\247\330\206\052\335\056\020"
  , (PRUint32)904 }
  };
@@ -775,7 +787,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16627,7 +16512,7 @@ static const NSSItem nss_builtins_items_
+@@ -16627,7 +16524,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -784,7 +796,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16729,7 +16614,7 @@ static const NSSItem nss_builtins_items_
+@@ -16729,7 +16626,7 @@ static const NSSItem nss_builtins_items_
  "\330\316\304\143\165\077\131\107\261"
  , (PRUint32)1049 }
  };
@@ -793,7 +805,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16759,7 +16644,7 @@ static const NSSItem nss_builtins_items_
+@@ -16759,7 +16656,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -802,7 +814,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16878,7 +16763,7 @@ static const NSSItem nss_builtins_items_
+@@ -16878,7 +16775,7 @@ static const NSSItem nss_builtins_items_
  "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
  , (PRUint32)1486 }
  };
@@ -811,7 +823,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16903,7 +16788,7 @@ static const NSSItem nss_builtins_items_
+@@ -16903,7 +16800,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -820,7 +832,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16993,7 +16878,7 @@ static const NSSItem nss_builtins_items_
+@@ -16993,7 +16890,7 @@ static const NSSItem nss_builtins_items_
  "\315\345\250"
  , (PRUint32)1043 }
  };
@@ -829,7 +841,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17017,7 +16902,7 @@ static const NSSItem nss_builtins_items_
+@@ -17017,7 +16914,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -838,7 +850,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17122,7 +17007,7 @@ static const NSSItem nss_builtins_items_
+@@ -17122,7 +17019,7 @@ static const NSSItem nss_builtins_items_
  "\115\273\306\104\333\066\313\052\234\216"
  , (PRUint32)1258 }
  };
@@ -847,7 +859,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17147,7 +17032,7 @@ static const NSSItem nss_builtins_items_
+@@ -17147,7 +17044,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -856,7 +868,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17223,7 +17108,7 @@ static const NSSItem nss_builtins_items_
+@@ -17223,7 +17120,7 @@ static const NSSItem nss_builtins_items_
  "\002\153\331\132"
  , (PRUint32)820 }
  };
@@ -865,7 +877,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17247,7 +17132,7 @@ static const NSSItem nss_builtins_items_
+@@ -17247,7 +17144,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -874,7 +886,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17329,7 +17214,7 @@ static const NSSItem nss_builtins_items_
+@@ -17329,7 +17226,7 @@ static const NSSItem nss_builtins_items_
  "\362"
  , (PRUint32)881 }
  };
@@ -883,7 +895,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17354,7 +17239,7 @@ static const NSSItem nss_builtins_items_
+@@ -17354,7 +17251,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -892,7 +904,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17470,7 +17355,7 @@ static const NSSItem nss_builtins_items_
+@@ -17470,7 +17367,7 @@ static const NSSItem nss_builtins_items_
  "\113\076\053\070\007\125\230\136\244"
  , (PRUint32)1465 }
  };
@@ -901,7 +913,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17494,7 +17379,7 @@ static const NSSItem nss_builtins_items_
+@@ -17494,7 +17391,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -910,7 +922,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17559,7 +17444,7 @@ static const NSSItem nss_builtins_items_
+@@ -17559,7 +17456,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 }
  };
@@ -919,7 +931,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17586,7 +17471,7 @@ static const NSSItem nss_builtins_items_
+@@ -17586,7 +17483,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -928,7 +940,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17651,7 +17536,7 @@ static const NSSItem nss_builtins_items_
+@@ -17651,7 +17548,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 }
  };
@@ -937,7 +949,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17678,7 +17563,7 @@ static const NSSItem nss_builtins_items_
+@@ -17678,7 +17575,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -946,7 +958,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17775,7 +17660,7 @@ static const NSSItem nss_builtins_items_
+@@ -17775,7 +17672,7 @@ static const NSSItem nss_builtins_items_
  "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
  , (PRUint32)1038 }
  };
@@ -955,7 +967,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17803,7 +17688,7 @@ static const NSSItem nss_builtins_items_
+@@ -17803,7 +17700,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -964,7 +976,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17894,7 +17779,7 @@ static const NSSItem nss_builtins_items_
+@@ -17894,7 +17791,7 @@ static const NSSItem nss_builtins_items_
  "\336\102\343\055\202\361\017\345\372\227"
  , (PRUint32)954 }
  };
@@ -973,7 +985,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17922,7 +17807,7 @@ static const NSSItem nss_builtins_items_
+@@ -17922,7 +17819,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -982,7 +994,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18001,7 +17886,7 @@ static const NSSItem nss_builtins_items_
+@@ -18001,7 +17898,7 @@ static const NSSItem nss_builtins_items_
  "\130\077\137"
  , (PRUint32)867 }
  };
@@ -991,7 +1003,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18025,7 +17910,7 @@ static const NSSItem nss_builtins_items_
+@@ -18025,7 +17922,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1000,7 +1012,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18118,7 +18003,7 @@ static const NSSItem nss_builtins_items_
+@@ -18118,7 +18015,7 @@ static const NSSItem nss_builtins_items_
  "\045\361\224\264\146"
  , (PRUint32)997 }
  };
@@ -1009,7 +1021,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18145,7 +18030,7 @@ static const NSSItem nss_builtins_items_
+@@ -18145,7 +18042,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1018,7 +1030,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18269,7 +18154,7 @@ static const NSSItem nss_builtins_items_
+@@ -18269,7 +18166,7 @@ static const NSSItem nss_builtins_items_
  "\156\117\022\176\012\074\235\225"
  , (PRUint32)1560 }
  };
@@ -1027,7 +1039,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18294,7 +18179,7 @@ static const NSSItem nss_builtins_items_
+@@ -18294,7 +18191,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1036,7 +1048,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18413,7 +18298,7 @@ static const NSSItem nss_builtins_items_
+@@ -18413,7 +18310,7 @@ static const NSSItem nss_builtins_items_
  "\333\374\046\210\307"
  , (PRUint32)1525 }
  };
@@ -1045,7 +1057,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18437,7 +18322,7 @@ static const NSSItem nss_builtins_items_
+@@ -18437,7 +18334,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1054,7 +1066,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18593,7 +18478,7 @@ static const NSSItem nss_builtins_items_
+@@ -18593,7 +18490,7 @@ static const NSSItem nss_builtins_items_
  "\167\110\320"
  , (PRUint32)1875 }
  };
@@ -1063,7 +1075,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18624,7 +18509,7 @@ static const NSSItem nss_builtins_items_
+@@ -18624,7 +18521,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1072,7 +1084,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18777,7 +18662,7 @@ static const NSSItem nss_builtins_items_
+@@ -18777,7 +18674,7 @@ static const NSSItem nss_builtins_items_
  "\351\233\256\325\124\300\164\200\321\013\102\237\301"
  , (PRUint32)1869 }
  };
@@ -1081,7 +1093,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18807,7 +18692,7 @@ static const NSSItem nss_builtins_items_
+@@ -18807,7 +18704,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1090,7 +1102,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18943,7 +18828,7 @@ static const NSSItem nss_builtins_items_
+@@ -18943,7 +18840,7 @@ static const NSSItem nss_builtins_items_
  "\242\355\264\324\265\145\103\267\223\106\212\323"
  , (PRUint32)1532 }
  };
@@ -1099,7 +1111,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18973,7 +18858,7 @@ static const NSSItem nss_builtins_items_
+@@ -18973,7 +18870,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1108,7 +1120,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19124,7 +19009,7 @@ static const NSSItem nss_builtins_items_
+@@ -19124,7 +19021,7 @@ static const NSSItem nss_builtins_items_
  "\264"
  , (PRUint32)1761 }
  };
@@ -1117,7 +1129,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19154,7 +19039,7 @@ static const NSSItem nss_builtins_items_
+@@ -19154,7 +19051,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1126,7 +1138,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19290,7 +19175,7 @@ static const NSSItem nss_builtins_items_
+@@ -19290,7 +19187,7 @@ static const NSSItem nss_builtins_items_
  "\111\043"
  , (PRUint32)1522 }
  };
@@ -1135,7 +1147,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19320,7 +19205,7 @@ static const NSSItem nss_builtins_items_
+@@ -19320,7 +19217,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1144,7 +1156,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19455,7 +19340,7 @@ static const NSSItem nss_builtins_items_
+@@ -19455,7 +19352,7 @@ static const NSSItem nss_builtins_items_
  "\172\244\047\023\326\117\364\151"
  , (PRUint32)1512 }
  };
@@ -1153,7 +1165,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19485,7 +19370,7 @@ static const NSSItem nss_builtins_items_
+@@ -19485,7 +19382,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1162,7 +1174,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19621,7 +19506,7 @@ static const NSSItem nss_builtins_items_
+@@ -19621,7 +19518,7 @@ static const NSSItem nss_builtins_items_
  "\302\021\254"
  , (PRUint32)1523 }
  };
@@ -1171,7 +1183,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19651,7 +19536,7 @@ static const NSSItem nss_builtins_items_
+@@ -19651,7 +19548,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1180,7 +1192,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19787,7 +19672,7 @@ static const NSSItem nss_builtins_items_
+@@ -19787,7 +19684,7 @@ static const NSSItem nss_builtins_items_
  "\147\024\060"
  , (PRUint32)1523 }
  };
@@ -1189,7 +1201,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19817,7 +19702,7 @@ static const NSSItem nss_builtins_items_
+@@ -19817,7 +19714,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1198,7 +1210,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19951,7 +19836,7 @@ static const NSSItem nss_builtins_items_
+@@ -19951,7 +19848,7 @@ static const NSSItem nss_builtins_items_
  "\217\116\235\306\066\347\134\246\253\022\017\326\317"
  , (PRUint32)1501 }
  };
@@ -1207,7 +1219,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19981,7 +19866,7 @@ static const NSSItem nss_builtins_items_
+@@ -19981,7 +19878,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1216,7 +1228,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20115,7 +20000,7 @@ static const NSSItem nss_builtins_items_
+@@ -20115,7 +20012,7 @@ static const NSSItem nss_builtins_items_
  "\130\113\161\203\237\146\346\254\171\110\376\376\107"
  , (PRUint32)1501 }
  };
@@ -1225,7 +1237,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20145,7 +20030,7 @@ static const NSSItem nss_builtins_items_
+@@ -20145,7 +20042,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1234,7 +1246,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20280,7 +20165,7 @@ static const NSSItem nss_builtins_items_
+@@ -20280,7 +20177,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 }
  };
@@ -1243,7 +1255,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20310,7 +20195,7 @@ static const NSSItem nss_builtins_items_
+@@ -20310,7 +20207,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1252,7 +1264,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20438,7 +20323,7 @@ static const NSSItem nss_builtins_items_
+@@ -20438,7 +20335,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 }
  };
@@ -1261,7 +1273,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20468,7 +20353,7 @@ static const NSSItem nss_builtins_items_
+@@ -20468,7 +20365,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1270,7 +1282,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20561,7 +20446,7 @@ static const NSSItem nss_builtins_items_
+@@ -20561,7 +20458,7 @@ static const NSSItem nss_builtins_items_
  "\342\342\104\276\134\367\352\034\365"
  , (PRUint32)969 }
  };
@@ -1279,7 +1291,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20589,7 +20474,7 @@ static const NSSItem nss_builtins_items_
+@@ -20589,7 +20486,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1288,7 +1300,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20686,7 +20571,7 @@ static const NSSItem nss_builtins_items_
+@@ -20686,7 +20583,7 @@ static const NSSItem nss_builtins_items_
  "\364"
  , (PRUint32)993 }
  };
@@ -1297,7 +1309,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20715,7 +20600,7 @@ static const NSSItem nss_builtins_items_
+@@ -20715,7 +20612,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1306,7 +1318,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20813,7 +20698,7 @@ static const NSSItem nss_builtins_items_
+@@ -20813,7 +20710,7 @@ static const NSSItem nss_builtins_items_
  "\261\050\272"
  , (PRUint32)1011 }
  };
@@ -1315,7 +1327,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20842,7 +20727,7 @@ static const NSSItem nss_builtins_items_
+@@ -20842,7 +20739,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1324,7 +1336,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20919,7 +20804,7 @@ static const NSSItem nss_builtins_items_
+@@ -20919,7 +20816,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 }
  };
@@ -1333,7 +1345,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20943,7 +20828,7 @@ static const NSSItem nss_builtins_items_
+@@ -20943,7 +20840,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1342,7 +1354,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21020,7 +20905,7 @@ static const NSSItem nss_builtins_items_
+@@ -21020,7 +20917,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 }
  };
@@ -1351,7 +1363,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21044,7 +20929,7 @@ static const NSSItem nss_builtins_items_
+@@ -21044,7 +20941,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1360,7 +1372,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21153,7 +21038,7 @@ static const NSSItem nss_builtins_items_
+@@ -21153,7 +21050,7 @@ static const NSSItem nss_builtins_items_
  "\051\340\266\270\011\150\031\034\030\103"
  , (PRUint32)1354 }
  };
@@ -1369,7 +1381,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21177,7 +21062,7 @@ static const NSSItem nss_builtins_items_
+@@ -21177,7 +21074,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1378,7 +1390,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21234,7 +21119,7 @@ static const NSSItem nss_builtins_items_
+@@ -21234,7 +21131,7 @@ static const NSSItem nss_builtins_items_
  "\214\171"
  , (PRUint32)514 }
  };
@@ -1387,7 +1399,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21258,7 +21143,7 @@ static const NSSItem nss_builtins_items_
+@@ -21258,7 +21155,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1396,7 +1408,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21348,7 +21233,7 @@ static const NSSItem nss_builtins_items_
+@@ -21348,7 +21245,7 @@ static const NSSItem nss_builtins_items_
  "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
  , (PRUint32)959 }
  };
@@ -1405,7 +1417,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21375,7 +21260,7 @@ static const NSSItem nss_builtins_items_
+@@ -21375,7 +21272,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1414,7 +1426,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21493,7 +21378,7 @@ static const NSSItem nss_builtins_items_
+@@ -21493,7 +21390,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 }
  };
@@ -1423,7 +1435,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21519,7 +21404,7 @@ static const NSSItem nss_builtins_items_
+@@ -21519,7 +21416,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1432,7 +1444,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21652,7 +21537,7 @@ static const NSSItem nss_builtins_items_
+@@ -21652,7 +21549,7 @@ static const NSSItem nss_builtins_items_
  "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
  , (PRUint32)1679 }
  };
@@ -1441,7 +1453,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21678,7 +21563,7 @@ static const NSSItem nss_builtins_items_
+@@ -21678,7 +21575,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1450,7 +1462,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21772,7 +21657,7 @@ static const NSSItem nss_builtins_items_
+@@ -21772,7 +21669,7 @@ static const NSSItem nss_builtins_items_
  "\204\232\315"
  , (PRUint32)979 }
  };
@@ -1459,7 +1471,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21800,7 +21685,7 @@ static const NSSItem nss_builtins_items_
+@@ -21800,7 +21697,7 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -1468,7 +1480,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21884,7 +21769,7 @@ static const NSSItem nss_builtins_items_
+@@ -21884,7 +21781,7 @@ static const NSSItem nss_builtins_items_
  "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
  , (PRUint32)895 }
  };
@@ -1477,7 +1489,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
    { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
    { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21910,6 +21795,811 @@ static const NSSItem nss_builtins_items_
+@@ -21910,6 +21807,1071 @@ static const NSSItem nss_builtins_items_
    { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
    { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  };
@@ -2285,11 +2297,271 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
 +  { (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_340 [] = {
++  { (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 Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
++"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
++"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
++"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
++"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151"
++"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156"
++"\162\151\143\150\051"
++, (PRUint32)101 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\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"
++, (PRUint32)119 },
++  { (void *)"\002\006\007\377\377\377\377\377"
++, (PRUint32)8 },
++  { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007"
++"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
++"\001\005\005\000\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\060\036\027\015\060"
++"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062"
++"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060"
++"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
++"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
++"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
++"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003"
++"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145"
++"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051"
++"\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\255\250\144"
++"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376"
++"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312"
++"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225"
++"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152"
++"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173"
++"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335"
++"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177"
++"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001"
++"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035"
++"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134"
++"\006\003\125\035\040\004\125\060\123\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\143\171\142"
++"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164"
++"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056"
++"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003"
++"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006"
++"\003\125\035\043\004\201\201\060\177\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\306\026\223\116\026\027"
++"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015"
++"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201"
++"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005"
++"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325"
++"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377"
++"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222"
++"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113"
++"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362"
++"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305"
++"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143"
++"\131"
++, (PRUint32)977 }
++};
++static const NSSItem nss_builtins_items_341 [] = {
++  { (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 Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
++  { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025"
++"\214\071\131\117"
++, (PRUint32)20 },
++  { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152"
++, (PRUint32)16 },
++  { (void *)"\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"
++, (PRUint32)119 },
++  { (void *)"\002\006\007\377\377\377\377\377"
++, (PRUint32)8 },
++  { (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_342 [] = {
++  { (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 Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
++"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
++"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
++"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
++"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151"
++"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050"
++"\105\156\162\151\143\150\051"
++, (PRUint32)103 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
++"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
++"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
++"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
++"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
++"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
++"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
++"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
++"\040\050\062\060\064\070\051"
++, (PRUint32)183 },
++  { (void *)"\002\006\007\377\377\377\377\377"
++, (PRUint32)8 },
++  { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007"
++"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
++"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012"
++"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060"
++"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162"
++"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070"
++"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056"
++"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061"
++"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071"
++"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114"
++"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023"
++"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162"
++"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
++"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061"
++"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065"
++"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060"
++"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
++"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
++"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
++"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003"
++"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145"
++"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143"
++"\150\051\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\305\211\344\364\015\006\100\222\131\307\032\263\065"
++"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140"
++"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026"
++"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313"
++"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336"
++"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245"
++"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044"
++"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167"
++"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026"
++"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166"
++"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063"
++"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312"
++"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364"
++"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046"
++"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150"
++"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205"
++"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060"
++"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
++"\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\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\104\006\003\125\035\040\004\075\060\073\060\071\006"
++"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005"
++"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167"
++"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171"
++"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004"
++"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072"
++"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145"
++"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003"
++"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060"
++"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321"
++"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160"
++"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
++"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153"
++"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003"
++"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001"
++"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014"
++"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063"
++"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142"
++"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264"
++"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251"
++"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330"
++"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327"
++"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013"
++"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113"
++"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227"
++"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100"
++"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247"
++"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011"
++"\355\020\342\305"
++, (PRUint32)1236 }
++};
++static const NSSItem nss_builtins_items_343 [] = {
++  { (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 Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
++  { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151"
++"\005\155\061\046"
++, (PRUint32)20 },
++  { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362"
++, (PRUint32)16 },
++  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
++"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
++"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
++"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
++"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
++"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
++"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
++"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
++"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
++"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
++"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
++"\040\050\062\060\064\070\051"
++, (PRUint32)183 },
++  { (void *)"\002\006\007\377\377\377\377\377"
++, (PRUint32)8 },
++  { (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[] = {
+@@ -22244,11 +23206,25 @@ 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} },
@@ -2304,25 +2576,29 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
 +  { 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} }
++  { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} },
++  { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} },
++  { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} },
++  { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} },
++  { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} }
  };
  const PRUint32
  #ifdef DEBUG
 -  nss_builtins_nObjects = 329+1;
-+  nss_builtins_nObjects = 339+1;
++  nss_builtins_nObjects = 343+1;
  #else
 -  nss_builtins_nObjects = 329;
-+  nss_builtins_nObjects = 339;
++  nss_builtins_nObjects = 343;
  #endif /* DEBUG */
-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
+diff -urpN '--exclude=CVS' mozilla/security/nss/lib/ckfw/builtins/certdata.txt mozilla-ckbi//security/nss/lib/ckfw/builtins/certdata.txt
+--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 11:40:37.144761602 +0100
++++ mozilla-ckbi//security/nss/lib/ckfw/builtins/certdata.txt	2011-11-05 11:41:26.948677529 +0100
 @@ -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 $"
++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.14 $ $Date: 2011/11/03 15:12:15 $"
  
  #
  # certdata.txt
@@ -2488,7 +2764,7 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
  # Certificate "Network Solutions Certificate Authority"
  #
  CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-@@ -22589,3 +22434,868 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSC
+@@ -22589,3 +22434,1149 @@ 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
@@ -3357,17 +3633,298 @@ diff -uprN '--exclude=CVS' nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/ce
 +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
++
++#
++# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
++#
++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 Malaysian Digicert Sdn. Bhd. (cyb)"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061
++\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
++\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
++\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
++\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151
++\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156
++\162\151\143\150\051
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\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
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\006\007\377\377\377\377\377
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007
++\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
++\001\005\005\000\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\060\036\027\015\060
++\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062
++\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060
++\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
++\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
++\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
++\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003
++\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145
++\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051
++\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\255\250\144
++\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376
++\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312
++\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225
++\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152
++\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173
++\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335
++\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177
++\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001
++\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035
++\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134
++\006\003\125\035\040\004\125\060\123\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\143\171\142
++\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164
++\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056
++\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003
++\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006
++\003\125\035\043\004\201\201\060\177\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\306\026\223\116\026\027
++\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015
++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201
++\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005
++\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325
++\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377
++\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222
++\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113
++\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362
++\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305
++\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143
++\131
++END
++
++# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
++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 Malaysian Digicert Sdn. Bhd. (cyb)"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025
++\214\071\131\117
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152
++END
++CKA_ISSUER MULTILINE_OCTAL
++\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
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\006\007\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 Distrusted Malaysian Digicert Sdn. Bhd. (en)"
++#
++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 Malaysian Digicert Sdn. Bhd. (en)"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061
++\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
++\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
++\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
++\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151
++\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050
++\105\156\162\151\143\150\051
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
++\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
++\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
++\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
++\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
++\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
++\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
++\040\050\062\060\064\070\051
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\006\007\377\377\377\377\377
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007
++\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
++\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012
++\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060
++\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162
++\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070
++\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056
++\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061
++\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071
++\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114
++\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023
++\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162
++\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
++\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061
++\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065
++\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060
++\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
++\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
++\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
++\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003
++\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145
++\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143
++\150\051\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\305\211\344\364\015\006\100\222\131\307\032\263\065
++\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140
++\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026
++\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313
++\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336
++\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245
++\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044
++\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167
++\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026
++\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166
++\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063
++\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312
++\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364
++\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046
++\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150
++\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205
++\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060
++\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
++\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\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\104\006\003\125\035\040\004\075\060\073\060\071\006
++\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005
++\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167
++\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171
++\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004
++\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072
++\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145
++\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003
++\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060
++\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321
++\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160
++\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
++\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153
++\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003
++\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001
++\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014
++\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063
++\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142
++\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264
++\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251
++\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330
++\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327
++\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013
++\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113
++\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227
++\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100
++\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247
++\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011
++\355\020\342\305
++END
++
++# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
++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 Malaysian Digicert Sdn. Bhd. (en)"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151
++\005\155\061\046
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
++\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
++\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
++\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
++\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
++\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
++\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
++\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
++\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
++\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
++\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
++\040\050\062\060\064\070\051
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\006\007\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
++
+diff -urpN '--exclude=CVS' mozilla/security/nss/lib/ckfw/builtins/nssckbi.h mozilla-ckbi//security/nss/lib/ckfw/builtins/nssckbi.h
+--- mozilla/security/nss/lib/ckfw/builtins/nssckbi.h	2011-11-05 11:40:37.145761601 +0100
++++ mozilla-ckbi//security/nss/lib/ckfw/builtins/nssckbi.h	2011-11-05 11:41:26.953677521 +0100
 @@ -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"
++#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88
++#define NSS_BUILTINS_LIBRARY_VERSION "1.88"
  
  /* These version numbers detail the semantic changes to the ckfw engine. */
  #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 186b818..9149789 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov  5 10:47:51 UTC 2011 - wr@rosenauer.org
+
+- explicitely distrust DigiCert Sdn. Bhd (bnc#728520, bmo#698753)
+
 -------------------------------------------------------------------
 Fri Sep 30 23:27:07 UTC 2011 - crrodriguez@opensuse.org
 
-- Workaround qemu-arm bugs. 
+- Workaround qemu-arm bugs.
 
 -------------------------------------------------------------------
 Fri Sep  9 05:44:15 UTC 2011 - wr@rosenauer.org
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index e39cfa3..b84f07f 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -56,7 +56,7 @@ Patch4:         char.patch
 Patch5:         nss-no-rpath.patch
 Patch6:         renegotiate-transitional.patch
 Patch9:         malloc.patch
-Patch10:        nss-3.12.11-diginotar.patch
+Patch10:        ckbi-1_88.patch
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 PreReq:         mozilla-nspr >= %nspr_ver
 PreReq:         libfreebl3 >= %{nss_softokn_fips_version}
@@ -174,7 +174,7 @@ cd mozilla
 %if %suse_version > 1110
 %patch9
 %endif
-%patch10 -p2
+%patch10 -p1
 # additional CA certificates
 #cd security/nss/lib/ckfw/builtins
 #cat %{SOURCE2} >> certdata.txt

From 7a675fbd4552c184c5ce157aa2e775dbf5798b496d2e13cfce721a8134b14a26 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 5 Nov 2011 12:00:04 +0000
Subject: [PATCH 2/2] - make sure NSS_NoDB_Init does not try to use wrong
 certificate   databases (CVE-2011-3640, bnc#726096, bmo#641052)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=86
---
 mozilla-nss.changes             |   2 +
 mozilla-nss.spec                |   2 +
 nss-3.12.11_CVE-2011-3640.patch | 141 ++++++++++++++++++++++++++++++++
 3 files changed, 145 insertions(+)
 create mode 100644 nss-3.12.11_CVE-2011-3640.patch

diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 9149789..2326ed5 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -2,6 +2,8 @@
 Sat Nov  5 10:47:51 UTC 2011 - wr@rosenauer.org
 
 - explicitely distrust DigiCert Sdn. Bhd (bnc#728520, bmo#698753)
+- make sure NSS_NoDB_Init does not try to use wrong certificate
+  databases (CVE-2011-3640, bnc#726096, bmo#641052)
 
 -------------------------------------------------------------------
 Fri Sep 30 23:27:07 UTC 2011 - crrodriguez@opensuse.org
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index b84f07f..32f92d9 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -57,6 +57,7 @@ Patch5:         nss-no-rpath.patch
 Patch6:         renegotiate-transitional.patch
 Patch9:         malloc.patch
 Patch10:        ckbi-1_88.patch
+Patch11:        nss-3.12.11_CVE-2011-3640.patch
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 PreReq:         mozilla-nspr >= %nspr_ver
 PreReq:         libfreebl3 >= %{nss_softokn_fips_version}
@@ -175,6 +176,7 @@ cd mozilla
 %patch9
 %endif
 %patch10 -p1
+%patch11
 # additional CA certificates
 #cd security/nss/lib/ckfw/builtins
 #cat %{SOURCE2} >> certdata.txt
diff --git a/nss-3.12.11_CVE-2011-3640.patch b/nss-3.12.11_CVE-2011-3640.patch
new file mode 100644
index 0000000..89bdf71
--- /dev/null
+++ b/nss-3.12.11_CVE-2011-3640.patch
@@ -0,0 +1,141 @@
+Index: security/nss/lib/softoken/sftkmod.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sftkmod.c,v
+retrieving revision 1.7
+diff -u -p -r1.7 sftkmod.c
+--- security/nss/lib/softoken/sftkmod.c	11 Jun 2009 06:28:07 -0000	1.7
++++ security/nss/lib/softoken/sftkmod.c	5 Nov 2011 11:55:24 -0000
+@@ -179,15 +179,18 @@ char *sftk_getOldSecmodName(const char *
+     char *sep;
+ 
+     sep = PORT_Strrchr(dirPath,*PATH_SEPARATOR);
+-#ifdef WINDOWS
++#ifdef _WIN32
+     if (!sep) {
+-	sep = PORT_Strrchr(dirPath,'/');
++	/* pkcs11i.h defines PATH_SEPARATOR as "/" for all platforms. */
++	sep = PORT_Strrchr(dirPath,'\\');
+     }
+ #endif
+     if (sep) {
+-	*(sep)=0;
++	*sep = 0;
++	file = PR_smprintf("%s"PATH_SEPARATOR"%s", dirPath, filename);
++    } else {
++	file = PR_smprintf("%s", filename);
+     }
+-    file= PR_smprintf("%s"PATH_SEPARATOR"%s", dirPath, filename);
+     PORT_Free(dirPath);
+     return file;
+ }
+@@ -242,13 +245,18 @@ sftkdb_ReadSecmodDB(SDBType dbType, cons
+     char *paramsValue=NULL;
+     PRBool failed = PR_TRUE;
+ 
+-    if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) {
++    if ((dbname != NULL) &&
++		((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS))) {
+ 	return sftkdbCall_ReadSecmodDB(appName, filename, dbname, params, rw);
+     }
+ 
+     moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char **));
+     if (moduleList == NULL) return NULL;
+ 
++    if (dbname == NULL) {
++	goto return_default;
++    }
++
+     /* do we really want to use streams here */
+     fd = fopen(dbname, "r");
+     if (fd == NULL) goto done;
+@@ -405,7 +413,11 @@ sftkdb_ReadSecmodDB(SDBType dbType, cons
+ 	moduleString = NULL;
+     }
+ done:
+-    /* if we couldn't open a pkcs11 database, look for the old one */
++    /* If we couldn't open a pkcs11 database, look for the old one.
++     * This is necessary to maintain the semantics of the transition from
++     * old to new DB's. If there is an old DB and not new DB, we will
++     * automatically use the old DB. If the DB was opened read/write, we
++     * create a new db and upgrade it from the old one. */
+     if (fd == NULL) {
+ 	char *olddbname = sftk_getOldSecmodName(dbname,filename);
+ 	PRStatus status;
+@@ -462,6 +474,8 @@ bail:
+ 	    PR_smprintf_free(olddbname);
+ 	}
+     }
++
++return_default:
+ 	
+     if (!moduleList[0]) {
+ 	char * newParams;
+@@ -515,7 +529,8 @@ sftkdb_ReleaseSecmodDBData(SDBType dbTyp
+ 			const char *filename, const char *dbname, 
+ 			char **moduleSpecList, PRBool rw)
+ {
+-    if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) {
++    if ((dbname != NULL) &&
++		((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS))) {
+ 	return sftkdbCall_ReleaseSecmodDBData(appName, filename, dbname, 
+ 					  moduleSpecList, rw);
+     }
+@@ -546,6 +561,10 @@ sftkdb_DeleteSecmodDB(SDBType dbType, co
+     PRBool skip = PR_FALSE;
+     PRBool found = PR_FALSE;
+ 
++    if (dbname == NULL) {
++	return SECFailure;
++    }
++
+     if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) {
+ 	return sftkdbCall_DeleteSecmodDB(appName, filename, dbname, args, rw);
+     }
+@@ -668,6 +687,10 @@ sftkdb_AddSecmodDB(SDBType dbType, const
+     char *block = NULL;
+     PRBool libFound = PR_FALSE;
+ 
++    if (dbname == NULL) {
++	return SECFailure;
++    }
++
+     if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) {
+ 	return sftkdbCall_AddSecmodDB(appName, filename, dbname, module, rw);
+     }
+Index: security/nss/lib/softoken/sftkpars.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sftkpars.c,v
+retrieving revision 1.11
+diff -u -p -r1.11 sftkpars.c
+--- security/nss/lib/softoken/sftkpars.c	18 Jun 2010 04:09:27 -0000	1.11
++++ security/nss/lib/softoken/sftkpars.c	5 Nov 2011 11:55:24 -0000
+@@ -607,6 +607,7 @@ sftk_getSecmodName(char *param, SDBType 
+     char *value = NULL;
+     char *save_params = param;
+     const char *lconfigdir;
++    PRBool noModDB = PR_FALSE;
+     param = sftk_argStrip(param);
+ 	
+ 
+@@ -631,7 +632,10 @@ sftk_getSecmodName(char *param, SDBType 
+ 
+    if (sftk_argHasFlag("flags","noModDB",save_params)) {
+ 	/* there isn't a module db, don't load the legacy support */
++	noModDB = PR_TRUE;
+ 	*dbType = SDB_SQL;
++	PORT_Free(*filename);
++	*filename = NULL;
+         *rw = PR_FALSE;
+    }
+ 
+@@ -640,7 +644,9 @@ sftk_getSecmodName(char *param, SDBType 
+ 	secmodName="pkcs11.txt";
+    }
+ 
+-   if (lconfigdir) {
++   if (noModDB) {
++	value = NULL;
++   } else if (lconfigdir && lconfigdir[0] != '\0') {
+ 	value = PR_smprintf("%s" PATH_SEPARATOR "%s",lconfigdir,secmodName);
+    } else {
+ 	value = PR_smprintf("%s",secmodName);