Bugzilla Bug 287495: added Go Daddy Class 2 CA and Starfield Class 2 CA.

Bumped the nssckbi module's version to 1.53.  Updated the instructions in
README. r=relyea,nelsonb.
Modified Files: README certdata.c certdata.txt nssckbi.h

4 files changed, 532 insertions, 20 deletions

diff --git a/security/nss/lib/ckfw/builtins/README b/security/nss/lib/ckfw/builtins/README
index 248a5ef8f..9b110e61d 100644
--- a/security/nss/lib/ckfw/builtins/README
+++ b/security/nss/lib/ckfw/builtins/README
@@ -10,28 +10,26 @@ You need to use the addbuiltin command-line tool to add a root CA certificate
 to the nssckbi module. In the procedure described below, we assume that the
 new root CA certificate is distributed in DER format in the file newroot.der.
 
-1. (deleted, addbuiltin is now built as part of NSS).
-
-2. Add the directory where the addbuiltin executable resides to your PATH
+1. Add the directory where the addbuiltin executable resides to your PATH
 environment variable. Then, add the directory where the NSPR and NSS shared
 libraries (DLLs) reside to the platform-specific environment variable that
 specifies your shared library search path: LD_LIBRARY_PATH (most Unix
 variants), SHLIB_PATH (32-bit HP-UX), LIBPATH (AIX), or PATH (Windows).
 
-3. Copy newroot.der to this directory.
+2. Copy newroot.der to this directory.
 
-4. In this directory, run addbuiltin to add the new root certificate. The
-argument to the -n option should be replaced by the name of the root
+3. In this directory, run addbuiltin to add the new root certificate. The
+argument to the -n option should be replaced by the nickname of the root
 certificate. Then run "gmake generate".
 
-    % addbuiltin -n "Name of the Root Certificate" -t C,C,C < newroot.der >> certdata.txt
+    % addbuiltin -n "Nickname of the Root Certificate" -t C,C,C < newroot.der >> certdata.txt
     % gmake generate
 
-5. Edit nssckbi.h to bump the version of the module.
+4. Edit nssckbi.h to bump the version of the module.
 
-6. Run gmake in this directory to build the nssckbi module.
+5. Run gmake in this directory to build the nssckbi module.
 
-7. After you verify that the new nssckbi module is correct, check in
+6. After you verify that the new nssckbi module is correct, check in
 certdata.txt, certdata.c, and nssckbi.h.
 
 II. Removing a Builtin Root CA Certificate
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index c7cf4e464..ad33038e2 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -42,15 +42,15 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
-static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
+static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
+static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
-static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
 static const CK_OBJECT_CLASS cko_data = CKO_DATA;
