]>
Commit | Line | Data |
---|---|---|
94bd60cc SS |
1 | diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.c |
2 | --- ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 2011-11-03 16:29:17.081000000 -0700 | |
3 | +++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-11-03 08:11:57.000000000 -0700 | |
4 | @@ -35,7 +35,7 @@ | |
5 | * | |
6 | * ***** END LICENSE BLOCK ***** */ | |
7 | #ifdef DEBUG | |
8 | -static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $"; | |
9 | +static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $"; | |
10 | #endif /* DEBUG */ | |
11 | ||
12 | #ifndef BUILTINS_H | |
13 | @@ -1075,6 +1075,18 @@ static const CK_ATTRIBUTE_TYPE nss_built | |
14 | static const CK_ATTRIBUTE_TYPE nss_builtins_types_339 [] = { | |
15 | 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, CKA_TRUST_STEP_UP_APPROVED | |
16 | }; | |
17 | +static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = { | |
18 | + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE | |
19 | +}; | |
20 | +static const CK_ATTRIBUTE_TYPE nss_builtins_types_341 [] = { | |
21 | + 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, CKA_TRUST_STEP_UP_APPROVED | |
22 | +}; | |
23 | +static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 [] = { | |
24 | + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE | |
25 | +}; | |
26 | +static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = { | |
27 | + 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, CKA_TRUST_STEP_UP_APPROVED | |
28 | +}; | |
29 | #ifdef DEBUG | |
30 | static const NSSItem nss_builtins_items_0 [] = { | |
31 | { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, | |
32 | @@ -1083,7 +1095,7 @@ static const NSSItem nss_builtins_items_ | |
33 | { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
34 | { (void *)"CVS ID", (PRUint32)7 }, | |
35 | { (void *)"NSS", (PRUint32)4 }, | |
36 | - { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $", (PRUint32)160 } | |
37 | + { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $", (PRUint32)160 } | |
38 | }; | |
39 | #endif /* DEBUG */ | |
40 | static const NSSItem nss_builtins_items_1 [] = { | |
41 | @@ -22600,6 +22612,266 @@ static const NSSItem nss_builtins_items_ | |
42 | { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
43 | { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } | |
44 | }; | |
45 | +static const NSSItem nss_builtins_items_340 [] = { | |
46 | + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, | |
47 | + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, | |
48 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
49 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
50 | + { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 }, | |
51 | + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, | |
52 | + { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061" | |
53 | +"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145" | |
54 | +"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017" | |
55 | +"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061" | |
56 | +"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151" | |
57 | +"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156" | |
58 | +"\162\151\143\150\051" | |
59 | +, (PRUint32)101 }, | |
60 | + { (void *)"0", (PRUint32)2 }, | |
61 | + { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" | |
62 | +"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157" | |
63 | +"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125" | |
64 | +"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165" | |
65 | +"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156" | |
66 | +"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105" | |
67 | +"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142" | |
68 | +"\141\154\040\122\157\157\164" | |
69 | +, (PRUint32)119 }, | |
70 | + { (void *)"\002\006\007\377\377\377\377\377" | |
71 | +, (PRUint32)8 }, | |
72 | + { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007" | |
73 | +"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001" | |
74 | +"\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023" | |
75 | +"\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124" | |
76 | +"\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060" | |
77 | +"\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145" | |
78 | +"\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163" | |
79 | +"\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023" | |
80 | +"\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040" | |
81 | +"\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060" | |
82 | +"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062" | |
83 | +"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060" | |
84 | +"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003" | |
85 | +"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144" | |
86 | +"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013" | |
87 | +"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003" | |
88 | +"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145" | |
89 | +"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051" | |
90 | +"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001" | |
91 | +"\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144" | |
92 | +"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376" | |
93 | +"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312" | |
94 | +"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225" | |
95 | +"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152" | |
96 | +"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173" | |
97 | +"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335" | |
98 | +"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177" | |
99 | +"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001" | |
100 | +"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035" | |
101 | +"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134" | |
102 | +"\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001" | |
103 | +"\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005" | |
104 | +"\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142" | |
105 | +"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164" | |
106 | +"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056" | |
107 | +"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003" | |
108 | +"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006" | |
109 | +"\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061" | |
110 | +"\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026" | |
111 | +"\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157" | |
112 | +"\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023" | |
113 | +"\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040" | |
114 | +"\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061" | |
115 | +"\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171" | |
116 | +"\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040" | |
117 | +"\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004" | |
118 | +"\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072" | |
119 | +"\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165" | |
120 | +"\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103" | |
121 | +"\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060" | |
122 | +"\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027" | |
123 | +"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015" | |
124 | +"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201" | |
125 | +"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005" | |
126 | +"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325" | |
127 | +"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377" | |
128 | +"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222" | |
129 | +"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113" | |
130 | +"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362" | |
131 | +"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305" | |
132 | +"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143" | |
133 | +"\131" | |
134 | +, (PRUint32)977 } | |
135 | +}; | |
136 | +static const NSSItem nss_builtins_items_341 [] = { | |
137 | + { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, | |
138 | + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, | |
139 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
140 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
141 | + { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 }, | |
142 | + { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025" | |
143 | +"\214\071\131\117" | |
144 | +, (PRUint32)20 }, | |
145 | + { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152" | |
146 | +, (PRUint32)16 }, | |
147 | + { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" | |
148 | +"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157" | |
149 | +"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125" | |
150 | +"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165" | |
151 | +"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156" | |
152 | +"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105" | |
153 | +"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142" | |
154 | +"\141\154\040\122\157\157\164" | |
155 | +, (PRUint32)119 }, | |
156 | + { (void *)"\002\006\007\377\377\377\377\377" | |
157 | +, (PRUint32)8 }, | |
158 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
159 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
160 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
161 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } | |
162 | +}; | |
163 | +static const NSSItem nss_builtins_items_342 [] = { | |
164 | + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, | |
165 | + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, | |
166 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
167 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
168 | + { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 }, | |
169 | + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, | |
170 | + { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061" | |
171 | +"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145" | |
172 | +"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017" | |
173 | +"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061" | |
174 | +"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151" | |
175 | +"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050" | |
176 | +"\105\156\162\151\143\150\051" | |
177 | +, (PRUint32)103 }, | |
178 | + { (void *)"0", (PRUint32)2 }, | |
179 | + { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" | |
180 | +"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" | |
181 | +"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" | |
182 | +"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143" | |
183 | +"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151" | |
184 | +"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006" | |
185 | +"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105" | |
186 | +"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" | |
187 | +"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" | |
188 | +"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" | |
189 | +"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" | |
190 | +"\040\050\062\060\064\070\051" | |
191 | +, (PRUint32)183 }, | |
192 | + { (void *)"\002\006\007\377\377\377\377\377" | |
193 | +, (PRUint32)8 }, | |
194 | + { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007" | |
195 | +"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001" | |
196 | +"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012" | |
197 | +"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060" | |
198 | +"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162" | |
199 | +"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070" | |
200 | +"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056" | |
201 | +"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061" | |
202 | +"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071" | |
203 | +"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114" | |
204 | +"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023" | |
205 | +"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162" | |
206 | +"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157" | |
207 | +"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061" | |
208 | +"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065" | |
209 | +"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060" | |
210 | +"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003" | |
211 | +"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144" | |
212 | +"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013" | |
213 | +"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003" | |
214 | +"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145" | |
215 | +"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143" | |
216 | +"\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015" | |
217 | +"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" | |
218 | +"\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065" | |
219 | +"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140" | |
220 | +"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026" | |
221 | +"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313" | |
222 | +"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336" | |
223 | +"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245" | |
224 | +"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044" | |
225 | +"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167" | |
226 | +"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026" | |
227 | +"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166" | |
228 | +"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063" | |
229 | +"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312" | |
230 | +"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364" | |
231 | +"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046" | |
232 | +"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150" | |
233 | +"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205" | |
234 | +"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060" | |
235 | +"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006" | |
236 | +"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001" | |
237 | +"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006" | |
238 | +"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005" | |
239 | +"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006" | |
240 | +"\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006" | |
241 | +"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" | |
242 | +"\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156" | |
243 | +"\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006" | |
244 | +"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005" | |
245 | +"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167" | |
246 | +"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171" | |
247 | +"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004" | |
248 | +"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072" | |
249 | +"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145" | |
250 | +"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003" | |
251 | +"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060" | |
252 | +"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321" | |
253 | +"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160" | |
254 | +"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" | |
255 | +"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153" | |
256 | +"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003" | |
257 | +"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001" | |
258 | +"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014" | |
259 | +"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063" | |
260 | +"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142" | |
261 | +"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264" | |
262 | +"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251" | |
263 | +"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330" | |
264 | +"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327" | |
265 | +"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013" | |
266 | +"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113" | |
267 | +"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227" | |
268 | +"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100" | |
269 | +"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247" | |
270 | +"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011" | |
271 | +"\355\020\342\305" | |
272 | +, (PRUint32)1236 } | |
273 | +}; | |
274 | +static const NSSItem nss_builtins_items_343 [] = { | |
275 | + { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, | |
276 | + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, | |
277 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
278 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, | |
279 | + { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 }, | |
280 | + { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151" | |
281 | +"\005\155\061\046" | |
282 | +, (PRUint32)20 }, | |
283 | + { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362" | |
284 | +, (PRUint32)16 }, | |
285 | + { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" | |
286 | +"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" | |
287 | +"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" | |
288 | +"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143" | |
289 | +"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151" | |
290 | +"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006" | |
291 | +"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105" | |
292 | +"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" | |
293 | +"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" | |
294 | +"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" | |
295 | +"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" | |
296 | +"\040\050\062\060\064\070\051" | |
297 | +, (PRUint32)183 }, | |
298 | + { (void *)"\002\006\007\377\377\377\377\377" | |
299 | +, (PRUint32)8 }, | |
300 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
301 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
302 | + { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, | |
303 | + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } | |
304 | +}; | |
305 | ||
306 | builtinsInternalObject | |
307 | nss_builtins_data[] = { | |
308 | @@ -22944,11 +23216,15 @@ nss_builtins_data[] = { | |
309 | { 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} }, | |
310 | { 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} }, | |
311 | { 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} }, | |
312 | - { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} } | |
313 | + { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} }, | |
314 | + { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} }, | |
315 | + { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} }, | |
316 | + { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} }, | |
317 | + { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} } | |
318 | }; | |
319 | const PRUint32 | |
320 | #ifdef DEBUG | |
321 | - nss_builtins_nObjects = 339+1; | |
322 | + nss_builtins_nObjects = 343+1; | |
323 | #else | |
324 | - nss_builtins_nObjects = 339; | |
325 | + nss_builtins_nObjects = 343; | |
326 | #endif /* DEBUG */ | |
327 | diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt | |
328 | --- ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 2011-11-03 16:29:42.293000000 -0700 | |
329 | +++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-03 08:11:58.000000000 -0700 | |
330 | @@ -34,7 +34,7 @@ | |
331 | # the terms of any one of the MPL, the GPL or the LGPL. | |
332 | # | |
333 | # ***** END LICENSE BLOCK ***** | |
334 | -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.79 $ $Date: 2011/09/02 19:40:56 $" | |
335 | +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $" | |
336 | ||
337 | # | |
338 | # certdata.txt | |
339 | @@ -23299,3 +23299,284 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_N | |
340 | CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED | |
341 | CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED | |
342 | CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE | |
343 | + | |
344 | +# | |
345 | +# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" | |
346 | +# | |
347 | +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE | |
348 | +CKA_TOKEN CK_BBOOL CK_TRUE | |
349 | +CKA_PRIVATE CK_BBOOL CK_FALSE | |
350 | +CKA_MODIFIABLE CK_BBOOL CK_FALSE | |
351 | +CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" | |
352 | +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 | |
353 | +CKA_SUBJECT MULTILINE_OCTAL | |
354 | +\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061 | |
355 | +\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145 | |
356 | +\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017 | |
357 | +\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061 | |
358 | +\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151 | |
359 | +\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156 | |
360 | +\162\151\143\150\051 | |
361 | +END | |
362 | +CKA_ID UTF8 "0" | |
363 | +CKA_ISSUER MULTILINE_OCTAL | |
364 | +\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061 | |
365 | +\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157 | |
366 | +\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125 | |
367 | +\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165 | |
368 | +\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156 | |
369 | +\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105 | |
370 | +\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142 | |
371 | +\141\154\040\122\157\157\164 | |
372 | +END | |
373 | +CKA_SERIAL_NUMBER MULTILINE_OCTAL | |
374 | +\002\006\007\377\377\377\377\377 | |
375 | +END | |
376 | +CKA_VALUE MULTILINE_OCTAL | |
377 | +\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007 | |
378 | +\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001 | |
379 | +\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023 | |
380 | +\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124 | |
381 | +\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060 | |
382 | +\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145 | |
383 | +\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163 | |
384 | +\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023 | |
385 | +\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040 | |
386 | +\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060 | |
387 | +\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062 | |
388 | +\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060 | |
389 | +\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003 | |
390 | +\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144 | |
391 | +\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013 | |
392 | +\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003 | |
393 | +\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145 | |
394 | +\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051 | |
395 | +\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001 | |
396 | +\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144 | |
397 | +\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376 | |
398 | +\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312 | |
399 | +\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225 | |
400 | +\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152 | |
401 | +\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173 | |
402 | +\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335 | |
403 | +\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177 | |
404 | +\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001 | |
405 | +\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035 | |
406 | +\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134 | |
407 | +\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001 | |
408 | +\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005 | |
409 | +\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142 | |
410 | +\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164 | |
411 | +\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056 | |
412 | +\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003 | |
413 | +\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006 | |
414 | +\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061 | |
415 | +\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026 | |
416 | +\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157 | |
417 | +\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023 | |
418 | +\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040 | |
419 | +\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061 | |
420 | +\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171 | |
421 | +\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040 | |
422 | +\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004 | |
423 | +\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072 | |
424 | +\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165 | |
425 | +\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103 | |
426 | +\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060 | |
427 | +\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027 | |
428 | +\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015 | |
429 | +\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201 | |
430 | +\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005 | |
431 | +\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325 | |
432 | +\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377 | |
433 | +\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222 | |
434 | +\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113 | |
435 | +\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362 | |
436 | +\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305 | |
437 | +\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143 | |
438 | +\131 | |
439 | +END | |
440 | + | |
441 | +# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" | |
442 | +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST | |
443 | +CKA_TOKEN CK_BBOOL CK_TRUE | |
444 | +CKA_PRIVATE CK_BBOOL CK_FALSE | |
445 | +CKA_MODIFIABLE CK_BBOOL CK_FALSE | |
446 | +CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" | |
447 | +CKA_CERT_SHA1_HASH MULTILINE_OCTAL | |
448 | +\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025 | |
449 | +\214\071\131\117 | |
450 | +END | |
451 | +CKA_CERT_MD5_HASH MULTILINE_OCTAL | |
452 | +\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152 | |
453 | +END | |
454 | +CKA_ISSUER MULTILINE_OCTAL | |
455 | +\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061 | |
456 | +\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157 | |
457 | +\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125 | |
458 | +\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165 | |
459 | +\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156 | |
460 | +\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105 | |
461 | +\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142 | |
462 | +\141\154\040\122\157\157\164 | |
463 | +END | |
464 | +CKA_SERIAL_NUMBER MULTILINE_OCTAL | |
465 | +\002\006\007\377\377\377\377\377 | |
466 | +END | |
467 | +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED | |
468 | +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED | |
469 | +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED | |
470 | +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE | |
471 | + | |
472 | +# | |
473 | +# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" | |
474 | +# | |
475 | +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE | |
476 | +CKA_TOKEN CK_BBOOL CK_TRUE | |
477 | +CKA_PRIVATE CK_BBOOL CK_FALSE | |
478 | +CKA_MODIFIABLE CK_BBOOL CK_FALSE | |
479 | +CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" | |
480 | +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 | |
481 | +CKA_SUBJECT MULTILINE_OCTAL | |
482 | +\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061 | |
483 | +\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145 | |
484 | +\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017 | |
485 | +\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061 | |
486 | +\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151 | |
487 | +\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050 | |
488 | +\105\156\162\151\143\150\051 | |
489 | +END | |
490 | +CKA_ID UTF8 "0" | |
491 | +CKA_ISSUER MULTILINE_OCTAL | |
492 | +\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 | |
493 | +\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 | |
494 | +\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 | |
495 | +\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143 | |
496 | +\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151 | |
497 | +\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006 | |
498 | +\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105 | |
499 | +\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 | |
500 | +\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 | |
501 | +\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 | |
502 | +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 | |
503 | +\040\050\062\060\064\070\051 | |
504 | +END | |
505 | +CKA_SERIAL_NUMBER MULTILINE_OCTAL | |
506 | +\002\006\007\377\377\377\377\377 | |
507 | +END | |
508 | +CKA_VALUE MULTILINE_OCTAL | |
509 | +\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007 | |
510 | +\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001 | |
511 | +\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012 | |
512 | +\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060 | |
513 | +\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162 | |
514 | +\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070 | |
515 | +\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056 | |
516 | +\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061 | |
517 | +\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071 | |
518 | +\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114 | |
519 | +\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023 | |
520 | +\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162 | |
521 | +\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 | |
522 | +\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061 | |
523 | +\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065 | |
524 | +\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060 | |
525 | +\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003 | |
526 | +\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144 | |
527 | +\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013 | |
528 | +\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003 | |
529 | +\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145 | |
530 | +\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143 | |
531 | +\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015 | |
532 | +\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 | |
533 | +\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065 | |
534 | +\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140 | |
535 | +\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026 | |
536 | +\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313 | |
537 | +\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336 | |
538 | +\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245 | |
539 | +\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044 | |
540 | +\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167 | |
541 | +\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026 | |
542 | +\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166 | |
543 | +\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063 | |
544 | +\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312 | |
545 | +\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364 | |
546 | +\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046 | |
547 | +\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150 | |
548 | +\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205 | |
549 | +\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060 | |
550 | +\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006 | |
551 | +\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001 | |
552 | +\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006 | |
553 | +\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005 | |
554 | +\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006 | |
555 | +\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006 | |
556 | +\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 | |
557 | +\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156 | |
558 | +\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006 | |
559 | +\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005 | |
560 | +\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167 | |
561 | +\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171 | |
562 | +\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004 | |
563 | +\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072 | |
564 | +\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145 | |
565 | +\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003 | |
566 | +\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060 | |
567 | +\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321 | |
568 | +\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160 | |
569 | +\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 | |
570 | +\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153 | |
571 | +\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003 | |
572 | +\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001 | |
573 | +\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014 | |
574 | +\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063 | |
575 | +\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142 | |
576 | +\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264 | |
577 | +\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251 | |
578 | +\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330 | |
579 | +\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327 | |
580 | +\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013 | |
581 | +\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113 | |
582 | +\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227 | |
583 | +\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100 | |
584 | +\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247 | |
585 | +\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011 | |
586 | +\355\020\342\305 | |
587 | +END | |
588 | + | |
589 | +# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" | |
590 | +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST | |
591 | +CKA_TOKEN CK_BBOOL CK_TRUE | |
592 | +CKA_PRIVATE CK_BBOOL CK_FALSE | |
593 | +CKA_MODIFIABLE CK_BBOOL CK_FALSE | |
594 | +CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" | |
595 | +CKA_CERT_SHA1_HASH MULTILINE_OCTAL | |
596 | +\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151 | |
597 | +\005\155\061\046 | |
598 | +END | |
599 | +CKA_CERT_MD5_HASH MULTILINE_OCTAL | |
600 | +\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362 | |
601 | +END | |
602 | +CKA_ISSUER MULTILINE_OCTAL | |
603 | +\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 | |
604 | +\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 | |
605 | +\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 | |
606 | +\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143 | |
607 | +\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151 | |
608 | +\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006 | |
609 | +\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105 | |
610 | +\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 | |
611 | +\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 | |
612 | +\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 | |
613 | +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 | |
614 | +\040\050\062\060\064\070\051 | |
615 | +END | |
616 | +CKA_SERIAL_NUMBER MULTILINE_OCTAL | |
617 | +\002\006\007\377\377\377\377\377 | |
618 | +END | |
619 | +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED | |
620 | +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED | |
621 | +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED | |
622 | +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE | |
623 | + | |
624 | diff -up ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h | |
625 | --- ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 2011-11-03 16:30:05.063000000 -0700 | |
626 | +++ ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2011-11-03 08:11:58.000000000 -0700 | |
627 | @@ -77,8 +77,8 @@ | |
628 | * of the comment in the CK_VERSION type definition. | |
629 | */ | |
630 | #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 | |
631 | -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87 | |
632 | -#define NSS_BUILTINS_LIBRARY_VERSION "1.87" | |
633 | +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88 | |
634 | +#define NSS_BUILTINS_LIBRARY_VERSION "1.88" | |
635 | ||
636 | /* These version numbers detail the semantic changes to the ckfw engine. */ | |
637 | #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 |