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

Fix for 169038 - correct entries for TC TrustCenter roots

This commit is contained in:
jpierre%netscape.com 2002-10-12 01:04:53 +00:00
Родитель 66672a3266
Коммит 634583edc6
1 изменённых файлов: 62 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -32,7 +32,7 @@
* GPL. * GPL.
*/ */
#ifdef DEBUG #ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.22 $ $Date: 2002/09/20 04:26:54 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.22 $ $Date: 2002/09/20 04:26:54 $ $Name: $"; static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.23 $ $Date: 2002/10/12 01:04:53 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.23 $ $Date: 2002/10/12 01:04:53 $ $Name: $";
#endif /* DEBUG */ #endif /* DEBUG */
#ifndef BUILTINS_H #ifndef BUILTINS_H
@ -450,13 +450,13 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_132 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE 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_133 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_133 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING 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
}; };
static const CK_ATTRIBUTE_TYPE nss_builtins_types_134 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_134 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE 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_135 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_135 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING 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
}; };
#ifdef DEBUG #ifdef DEBUG
static const NSSItem nss_builtins_items_0 [] = { static const NSSItem nss_builtins_items_0 [] = {
@ -466,7 +466,7 @@ static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)"CVS ID", (PRUint32)7 }, { (void *)"CVS ID", (PRUint32)7 },
{ (void *)"NSS", (PRUint32)4 }, { (void *)"NSS", (PRUint32)4 },
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.22 $ $Date: 2002/09/20 04:26:54 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.22 $ $Date: 2002/09/20 04:26:54 $ $Name: $", (PRUint32)179 } { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.23 $ $Date: 2002/10/12 01:04:53 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.23 $ $Date: 2002/10/12 01:04:53 $ $Name: $", (PRUint32)179 }
}; };
#endif /* DEBUG */ #endif /* DEBUG */
static const NSSItem nss_builtins_items_1 [] = { static const NSSItem nss_builtins_items_1 [] = {
@ -8247,6 +8247,21 @@ static const NSSItem nss_builtins_items_133 [] = {
, (PRUint32)20 }, , (PRUint32)20 },
{ (void *)"\270\026\063\114\114\114\362\330\323\115\006\264\246\133\100\003" { (void *)"\270\026\063\114\114\114\362\330\323\115\006\264\246\133\100\003"
, (PRUint32)16 }, , (PRUint32)16 },
{ (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
"\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165"
"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
"\062\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
{ (void *)"\003\352"
, (PRUint32)2 },
{ (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 *)&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) }
@ -8267,7 +8282,7 @@ static const NSSItem nss_builtins_items_134 [] = {
"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110" "\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162" "\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040" "\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
"\062\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015" "\063\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145" "\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145" "\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 }, , (PRUint32)191 },
@ -8281,14 +8296,14 @@ static const NSSItem nss_builtins_items_134 [] = {
"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110" "\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162" "\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040" "\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
"\062\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015" "\063\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145" "\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145" "\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 }, , (PRUint32)191 },
{ (void *)"\003\352" { (void *)"\003\353"
, (PRUint32)2 }, , (PRUint32)2 },
{ (void *)"\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003" { (void *)"\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003"
"\352\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000" "\353\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000"
"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105" "\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
"\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165" "\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165"
"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155" "\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
@ -8298,7 +8313,7 @@ static const NSSItem nss_builtins_items_134 [] = {
"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110" "\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162" "\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040" "\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
"\062\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015" "\063\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145" "\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060" "\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060"
"\036\027\015\071\070\060\063\060\071\061\061\065\071\065\071\132" "\036\027\015\071\070\060\063\060\071\061\061\065\071\065\071\132"
@ -8311,20 +8326,20 @@ static const NSSItem nss_builtins_items_134 [] = {
"\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164" "\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164"
"\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061" "\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061"
"\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165" "\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165"
"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\062" "\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\063"
"\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001" "\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001"
"\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100" "\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100"
"\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060\201" "\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060\201"
"\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000" "\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\332\070\350\355\062" "\003\201\215\000\060\201\211\002\201\201\000\266\264\301\065\005"
"\000\051\161\203\001\015\277\214\001\334\332\306\255\071\244\251" "\056\015\215\354\240\100\152\034\016\047\246\120\222\153\120\033"
"\212\057\325\213\134\150\137\120\306\142\365\146\275\312\221\042" "\007\336\056\347\166\314\340\332\374\204\250\136\214\143\152\053"
"\354\252\035\121\327\075\263\121\262\203\116\135\313\111\260\360" "\115\331\116\002\166\021\301\013\362\215\171\312\000\266\361\260"
"\114\125\345\153\055\307\205\013\060\034\222\116\202\324\312\002" "\016\327\373\244\027\075\257\253\151\172\226\047\277\257\063\241"
"\355\367\157\276\334\340\343\024\270\005\123\362\232\364\126\213" "\232\052\131\252\304\265\067\010\362\022\245\061\266\103\365\062"
"\132\236\205\223\321\264\202\126\256\115\273\250\113\127\026\274" "\226\161\050\050\253\215\050\206\337\273\356\343\014\175\060\326"
"\376\370\130\236\370\051\215\260\173\315\170\311\117\254\213\147" "\303\122\253\217\135\047\234\153\300\243\347\005\153\127\111\104"
"\014\361\234\373\374\127\233\127\134\117\015\002\003\001\000\001" "\263\156\352\144\317\322\216\172\120\167\167\002\003\001\000\001"
"\243\153\060\151\060\017\006\003\125\035\023\001\001\377\004\005" "\243\153\060\151\060\017\006\003\125\035\023\001\001\377\004\005"
"\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004" "\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004"
"\004\003\002\001\206\060\063\006\011\140\206\110\001\206\370\102" "\004\003\002\001\206\060\063\006\011\140\206\110\001\206\370\102"
@ -8333,14 +8348,14 @@ static const NSSItem nss_builtins_items_134 [] = {
"\147\165\151\144\145\154\151\156\145\163\060\021\006\011\140\206" "\147\165\151\144\145\154\151\156\145\163\060\021\006\011\140\206"
"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\015\006" "\110\001\206\370\102\001\001\004\004\003\002\000\007\060\015\006"
"\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201\000" "\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201\000"
"\204\122\373\050\337\377\037\165\001\274\001\276\004\126\227\152" "\026\075\306\315\301\273\205\161\205\106\237\076\040\217\121\050"
"\164\102\044\061\203\371\106\261\006\212\211\317\226\054\063\277" "\231\354\055\105\041\143\043\133\004\273\114\220\270\210\222\004"
"\214\265\137\172\162\241\205\006\316\206\370\005\216\350\371\045" "\115\275\175\001\243\077\366\354\316\361\336\376\175\345\341\076"
"\312\332\203\214\006\254\353\066\155\205\221\064\004\066\364\102" "\273\306\253\136\013\335\075\226\304\313\251\324\371\046\346\006"
"\360\370\171\056\012\110\134\253\314\121\117\170\166\240\331\254" "\116\236\014\245\172\272\156\303\174\202\031\321\307\261\261\303"
"\031\275\052\321\151\004\050\221\312\066\020\047\200\127\133\322" "\333\015\216\233\100\174\067\013\361\135\350\375\037\220\210\245"
"\134\365\302\133\253\144\201\143\164\121\364\227\277\315\022\050" "\016\116\067\144\041\250\116\215\264\237\361\336\110\255\325\126"
"\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144" "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
, (PRUint32)864 } , (PRUint32)864 }
}; };
static const NSSItem nss_builtins_items_135 [] = { static const NSSItem nss_builtins_items_135 [] = {
@ -8349,11 +8364,26 @@ static const NSSItem nss_builtins_items_135 [] = {
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)"TC TrustCenter, Germany, Class 3 CA", (PRUint32)36 }, { (void *)"TC TrustCenter, Germany, Class 3 CA", (PRUint32)36 },
{ (void *)"\203\216\060\367\177\335\024\252\070\136\321\105\000\234\016\042" { (void *)"\237\307\226\350\370\122\117\206\072\341\111\155\070\022\102\020"
"\066\111\117\252" "\137\033\170\365"
, (PRUint32)20 }, , (PRUint32)20 },
{ (void *)"\270\026\063\114\114\114\362\330\323\115\006\264\246\133\100\003" { (void *)"\137\224\112\163\042\270\367\321\061\354\131\071\367\216\376\156"
, (PRUint32)16 }, , (PRUint32)16 },
{ (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
"\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165"
"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
"\063\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
{ (void *)"\003\353"
, (PRUint32)2 },
{ (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 *)&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) }
@ -8496,9 +8526,9 @@ nss_builtins_data[] = {
{ 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} }, { 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} },
{ 12, nss_builtins_types_131, nss_builtins_items_131, {NULL} }, { 12, nss_builtins_types_131, nss_builtins_items_131, {NULL} },
{ 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} }, { 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} },
{ 10, nss_builtins_types_133, nss_builtins_items_133, {NULL} }, { 12, nss_builtins_types_133, nss_builtins_items_133, {NULL} },
{ 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} }, { 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} },
{ 10, nss_builtins_types_135, nss_builtins_items_135, {NULL} } { 12, nss_builtins_types_135, nss_builtins_items_135, {NULL} }
}; };
PR_IMPLEMENT_DATA(const PRUint32) PR_IMPLEMENT_DATA(const PRUint32)
#ifdef DEBUG #ifdef DEBUG