Bugzilla Bug 275576: add "Root" to the nickname for the NSS_3_9_BRANCH
authorwtchang%redhat.com
Sat, 16 Apr 2005 00:15:51 +0000
branchNSS_3_9_BRANCH
changeset 5624 492ee8363a5e8e2e6810f660abe725114bf0b34e
parent 5623 5960df860261fdaededc23bc5ce6ae0746bebed1
push idunknown
push userunknown
push dateunknown
bugs275576
Bugzilla Bug 275576: add "Root" to the nickname for the "Global Chambersign" root. Modified files: certdata.c certdata.txt Tag: NSS_3_9_BRANCH
security/nss/lib/ckfw/builtins/certdata.c
security/nss/lib/ckfw/builtins/certdata.txt
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -34,25 +34,25 @@
 #ifdef DEBUG
 static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
+static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
 static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
+static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
+static const CK_BBOOL ck_true = CK_TRUE;
+static const CK_OBJECT_CLASS cko_data = CKO_DATA;
 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_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-static const CK_OBJECT_CLASS cko_data = CKO_DATA;
-static const CK_BBOOL ck_true = CK_TRUE;
 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
 };
 #endif /* DEBUG */
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_1 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL
 };
@@ -11607,17 +11607,17 @@ static const NSSItem nss_builtins_items_
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
 static const NSSItem nss_builtins_items_176 [] = {
   { (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 *)"Camerfirma Global Chambersign", (PRUint32)30 },
+  { (void *)"Camerfirma Global Chambersign Root", (PRUint32)35 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061"
 "\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155"
 "\145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101"
 "\070\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004"
 "\013\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150"
 "\141\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060"
 "\036\006\003\125\004\003\023\027\107\154\157\142\141\154\040\103"
@@ -11714,17 +11714,17 @@ static const NSSItem nss_builtins_items_
 "\166\135\165\220\032\365\046\217\360"
 , (PRUint32)1225 }
 };
 static const NSSItem nss_builtins_items_177 [] = {
   { (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 *)"Camerfirma Global Chambersign", (PRUint32)30 },
+  { (void *)"Camerfirma Global Chambersign Root", (PRUint32)35 },
   { (void *)"\063\233\153\024\120\044\233\125\172\001\207\162\204\331\340\057"
 "\303\322\330\351"
 , (PRUint32)20 },
   { (void *)"\305\346\173\277\006\320\117\103\355\304\172\145\212\373\153\031"
 , (PRUint32)16 },
   { (void *)"\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061"
 "\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155"
 "\145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101"
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -11932,23 +11932,23 @@ 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
 
 #
-# Certificate "Camerfirma Global Chambersign"
-#
-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 "Camerfirma Global Chambersign"
+# Certificate "Camerfirma Global Chambersign Root"
+#
+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 "Camerfirma Global Chambersign Root"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
 \060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061
 \047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155
 \145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101
 \070\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004
 \013\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150
 \141\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060
@@ -12044,22 +12044,22 @@ CKA_VALUE MULTILINE_OCTAL
 \045\310\062\370\040\021\315\175\062\063\110\224\124\114\335\334
 \171\304\060\237\353\216\270\125\265\327\210\134\305\152\044\075
 \262\323\005\003\121\306\007\357\314\024\162\164\075\156\162\316
 \030\050\214\112\240\167\345\011\053\105\104\107\254\267\147\177
 \001\212\005\132\223\276\241\301\377\370\347\016\147\244\107\111
 \166\135\165\220\032\365\046\217\360
 END
 
-# Trust for Certificate "Camerfirma Global Chambersign"
-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 "Camerfirma Global Chambersign"
+# Trust for Certificate "Camerfirma Global Chambersign Root"
+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 "Camerfirma Global Chambersign Root"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
 \063\233\153\024\120\044\233\125\172\001\207\162\204\331\340\057
 \303\322\330\351
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
 \305\346\173\277\006\320\117\103\355\304\172\145\212\373\153\031
 END
 CKA_ISSUER MULTILINE_OCTAL