summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-04-18 16:08:10 +0000
committerwtchang%redhat.com <devnull@localhost>2005-04-18 16:08:10 +0000
commit4e3cee584d766e1b2108b63637c4ed1794ed6092 (patch)
tree6e9706ed651265d83c910d2b3ee5c96035b41be4
parent872e9043e1471bf5957e3dcedcc7b14d308b4808 (diff)
downloadnss-hg-4e3cee584d766e1b2108b63637c4ed1794ed6092.tar.gz
Bugzilla bug 275576: added "Root" to the nickname for the "Global
Chambersign" root. r=nelsonb. Modified files: certdata.txt certdata.c
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.c14
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.txt8
2 files changed, 11 insertions, 11 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index e4d0f30be..ca3d68970 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_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_certificate = CKO_CERTIFICATE;
static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-static const CK_OBJECT_CLASS cko_data = CKO_DATA;
+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_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
@@ -11699,7 +11699,7 @@ static const NSSItem nss_builtins_items_176 [] = {
{ (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"
@@ -11806,7 +11806,7 @@ static const NSSItem nss_builtins_items_177 [] = {
{ (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 },
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 014f0ee31..8a8b1c5b6 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -12026,13 +12026,13 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
-# Certificate "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"
+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
@@ -12138,12 +12138,12 @@ CKA_VALUE MULTILINE_OCTAL
\166\135\165\220\032\365\046\217\360
END
-# Trust for Certificate "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"
+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