-static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_BBOOL ck_true = CK_TRUE;
-static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
+static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
@@ -611,6 +611,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_184 [] = {
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_185 [] = {
  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_186 [] = {
+ 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_187 [] = {
+ 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_188 [] = {
+ 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_189 [] = {
+ 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) },
@@ -12417,6 +12429,245 @@ static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
+static const NSSItem nss_builtins_items_186 [] = {
+  { (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 *)"Go Daddy Class 2 CA", (PRUint32)20 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157"
+"\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156"
+"\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040"
+"\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171"
+, (PRUint32)101 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157"
+"\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156"
+"\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040"
+"\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171"
+, (PRUint32)101 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\004\000\060\202\002\350\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041"
+"\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157\040"
+"\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156\143"
+"\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040\104"
+"\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\060\036\027\015\060\064\060\066\062\071\061\067"
+"\060\066\062\060\132\027\015\063\064\060\066\062\071\061\067\060"
+"\066\062\060\132\060\143\061\013\060\011\006\003\125\004\006\023"
+"\002\125\123\061\041\060\037\006\003\125\004\012\023\030\124\150"
+"\145\040\107\157\040\104\141\144\144\171\040\107\162\157\165\160"
+"\054\040\111\156\143\056\061\061\060\057\006\003\125\004\013\023"
+"\050\107\157\040\104\141\144\144\171\040\103\154\141\163\163\040"
+"\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\060\202\001\040\060\015\006"
+"\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\015"
+"\000\060\202\001\010\002\202\001\001\000\336\235\327\352\127\030"
+"\111\241\133\353\327\137\110\206\352\276\335\377\344\357\147\034"
+"\364\145\150\263\127\161\240\136\167\273\355\233\111\351\160\200"
+"\075\126\030\143\010\157\332\362\314\320\077\177\002\124\042\124"
+"\020\330\262\201\324\300\165\075\113\177\307\167\303\076\170\253"
+"\032\003\265\040\153\057\152\053\261\305\210\176\304\273\036\260"
+"\301\330\105\047\157\252\067\130\367\207\046\327\330\055\366\251"
+"\027\267\037\162\066\116\246\027\077\145\230\222\333\052\156\135"
+"\242\376\210\340\013\336\177\345\215\025\341\353\313\072\325\342"
+"\022\242\023\055\330\216\257\137\022\075\240\010\005\010\266\134"
+"\245\145\070\004\105\231\036\243\140\140\164\305\101\245\162\142"
+"\033\142\305\037\157\137\032\102\276\002\121\145\250\256\043\030"
+"\152\374\170\003\251\115\177\200\303\372\253\132\374\241\100\244"
+"\312\031\026\376\262\310\357\136\163\015\356\167\275\232\366\171"
+"\230\274\261\007\147\242\025\015\335\240\130\306\104\173\012\076"
+"\142\050\137\272\101\007\123\130\317\021\176\070\164\305\370\377"
+"\265\151\220\217\204\164\352\227\033\257\002\001\003\243\201\300"
+"\060\201\275\060\035\006\003\125\035\016\004\026\004\024\322\304"
+"\260\322\221\324\114\021\161\263\141\313\075\241\376\335\250\152"
+"\324\343\060\201\215\006\003\125\035\043\004\201\205\060\201\202"
+"\200\024\322\304\260\322\221\324\114\021\161\263\141\313\075\241"
+"\376\335\250\152\324\343\241\147\244\145\060\143\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\041\060\037\006\003\125"
+"\004\012\023\030\124\150\145\040\107\157\040\104\141\144\144\171"
+"\040\107\162\157\165\160\054\040\111\156\143\056\061\061\060\057"
+"\006\003\125\004\013\023\050\107\157\040\104\141\144\144\171\040"
+"\103\154\141\163\163\040\062\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\202"
+"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
+"\202\001\001\000\062\113\363\262\312\076\221\374\022\306\241\007"
+"\214\216\167\240\063\006\024\134\220\036\030\367\010\246\075\012"
+"\031\371\207\200\021\156\151\344\226\027\060\377\064\221\143\162"
+"\070\356\314\034\001\243\035\224\050\244\061\366\172\304\124\327"
+"\366\345\061\130\003\242\314\316\142\333\224\105\163\265\277\105"
+"\311\044\265\325\202\002\255\043\171\151\215\270\266\115\316\317"
+"\114\312\063\043\350\034\210\252\235\213\101\156\026\311\040\345"
+"\211\236\315\073\332\160\367\176\231\046\040\024\124\045\253\156"
+"\163\205\346\233\041\235\012\154\202\016\250\370\302\014\372\020"
+"\036\154\226\357\207\015\304\017\141\213\255\356\203\053\225\370"
+"\216\222\204\162\071\353\040\352\203\355\203\315\227\156\010\274"
+"\353\116\046\266\163\053\344\323\366\114\376\046\161\342\141\021"
+"\164\112\377\127\032\207\017\165\110\056\317\121\151\027\240\002"
+"\022\141\225\325\321\100\262\020\114\356\304\254\020\103\246\245"
+"\236\012\325\225\142\232\015\317\210\202\305\062\014\344\053\237"
+"\105\346\015\237\050\234\261\271\052\132\127\255\067\017\257\035"
+"\177\333\275\237"
+, (PRUint32)1028 }
+};
+static const NSSItem nss_builtins_items_187 [] = {
+  { (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 *)"Go Daddy Class 2 CA", (PRUint32)20 },
+  { (void *)"\047\226\272\346\077\030\001\342\167\046\033\240\327\167\160\002"
+"\217\040\356\344"
+, (PRUint32)20 },
+  { (void *)"\221\336\006\045\253\332\375\062\027\014\273\045\027\052\204\147"
+, (PRUint32)16 },
+  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157"
+"\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156"
+"\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040"
+"\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171"
+, (PRUint32)101 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_188 [] = {
+  { (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 *)"Starfield Class 2 CA", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151"
+"\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163"
+"\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023"
+"\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163"
+"\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)106 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151"
+"\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163"
+"\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023"
+"\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163"
+"\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)106 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061\045"
+"\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151\145"
+"\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163\054"
+"\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023\051"
+"\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163\040"
+"\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\060\036\027\015\060\064\060"
+"\066\062\071\061\067\063\071\061\066\132\027\015\063\064\060\066"
+"\062\071\061\067\063\071\061\066\132\060\150\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\045\060\043\006\003\125\004"
+"\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143"
+"\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061"
+"\062\060\060\006\003\125\004\013\023\051\123\164\141\162\146\151"
+"\145\154\144\040\103\154\141\163\163\040\062\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\060\202\001\040\060\015\006\011\052\206\110\206\367"
+"\015\001\001\001\005\000\003\202\001\015\000\060\202\001\010\002"
+"\202\001\001\000\267\062\310\376\351\161\246\004\205\255\014\021"
+"\144\337\316\115\357\310\003\030\207\077\241\253\373\074\246\237"
+"\360\303\241\332\324\330\156\053\123\220\373\044\244\076\204\360"
+"\236\350\137\354\345\047\104\365\050\246\077\173\336\340\052\360"
+"\310\257\123\057\236\312\005\001\223\036\217\146\034\071\247\115"
+"\372\132\266\163\004\045\146\353\167\177\347\131\306\112\231\045"
+"\024\124\353\046\307\363\177\031\325\060\160\217\257\260\106\052"
+"\377\255\353\051\355\327\237\252\004\207\243\324\371\211\245\064"
+"\137\333\103\221\202\066\331\146\074\261\270\271\202\375\234\072"
+"\076\020\310\073\357\006\145\146\172\233\031\030\075\377\161\121"
+"\074\060\056\137\276\075\167\163\262\135\006\154\303\043\126\232"
+"\053\205\046\222\034\247\002\263\344\077\015\257\010\171\202\270"
+"\066\075\352\234\323\065\263\274\151\312\365\314\235\350\375\144"
+"\215\027\200\063\156\136\112\135\231\311\036\207\264\235\032\300"
+"\325\156\023\065\043\136\337\233\137\075\357\326\367\166\302\352"
+"\076\273\170\015\034\102\147\153\004\330\370\326\332\157\213\362"
+"\104\240\001\253\002\001\003\243\201\305\060\201\302\060\035\006"
+"\003\125\035\016\004\026\004\024\277\137\267\321\316\335\037\206"
+"\364\133\125\254\334\327\020\302\016\251\210\347\060\201\222\006"
+"\003\125\035\043\004\201\212\060\201\207\200\024\277\137\267\321"
+"\316\335\037\206\364\133\125\254\334\327\020\302\016\251\210\347"
+"\241\154\244\152\060\150\061\013\060\011\006\003\125\004\006\023"
+"\002\125\123\061\045\060\043\006\003\125\004\012\023\034\123\164"
+"\141\162\146\151\145\154\144\040\124\145\143\150\156\157\154\157"
+"\147\151\145\163\054\040\111\156\143\056\061\062\060\060\006\003"
+"\125\004\013\023\051\123\164\141\162\146\151\145\154\144\040\103"
+"\154\141\163\163\040\062\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\202\001"
+"\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\005\235\077\210\235\321\311\032\125\241\254\151\363"
+"\363\131\332\233\001\207\032\117\127\251\241\171\011\052\333\367"
+"\057\262\036\314\307\136\152\330\203\207\241\227\357\111\065\076"
+"\167\006\101\130\142\277\216\130\270\012\147\077\354\263\335\041"
+"\146\037\311\124\372\162\314\075\114\100\330\201\257\167\236\203"
+"\172\273\242\307\365\064\027\216\331\021\100\364\374\054\052\115"
+"\025\177\247\142\135\056\045\323\000\013\040\032\035\150\371\027"
+"\270\364\275\213\355\050\131\335\115\026\213\027\203\310\262\145"
+"\307\055\172\245\252\274\123\206\155\335\127\244\312\370\040\101"
+"\013\150\360\364\373\164\276\126\135\172\171\365\371\035\205\343"
+"\055\225\276\365\161\220\103\314\215\037\232\000\012\207\051\351"
+"\125\042\130\000\043\352\343\022\103\051\133\107\010\335\214\101"
+"\152\145\006\250\345\041\252\101\264\225\041\225\271\175\321\064"
+"\253\023\326\255\274\334\342\075\071\315\275\076\165\160\241\030"
+"\131\003\311\042\264\217\234\325\136\052\327\245\266\324\012\155"
+"\370\267\100\021\106\232\037\171\016\142\277\017\227\354\340\057"
+"\037\027\224"
+, (PRUint32)1043 }
+};
+static const NSSItem nss_builtins_items_189 [] = {
+  { (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 *)"Starfield Class 2 CA", (PRUint32)21 },
+  { (void *)"\255\176\034\050\260\144\357\217\140\003\100\040\024\303\320\343"
+"\067\016\265\212"
+, (PRUint32)20 },
+  { (void *)"\062\112\113\273\310\143\151\233\276\164\232\306\335\035\106\044"
+, (PRUint32)16 },
+  { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151"
+"\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163"
+"\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023"
+"\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163"
+"\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)106 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
 
 PR_IMPLEMENT_DATA(builtinsInternalObject)
 nss_builtins_data[] = {
@@ -12607,11 +12858,15 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_182, nss_builtins_items_182, {NULL} },
   { 13, nss_builtins_types_183, nss_builtins_items_183, {NULL} },
   { 11, nss_builtins_types_184, nss_builtins_items_184, {NULL} },
-  { 13, nss_builtins_types_185, nss_builtins_items_185, {NULL} }
+  { 13, nss_builtins_types_185, nss_builtins_items_185, {NULL} },
+  { 11, nss_builtins_types_186, nss_builtins_items_186, {NULL} },
+  { 13, nss_builtins_types_187, nss_builtins_items_187, {NULL} },
+  { 11, nss_builtins_types_188, nss_builtins_items_188, {NULL} },
+  { 13, nss_builtins_types_189, nss_builtins_items_189, {NULL} }
 };
 PR_IMPLEMENT_DATA(const PRUint32)
 #ifdef DEBUG
-  nss_builtins_nObjects = 185+1;
+  nss_builtins_nObjects = 189+1;
 #else
-  nss_builtins_nObjects = 185;
+  nss_builtins_nObjects = 189;
 #endif /* DEBUG */
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 9394ecdcd..e98258a00 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -12809,3 +12809,262 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Go Daddy Class 2 CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Class 2 CA"
+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\125\123\061
+\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157
+\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156
+\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040
+\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157
+\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156
+\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040
+\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\000\060\202\002\350\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041
+\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157\040
+\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156\143
+\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040\104
+\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\060\036\027\015\060\064\060\066\062\071\061\067
+\060\066\062\060\132\027\015\063\064\060\066\062\071\061\067\060
+\066\062\060\132\060\143\061\013\060\011\006\003\125\004\006\023
+\002\125\123\061\041\060\037\006\003\125\004\012\023\030\124\150
+\145\040\107\157\040\104\141\144\144\171\040\107\162\157\165\160
+\054\040\111\156\143\056\061\061\060\057\006\003\125\004\013\023
+\050\107\157\040\104\141\144\144\171\040\103\154\141\163\163\040
+\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\060\202\001\040\060\015\006
+\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\015
+\000\060\202\001\010\002\202\001\001\000\336\235\327\352\127\030
+\111\241\133\353\327\137\110\206\352\276\335\377\344\357\147\034
+\364\145\150\263\127\161\240\136\167\273\355\233\111\351\160\200
+\075\126\030\143\010\157\332\362\314\320\077\177\002\124\042\124
+\020\330\262\201\324\300\165\075\113\177\307\167\303\076\170\253
+\032\003\265\040\153\057\152\053\261\305\210\176\304\273\036\260
+\301\330\105\047\157\252\067\130\367\207\046\327\330\055\366\251
+\027\267\037\162\066\116\246\027\077\145\230\222\333\052\156\135
+\242\376\210\340\013\336\177\345\215\025\341\353\313\072\325\342
+\022\242\023\055\330\216\257\137\022\075\240\010\005\010\266\134
+\245\145\070\004\105\231\036\243\140\140\164\305\101\245\162\142
+\033\142\305\037\157\137\032\102\276\002\121\145\250\256\043\030
+\152\374\170\003\251\115\177\200\303\372\253\132\374\241\100\244
+\312\031\026\376\262\310\357\136\163\015\356\167\275\232\366\171
+\230\274\261\007\147\242\025\015\335\240\130\306\104\173\012\076
+\142\050\137\272\101\007\123\130\317\021\176\070\164\305\370\377
+\265\151\220\217\204\164\352\227\033\257\002\001\003\243\201\300
+\060\201\275\060\035\006\003\125\035\016\004\026\004\024\322\304
+\260\322\221\324\114\021\161\263\141\313\075\241\376\335\250\152
+\324\343\060\201\215\006\003\125\035\043\004\201\205\060\201\202
+\200\024\322\304\260\322\221\324\114\021\161\263\141\313\075\241
+\376\335\250\152\324\343\241\147\244\145\060\143\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\041\060\037\006\003\125
+\004\012\023\030\124\150\145\040\107\157\040\104\141\144\144\171
+\040\107\162\157\165\160\054\040\111\156\143\056\061\061\060\057
+\006\003\125\004\013\023\050\107\157\040\104\141\144\144\171\040
+\103\154\141\163\163\040\062\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\202
+\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
+\202\001\001\000\062\113\363\262\312\076\221\374\022\306\241\007
+\214\216\167\240\063\006\024\134\220\036\030\367\010\246\075\012
+\031\371\207\200\021\156\151\344\226\027\060\377\064\221\143\162
+\070\356\314\034\001\243\035\224\050\244\061\366\172\304\124\327
+\366\345\061\130\003\242\314\316\142\333\224\105\163\265\277\105
+\311\044\265\325\202\002\255\043\171\151\215\270\266\115\316\317
+\114\312\063\043\350\034\210\252\235\213\101\156\026\311\040\345
+\211\236\315\073\332\160\367\176\231\046\040\024\124\045\253\156
+\163\205\346\233\041\235\012\154\202\016\250\370\302\014\372\020
+\036\154\226\357\207\015\304\017\141\213\255\356\203\053\225\370
+\216\222\204\162\071\353\040\352\203\355\203\315\227\156\010\274
+\353\116\046\266\163\053\344\323\366\114\376\046\161\342\141\021
+\164\112\377\127\032\207\017\165\110\056\317\121\151\027\240\002
+\022\141\225\325\321\100\262\020\114\356\304\254\020\103\246\245
+\236\012\325\225\142\232\015\317\210\202\305\062\014\344\053\237
+\105\346\015\237\050\234\261\271\052\132\127\255\067\017\257\035
+\177\333\275\237
+END
+
+# Trust for Certificate "Go Daddy Class 2 CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Class 2 CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\047\226\272\346\077\030\001\342\167\046\033\240\327\167\160\002
+\217\040\356\344
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\221\336\006\045\253\332\375\062\027\014\273\045\027\052\204\147
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157
+\040\104\141\144\144\171\040\107\162\157\165\160\054\040\111\156
+\143\056\061\061\060\057\006\003\125\004\013\023\050\107\157\040
+\104\141\144\144\171\040\103\154\141\163\163\040\062\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Starfield Class 2 CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Class 2 CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151
+\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163
+\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023
+\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163
+\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151
+\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163
+\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023
+\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163
+\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061\045
+\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151\145
+\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163\054
+\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023\051
+\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163\040
+\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\060\036\027\015\060\064\060
+\066\062\071\061\067\063\071\061\066\132\027\015\063\064\060\066
+\062\071\061\067\063\071\061\066\132\060\150\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\045\060\043\006\003\125\004
+\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143
+\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061
+\062\060\060\006\003\125\004\013\023\051\123\164\141\162\146\151
+\145\154\144\040\103\154\141\163\163\040\062\040\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
+\151\164\171\060\202\001\040\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\015\000\060\202\001\010\002
+\202\001\001\000\267\062\310\376\351\161\246\004\205\255\014\021
+\144\337\316\115\357\310\003\030\207\077\241\253\373\074\246\237
+\360\303\241\332\324\330\156\053\123\220\373\044\244\076\204\360
+\236\350\137\354\345\047\104\365\050\246\077\173\336\340\052\360
+\310\257\123\057\236\312\005\001\223\036\217\146\034\071\247\115
+\372\132\266\163\004\045\146\353\167\177\347\131\306\112\231\045
+\024\124\353\046\307\363\177\031\325\060\160\217\257\260\106\052
+\377\255\353\051\355\327\237\252\004\207\243\324\371\211\245\064
+\137\333\103\221\202\066\331\146\074\261\270\271\202\375\234\072
+\076\020\310\073\357\006\145\146\172\233\031\030\075\377\161\121
+\074\060\056\137\276\075\167\163\262\135\006\154\303\043\126\232
+\053\205\046\222\034\247\002\263\344\077\015\257\010\171\202\270
+\066\075\352\234\323\065\263\274\151\312\365\314\235\350\375\144
+\215\027\200\063\156\136\112\135\231\311\036\207\264\235\032\300
+\325\156\023\065\043\136\337\233\137\075\357\326\367\166\302\352
+\076\273\170\015\034\102\147\153\004\330\370\326\332\157\213\362
+\104\240\001\253\002\001\003\243\201\305\060\201\302\060\035\006
+\003\125\035\016\004\026\004\024\277\137\267\321\316\335\037\206
+\364\133\125\254\334\327\020\302\016\251\210\347\060\201\222\006
+\003\125\035\043\004\201\212\060\201\207\200\024\277\137\267\321
+\316\335\037\206\364\133\125\254\334\327\020\302\016\251\210\347
+\241\154\244\152\060\150\061\013\060\011\006\003\125\004\006\023
+\002\125\123\061\045\060\043\006\003\125\004\012\023\034\123\164
+\141\162\146\151\145\154\144\040\124\145\143\150\156\157\154\157
+\147\151\145\163\054\040\111\156\143\056\061\062\060\060\006\003
+\125\004\013\023\051\123\164\141\162\146\151\145\154\144\040\103
+\154\141\163\163\040\062\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\202\001
+\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\005\235\077\210\235\321\311\032\125\241\254\151\363
+\363\131\332\233\001\207\032\117\127\251\241\171\011\052\333\367
+\057\262\036\314\307\136\152\330\203\207\241\227\357\111\065\076
+\167\006\101\130\142\277\216\130\270\012\147\077\354\263\335\041
+\146\037\311\124\372\162\314\075\114\100\330\201\257\167\236\203
+\172\273\242\307\365\064\027\216\331\021\100\364\374\054\052\115
+\025\177\247\142\135\056\045\323\000\013\040\032\035\150\371\027
+\270\364\275\213\355\050\131\335\115\026\213\027\203\310\262\145
+\307\055\172\245\252\274\123\206\155\335\127\244\312\370\040\101
+\013\150\360\364\373\164\276\126\135\172\171\365\371\035\205\343
+\055\225\276\365\161\220\103\314\215\037\232\000\012\207\051\351
+\125\042\130\000\043\352\343\022\103\051\133\107\010\335\214\101
+\152\145\006\250\345\041\252\101\264\225\041\225\271\175\321\064
+\253\023\326\255\274\334\342\075\071\315\275\076\165\160\241\030
+\131\003\311\042\264\217\234\325\136\052\327\245\266\324\012\155
+\370\267\100\021\106\232\037\171\016\142\277\017\227\354\340\057
+\037\027\224
+END
+
+# Trust for Certificate "Starfield Class 2 CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Class 2 CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\255\176\034\050\260\144\357\217\140\003\100\040\024\303\320\343
+\067\016\265\212
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\062\112\113\273\310\143\151\233\276\164\232\306\335\035\106\044
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151
+\145\154\144\040\124\145\143\150\156\157\154\157\147\151\145\163
+\054\040\111\156\143\056\061\062\060\060\006\003\125\004\013\023
+\051\123\164\141\162\146\151\145\154\144\040\103\154\141\163\163
+\040\062\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index 9ad0833a6..951aa4365 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -74,8 +74,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 52
-#define NSS_BUILTINS_LIBRARY_VERSION "1.52"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 53
+#define NSS_BUILTINS_LIBRARY_VERSION "1.53"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1