From 8d3882178a9fdbef70ea8493f9af50227bb5b31d Mon Sep 17 00:00:00 2001 From: "relyea%netscape.com" Date: Fri, 19 Jan 2001 07:47:57 +0000 Subject: [PATCH] Fix Serial number searches by removing the DER tag. Bug 65895. --- security/nss/lib/ckfw/builtins/certdata.c | 183 ++++++++++---------- security/nss/lib/ckfw/builtins/certdata.txt | 103 +++++------ 2 files changed, 134 insertions(+), 152 deletions(-) diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 71306e2b36a8..d00d1002396f 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -32,7 +32,7 @@ * GPL. */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.2 $ $Date: 2001/01/03 19:49:15 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.2 $ $Date: 2001/01/03 19:49:15 $ $Name: $"; +static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.3 $ $Date: 2001/01/19 07:47:57 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.3 $ $Date: 2001/01/19 07:47:57 $ $Name: $"; #endif /* DEBUG */ #ifndef BUILTINS_H @@ -298,7 +298,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.2 $ $Date: 2001/01/03 19:49:15 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.2 $ $Date: 2001/01/03 19:49:15 $ $Name: $", (PRUint32)178 } + { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.3 $ $Date: 2001/01/19 07:47:57 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.3 $ $Date: 2001/01/19 07:47:57 $ $Name: $", (PRUint32)178 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { @@ -332,9 +332,8 @@ static const NSSItem nss_builtins_items_2 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136" -"\335\300" -, (PRUint32)18 }, + { (void *)"\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300" +, (PRUint32)16 }, { (void *)"\060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105" "\376\136\127\157\074\230\031\136\335\300\060\015\006\011\052\206" "\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006" @@ -412,8 +411,8 @@ static const NSSItem nss_builtins_items_4 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\005\002\246\000\000\001" -, (PRUint32)7 }, + { (void *)"\002\246\000\000\001" +, (PRUint32)5 }, { (void *)"\060\202\002\061\060\202\001\232\002\005\002\246\000\000\001\060" "\015\006\011\052\206\110\206\367\015\001\001\002\005\000\060\137" "\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060" @@ -503,8 +502,8 @@ static const NSSItem nss_builtins_items_6 [] = { "\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141" "\163\151\143\100\164\150\141\167\164\145\056\143\157\155" , (PRUint32)206 }, - { (void *)"\002\001\000" -, (PRUint32)3 }, + { (void *)"\000" +, (PRUint32)1 }, { (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101\061" @@ -611,8 +610,8 @@ static const NSSItem nss_builtins_items_8 [] = { "\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143" "\157\155" , (PRUint32)210 }, - { (void *)"\002\001\000" -, (PRUint32)3 }, + { (void *)"\000" +, (PRUint32)1 }, { (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101\061" @@ -719,8 +718,8 @@ static const NSSItem nss_builtins_items_10 [] = { "\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145" "\056\143\157\155" , (PRUint32)212 }, - { (void *)"\002\001\000" -, (PRUint32)3 }, + { (void *)"\000" +, (PRUint32)1 }, { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061" @@ -826,8 +825,8 @@ static const NSSItem nss_builtins_items_12 [] = { "\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141" "\167\164\145\056\143\157\155" , (PRUint32)199 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101\061" @@ -933,8 +932,8 @@ static const NSSItem nss_builtins_items_14 [] = { "\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157" "\155" , (PRUint32)209 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101\061" @@ -1037,8 +1036,8 @@ static const NSSItem nss_builtins_items_16 [] = { "\206\110\206\367\015\001\011\001\026\024\167\145\142\155\141\163" "\164\145\162\100\142\145\154\163\151\147\156\056\142\145" , (PRUint32)190 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\003\003\060\202\002\154\240\003\002\001\002\002\001\001" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\273\061\013\060\011\006\003\125\004\006\023\002\102\105\061" @@ -1139,8 +1138,8 @@ static const NSSItem nss_builtins_items_18 [] = { "\026\024\167\145\142\155\141\163\164\145\162\100\142\145\154\163" "\151\147\156\056\142\145" , (PRUint32)182 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\002\363\060\202\002\134\240\003\002\001\002\002\001\001" "\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" "\201\263\061\013\060\011\006\003\125\004\006\023\002\102\105\061" @@ -1240,8 +1239,8 @@ static const NSSItem nss_builtins_items_20 [] = { "\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 *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\001" "\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\061" @@ -1361,8 +1360,8 @@ static const NSSItem nss_builtins_items_22 [] = { "\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 *)"\002\001\002" -, (PRUint32)3 }, + { (void *)"\002" +, (PRUint32)1 }, { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\002" "\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\061" @@ -1482,8 +1481,8 @@ static const NSSItem nss_builtins_items_24 [] = { "\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 *)"\002\001\003" -, (PRUint32)3 }, + { (void *)"\003" +, (PRUint32)1 }, { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\003" "\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\061" @@ -1603,8 +1602,8 @@ static const NSSItem nss_builtins_items_26 [] = { "\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 *)"\002\001\004" -, (PRUint32)3 }, + { (void *)"\004" +, (PRUint32)1 }, { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\004" "\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\061" @@ -1724,8 +1723,8 @@ static const NSSItem nss_builtins_items_28 [] = { "\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 *)"\002\001\005" -, (PRUint32)3 }, + { (void *)"\005" +, (PRUint32)1 }, { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\005" "\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\061" @@ -1835,9 +1834,9 @@ static const NSSItem nss_builtins_items_30 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263" -"\162\252\125" -, (PRUint32)19 }, + { (void *)"\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252" +"\125" +, (PRUint32)17 }, { (void *)"\060\202\002\075\060\202\001\246\002\021\000\315\272\177\126\360" "\337\344\274\124\376\042\254\263\162\252\125\060\015\006\011\052" "\206\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011" @@ -1916,9 +1915,9 @@ static const NSSItem nss_builtins_items_32 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105" -"\276\013" -, (PRUint32)18 }, + { (void *)"\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276" +"\013" +, (PRUint32)16 }, { (void *)"\060\202\002\074\060\202\001\245\002\020\055\033\374\112\027\215" "\243\221\353\347\377\365\213\105\276\013\060\015\006\011\052\206" "\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006" @@ -1996,9 +1995,8 @@ static const NSSItem nss_builtins_items_34 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314" -"\272\277" -, (PRUint32)18 }, + { (void *)"\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277" +, (PRUint32)16 }, { (void *)"\060\202\002\074\060\202\001\245\002\020\160\272\344\035\020\331" "\051\064\266\070\312\173\003\314\272\277\060\015\006\011\052\206" "\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006" @@ -2088,9 +2086,8 @@ static const NSSItem nss_builtins_items_36 [] = { "\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" "\167\157\162\153" , (PRUint32)196 }, - { (void *)"\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211" -"\221\222" -, (PRUint32)18 }, + { (void *)"\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222" +, (PRUint32)16 }, { (void *)"\060\202\003\002\060\202\002\153\002\020\114\307\352\252\230\076" "\161\323\223\020\370\075\072\211\221\222\060\015\006\011\052\206" "\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011" @@ -2193,9 +2190,9 @@ static const NSSItem nss_builtins_items_38 [] = { "\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" "\167\157\162\153" , (PRUint32)196 }, - { (void *)"\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160" -"\154\212\257" -, (PRUint32)19 }, + { (void *)"\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212" +"\257" +, (PRUint32)17 }, { (void *)"\060\202\003\003\060\202\002\154\002\021\000\271\057\140\314\210" "\237\241\172\106\011\270\133\160\154\212\257\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060" @@ -2298,9 +2295,8 @@ static const NSSItem nss_builtins_items_40 [] = { "\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" "\167\157\162\153" , (PRUint32)196 }, - { (void *)"\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211" -"\064\306" -, (PRUint32)18 }, + { (void *)"\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306" +, (PRUint32)16 }, { (void *)"\060\202\003\002\060\202\002\153\002\020\175\331\376\007\317\250" "\036\267\020\171\147\373\247\211\064\306\060\015\006\011\052\206" "\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011" @@ -2403,9 +2399,8 @@ static const NSSItem nss_builtins_items_42 [] = { "\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164" "\167\157\162\153" , (PRUint32)196 }, - { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" -"\045\370" -, (PRUint32)18 }, + { (void *)"\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370" +, (PRUint32)16 }, { (void *)"\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365" "\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206" "\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011" @@ -2494,8 +2489,8 @@ static const NSSItem nss_builtins_items_44 [] = { "\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147" "\156\040\122\157\157\164\040\103\101" , (PRUint32)89 }, - { (void *)"\002\013\002\000\000\000\000\000\326\170\267\224\005" -, (PRUint32)13 }, + { (void *)"\002\000\000\000\000\000\326\170\267\224\005" +, (PRUint32)11 }, { (void *)"\060\202\003\165\060\202\002\135\240\003\002\001\002\002\013\002" "\000\000\000\000\000\326\170\267\224\005\060\015\006\011\052\206" "\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006" @@ -2592,8 +2587,8 @@ static const NSSItem nss_builtins_items_46 [] = { "\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147" "\156\040\122\157\157\164\040\103\101" , (PRUint32)89 }, - { (void *)"\002\013\002\000\000\000\000\000\326\170\271\321\257" -, (PRUint32)13 }, + { (void *)"\002\000\000\000\000\000\326\170\271\321\257" +, (PRUint32)11 }, { (void *)"\060\202\003\236\060\202\002\206\240\003\002\001\002\002\013\002" "\000\000\000\000\000\326\170\271\321\257\060\015\006\011\052\206" "\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006" @@ -2693,8 +2688,8 @@ static const NSSItem nss_builtins_items_48 [] = { "\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147" "\156\040\122\157\157\164\040\103\101" , (PRUint32)89 }, - { (void *)"\002\013\002\000\000\000\000\000\326\170\270\067\317" -, (PRUint32)13 }, + { (void *)"\002\000\000\000\000\000\326\170\270\067\317" +, (PRUint32)11 }, { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002" "\000\000\000\000\000\326\170\270\067\317\060\015\006\011\052\206" "\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006" @@ -2794,8 +2789,8 @@ static const NSSItem nss_builtins_items_50 [] = { "\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147" "\156\040\122\157\157\164\040\103\101" , (PRUint32)89 }, - { (void *)"\002\013\002\000\000\000\000\000\326\170\270\215\215" -, (PRUint32)13 }, + { (void *)"\002\000\000\000\000\000\326\170\270\215\215" +, (PRUint32)11 }, { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002" "\000\000\000\000\000\326\170\270\215\215\060\015\006\011\052\206" "\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006" @@ -2895,8 +2890,8 @@ static const NSSItem nss_builtins_items_52 [] = { "\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147" "\156\040\122\157\157\164\040\103\101" , (PRUint32)89 }, - { (void *)"\002\013\002\000\000\000\000\000\326\170\270\326\303" -, (PRUint32)13 }, + { (void *)"\002\000\000\000\000\000\326\170\270\326\303" +, (PRUint32)11 }, { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002" "\000\000\000\000\000\326\170\270\326\303\060\015\006\011\052\206" "\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006" @@ -3007,8 +3002,8 @@ static const NSSItem nss_builtins_items_54 [] = { "\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146" "\157\100\166\141\154\151\143\145\162\164\056\143\157\155" , (PRUint32)190 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060" "\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164" @@ -3107,8 +3102,8 @@ static const NSSItem nss_builtins_items_56 [] = { "\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146" "\157\100\166\141\154\151\143\145\162\164\056\143\157\155" , (PRUint32)190 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060" "\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164" @@ -3207,8 +3202,8 @@ static const NSSItem nss_builtins_items_58 [] = { "\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146" "\157\100\166\141\154\151\143\145\162\164\056\143\157\155" , (PRUint32)190 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060" "\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164" @@ -3295,8 +3290,8 @@ static const NSSItem nss_builtins_items_60 [] = { "\030\124\150\141\167\164\145\040\125\156\151\166\145\162\163\141" "\154\040\103\101\040\122\157\157\164" , (PRUint32)89 }, - { (void *)"\002\001\000" -, (PRUint32)3 }, + { (void *)"\000" +, (PRUint32)1 }, { (void *)"\060\202\021\042\060\202\011\012\002\001\000\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\127\061\017\060\015" "\006\003\125\004\012\023\006\124\150\141\167\164\145\061\041\060" @@ -3625,9 +3620,9 @@ static const NSSItem nss_builtins_items_62 [] = { "\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" "\165\164\150\157\162\151\164\171\040\055\040\107\063" , (PRUint32)205 }, - { (void *)"\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110" -"\316\261\244" -, (PRUint32)19 }, + { (void *)"\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261" +"\244" +, (PRUint32)17 }, { (void *)"\060\202\004\032\060\202\003\002\002\021\000\213\133\165\126\204" "\124\205\013\000\317\257\070\110\316\261\244\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060" @@ -3747,9 +3742,8 @@ static const NSSItem nss_builtins_items_64 [] = { "\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" "\165\164\150\157\162\151\164\171\040\055\040\107\063" , (PRUint32)205 }, - { (void *)"\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120" -"\133\172" -, (PRUint32)18 }, + { (void *)"\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172" +, (PRUint32)16 }, { (void *)"\060\202\004\031\060\202\003\001\002\020\141\160\313\111\214\137" "\230\105\051\347\260\246\331\120\133\172\060\015\006\011\052\206" "\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060\011" @@ -3869,9 +3863,9 @@ static const NSSItem nss_builtins_items_66 [] = { "\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" "\165\164\150\157\162\151\164\171\040\055\040\107\063" , (PRUint32)205 }, - { (void *)"\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161" -"\051\357\127" -, (PRUint32)19 }, + { (void *)"\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357" +"\127" +, (PRUint32)17 }, { (void *)"\060\202\004\032\060\202\003\002\002\021\000\233\176\006\111\243" "\076\142\271\325\356\220\110\161\051\357\127\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060" @@ -3991,9 +3985,9 @@ static const NSSItem nss_builtins_items_68 [] = { "\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101" "\165\164\150\157\162\151\164\171\040\055\040\107\063" , (PRUint32)205 }, - { (void *)"\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057" -"\224\136\327" -, (PRUint32)19 }, + { (void *)"\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136" +"\327" +, (PRUint32)17 }, { (void *)"\060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156" "\165\152\001\317\304\174\314\057\224\136\327\060\015\006\011\052" "\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060" @@ -4111,8 +4105,8 @@ static const NSSItem nss_builtins_items_70 [] = { "\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162" "\164\056\143\157\155" , (PRUint32)181 }, - { (void *)"\002\001\001" -, (PRUint32)3 }, + { (void *)"\001" +, (PRUint32)1 }, { (void *)"\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001" "\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" "\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154" @@ -4211,9 +4205,8 @@ static const NSSItem nss_builtins_items_72 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177" -"\047\040" -, (PRUint32)18 }, + { (void *)"\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040" +, (PRUint32)16 }, { (void *)"\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\053" "\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040\060" "\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" @@ -4318,9 +4311,8 @@ static const NSSItem nss_builtins_items_74 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171" -"\212\247" -, (PRUint32)18 }, + { (void *)"\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247" +, (PRUint32)16 }, { (void *)"\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\011" "\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247\060" "\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" @@ -4425,9 +4417,8 @@ static const NSSItem nss_builtins_items_76 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154" -"\301\204" -, (PRUint32)18 }, + { (void *)"\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204" +, (PRUint32)16 }, { (void *)"\060\202\003\242\060\202\003\013\240\003\002\001\002\002\020\056" "\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204\060" "\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" @@ -4532,9 +4523,9 @@ static const NSSItem nss_builtins_items_78 [] = { "\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164" "\171" , (PRUint32)97 }, - { (void *)"\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127" -"\341\117\336" -, (PRUint32)19 }, + { (void *)"\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117" +"\336" +, (PRUint32)17 }, { (void *)"\060\202\003\237\060\202\003\014\240\003\002\001\002\002\021\000" "\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117\336" "\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060" diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index bbab0ac711b5..05c1c4ad5ece 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.5 $ $Date: 2000/11/08 22:07:51 $ $Name: $" +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.6 $ $Date: 2001/01/19 07:47:57 $ $Name: $" # # certdata.txt @@ -126,8 +126,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136 -\335\300 +\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300 END CKA_VALUE MULTILINE_OCTAL \060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105 @@ -214,7 +213,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\005\002\246\000\000\001 +\002\246\000\000\001 END CKA_VALUE MULTILINE_OCTAL \060\202\002\061\060\202\001\232\002\005\002\246\000\000\001\060 @@ -313,7 +312,7 @@ CKA_ISSUER MULTILINE_OCTAL \163\151\143\100\164\150\141\167\164\145\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 +\000 END CKA_VALUE MULTILINE_OCTAL \060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000 @@ -429,7 +428,7 @@ CKA_ISSUER MULTILINE_OCTAL \157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 +\000 END CKA_VALUE MULTILINE_OCTAL \060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000 @@ -545,7 +544,7 @@ CKA_ISSUER MULTILINE_OCTAL \056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 +\000 END CKA_VALUE MULTILINE_OCTAL \060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000 @@ -660,7 +659,7 @@ CKA_ISSUER MULTILINE_OCTAL \167\164\145\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001 @@ -775,7 +774,7 @@ CKA_ISSUER MULTILINE_OCTAL \155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001 @@ -887,7 +886,7 @@ CKA_ISSUER MULTILINE_OCTAL \164\145\162\100\142\145\154\163\151\147\156\056\142\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\003\003\060\202\002\154\240\003\002\001\002\002\001\001 @@ -997,7 +996,7 @@ CKA_ISSUER MULTILINE_OCTAL \151\147\156\056\142\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\002\363\060\202\002\134\240\003\002\001\002\002\001\001 @@ -1106,7 +1105,7 @@ CKA_ISSUER MULTILINE_OCTAL \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\001 @@ -1235,7 +1234,7 @@ CKA_ISSUER MULTILINE_OCTAL \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\002 +\002 END CKA_VALUE MULTILINE_OCTAL \060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\002 @@ -1364,7 +1363,7 @@ CKA_ISSUER MULTILINE_OCTAL \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\003 +\003 END CKA_VALUE MULTILINE_OCTAL \060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\003 @@ -1493,7 +1492,7 @@ CKA_ISSUER MULTILINE_OCTAL \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\004 +\004 END CKA_VALUE MULTILINE_OCTAL \060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\004 @@ -1622,7 +1621,7 @@ CKA_ISSUER MULTILINE_OCTAL \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\005 +\005 END CKA_VALUE MULTILINE_OCTAL \060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\005 @@ -1741,8 +1740,8 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263 -\162\252\125 +\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252 +\125 END CKA_VALUE MULTILINE_OCTAL \060\202\002\075\060\202\001\246\002\021\000\315\272\177\126\360 @@ -1830,8 +1829,8 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105 -\276\013 +\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276 +\013 END CKA_VALUE MULTILINE_OCTAL \060\202\002\074\060\202\001\245\002\020\055\033\374\112\027\215 @@ -1918,8 +1917,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314 -\272\277 +\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277 END CKA_VALUE MULTILINE_OCTAL \060\202\002\074\060\202\001\245\002\020\160\272\344\035\020\331 @@ -2018,8 +2016,7 @@ CKA_ISSUER MULTILINE_OCTAL \167\157\162\153 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211 -\221\222 +\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222 END CKA_VALUE MULTILINE_OCTAL \060\202\003\002\060\202\002\153\002\020\114\307\352\252\230\076 @@ -2131,8 +2128,8 @@ CKA_ISSUER MULTILINE_OCTAL \167\157\162\153 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160 -\154\212\257 +\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212 +\257 END CKA_VALUE MULTILINE_OCTAL \060\202\003\003\060\202\002\154\002\021\000\271\057\140\314\210 @@ -2244,8 +2241,7 @@ CKA_ISSUER MULTILINE_OCTAL \167\157\162\153 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211 -\064\306 +\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306 END CKA_VALUE MULTILINE_OCTAL \060\202\003\002\060\202\002\153\002\020\175\331\376\007\317\250 @@ -2357,8 +2353,7 @@ CKA_ISSUER MULTILINE_OCTAL \167\157\162\153 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 -\045\370 +\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370 END CKA_VALUE MULTILINE_OCTAL \060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365 @@ -2456,7 +2451,7 @@ CKA_ISSUER MULTILINE_OCTAL \156\040\122\157\157\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\002\000\000\000\000\000\326\170\267\224\005 +\002\000\000\000\000\000\326\170\267\224\005 END CKA_VALUE MULTILINE_OCTAL \060\202\003\165\060\202\002\135\240\003\002\001\002\002\013\002 @@ -2562,7 +2557,7 @@ CKA_ISSUER MULTILINE_OCTAL \156\040\122\157\157\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\002\000\000\000\000\000\326\170\271\321\257 +\002\000\000\000\000\000\326\170\271\321\257 END CKA_VALUE MULTILINE_OCTAL \060\202\003\236\060\202\002\206\240\003\002\001\002\002\013\002 @@ -2671,7 +2666,7 @@ CKA_ISSUER MULTILINE_OCTAL \156\040\122\157\157\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\002\000\000\000\000\000\326\170\270\067\317 +\002\000\000\000\000\000\326\170\270\067\317 END CKA_VALUE MULTILINE_OCTAL \060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002 @@ -2780,7 +2775,7 @@ CKA_ISSUER MULTILINE_OCTAL \156\040\122\157\157\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\002\000\000\000\000\000\326\170\270\215\215 +\002\000\000\000\000\000\326\170\270\215\215 END CKA_VALUE MULTILINE_OCTAL \060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002 @@ -2889,7 +2884,7 @@ CKA_ISSUER MULTILINE_OCTAL \156\040\122\157\157\164\040\103\101 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\013\002\000\000\000\000\000\326\170\270\326\303 +\002\000\000\000\000\000\326\170\270\326\303 END CKA_VALUE MULTILINE_OCTAL \060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002 @@ -3009,7 +3004,7 @@ CKA_ISSUER MULTILINE_OCTAL \157\100\166\141\154\151\143\145\162\164\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052 @@ -3117,7 +3112,7 @@ CKA_ISSUER MULTILINE_OCTAL \157\100\166\141\154\151\143\145\162\164\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052 @@ -3225,7 +3220,7 @@ CKA_ISSUER MULTILINE_OCTAL \157\100\166\141\154\151\143\145\162\164\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052 @@ -3321,7 +3316,7 @@ CKA_ISSUER MULTILINE_OCTAL \154\040\103\101\040\122\157\157\164 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 +\000 END CKA_VALUE MULTILINE_OCTAL \060\202\021\042\060\202\011\012\002\001\000\060\015\006\011\052 @@ -3659,8 +3654,8 @@ CKA_ISSUER MULTILINE_OCTAL \165\164\150\157\162\151\164\171\040\055\040\107\063 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110 -\316\261\244 +\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261 +\244 END CKA_VALUE MULTILINE_OCTAL \060\202\004\032\060\202\003\002\002\021\000\213\133\165\126\204 @@ -3789,8 +3784,7 @@ CKA_ISSUER MULTILINE_OCTAL \165\164\150\157\162\151\164\171\040\055\040\107\063 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120 -\133\172 +\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172 END CKA_VALUE MULTILINE_OCTAL \060\202\004\031\060\202\003\001\002\020\141\160\313\111\214\137 @@ -3919,8 +3913,8 @@ CKA_ISSUER MULTILINE_OCTAL \165\164\150\157\162\151\164\171\040\055\040\107\063 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161 -\051\357\127 +\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357 +\127 END CKA_VALUE MULTILINE_OCTAL \060\202\004\032\060\202\003\002\002\021\000\233\176\006\111\243 @@ -4049,8 +4043,8 @@ CKA_ISSUER MULTILINE_OCTAL \165\164\150\157\162\151\164\171\040\055\040\107\063 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057 -\224\136\327 +\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136 +\327 END CKA_VALUE MULTILINE_OCTAL \060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156 @@ -4177,7 +4171,7 @@ CKA_ISSUER MULTILINE_OCTAL \164\056\143\157\155 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_VALUE MULTILINE_OCTAL \060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001 @@ -4285,8 +4279,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177 -\047\040 +\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040 END CKA_VALUE MULTILINE_OCTAL \060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\053 @@ -4400,8 +4393,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171 -\212\247 +\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247 END CKA_VALUE MULTILINE_OCTAL \060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\011 @@ -4515,8 +4507,7 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154 -\301\204 +\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204 END CKA_VALUE MULTILINE_OCTAL \060\202\003\242\060\202\003\013\240\003\002\001\002\002\020\056 @@ -4630,8 +4621,8 @@ CKA_ISSUER MULTILINE_OCTAL \171 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127 -\341\117\336 +\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117 +\336 END CKA_VALUE MULTILINE_OCTAL \060\202\003\237\060\202\003\014\240\003\002\001\002\002\021\000