mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bugzilla bug 275576: added "Root" to the nickname for the "Global 

Chambersign" root. r=nelsonb.
Modified files: certdata.txt certdata.c
This commit is contained in:
wtchang%redhat.com 2005-04-18 16:08:10 +00:00
Родитель 71913d7675
Коммит 3395848fa4
2 изменённых файлов: 14 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
security/nss/lib/ckfw/builtins/certdata.c
Просмотреть файл

@ -35,22 +35,22 @@
*
* ***** END LICENSE BLOCK ***** */
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.35 $ $Date: 2005/04/14 16:45:04 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.35 $ $Date: 2005/04/14 16:45:04 $";
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $";
#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
@ -631,7 +631,7 @@ static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)"CVS ID", (PRUint32)7 },
{ (void *)"NSS", (PRUint32)4 },
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.35 $ $Date: 2005/04/14 16:45:04 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.35 $ $Date: 2005/04/14 16:45:04 $", (PRUint32)160 }
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $", (PRUint32)160 }
};
#endif /* DEBUG */
static const NSSItem nss_builtins_items_1 [] = {
@ -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 },

10
security/nss/lib/ckfw/builtins/certdata.txt
Просмотреть файл

@ -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.36 $ $Date: 2005/04/14 16:45:04 $"
CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.37 $ $Date: 2005/04/18 16:08:07 $"
#
# 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