?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
updated on Thu Jan 26 00:18:00 UTC 2012
[aur-mirror.git] / lib32-nss / distrust-diginotar.patch
blob60c63fc686f9baaae2265553d42bac09d354bfff
1 Index: security/nss/lib/ckfw/builtins/certdata.c
2 ===================================================================
3 RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
4 retrieving revision 1.67.2.10
5 retrieving revision 1.67.2.11
6 diff -u -r1.67.2.10 -r1.67.2.11
7 --- security/nss/lib/ckfw/builtins/certdata.c 1 Aug 2011 06:40:03 -0000 1.67.2.10
8 +++ security/nss/lib/ckfw/builtins/certdata.c 30 Aug 2011 20:04:39 -0000 1.67.2.11
9 @@ -35,7 +35,7 @@
10 *
11 * ***** END LICENSE BLOCK ***** */
12 #ifdef DEBUG
13 -static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
14 +static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
15 #endif /* DEBUG */
16
17 #ifndef BUILTINS_H
18 @@ -1039,12 +1039,6 @@
19 static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
20 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
21 };
22 -static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
23 - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
24 -};
25 -static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
26 - 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
27 -};
28 #ifdef DEBUG
29 static const NSSItem nss_builtins_items_0 [] = {
30 { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
31 @@ -1053,7 +1047,7 @@
32 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
33 { (void *)"CVS ID", (PRUint32)7 },
34 { (void *)"NSS", (PRUint32)4 },
35 - { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
36 + { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
37 };
38 #endif /* DEBUG */
39 static const NSSItem nss_builtins_items_1 [] = {
40 @@ -12506,151 +12500,6 @@
41 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
42 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
43 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
44 - { (void *)"DigiNotar Root CA", (PRUint32)18 },
45 - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
46 - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
47 -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
48 -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
49 -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
50 -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
51 -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
52 -"\154"
53 -, (PRUint32)97 },
54 - { (void *)"0", (PRUint32)2 },
55 - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
56 -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
57 -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
58 -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
59 -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
60 -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
61 -"\154"
62 -, (PRUint32)97 },
63 - { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
64 -"\074\114"
65 -, (PRUint32)18 },
66 - { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
67 -"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
68 -"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
69 -"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
70 -"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
71 -"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
72 -"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
73 -"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
74 -"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
75 -"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
76 -"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
77 -"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
78 -"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
79 -"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
80 -"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
81 -"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
82 -"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
83 -"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
84 -"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
85 -"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
86 -"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
87 -"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
88 -"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
89 -"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
90 -"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
91 -"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
92 -"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
93 -"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
94 -"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
95 -"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
96 -"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
97 -"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
98 -"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
99 -"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
100 -"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
101 -"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
102 -"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
103 -"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
104 -"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
105 -"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
106 -"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
107 -"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
108 -"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
109 -"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
110 -"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
111 -"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
112 -"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
113 -"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
114 -"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
115 -"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
116 -"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
117 -"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035"
118 -"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125"
119 -"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
120 -"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
121 -"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
122 -"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
123 -"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
124 -"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
125 -"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
126 -"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
127 -"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
128 -"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
129 -"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
130 -"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
131 -"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
132 -"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
133 -"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
134 -"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
135 -"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
136 -"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
137 -"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
138 -"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
139 -"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
140 -"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
141 -"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
142 -"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
143 -"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
144 -"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
145 -"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
146 -"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
147 -"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
148 -"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
149 -"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
150 -"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
151 -"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
152 -"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
153 -"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
154 -"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
155 -, (PRUint32)1422 }
156 -};
157 -static const NSSItem nss_builtins_items_187 [] = {
158 - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
159 - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
160 - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
161 - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
162 - { (void *)"DigiNotar Root CA", (PRUint32)18 },
163 - { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
164 -"\201\147\107\214"
165 -, (PRUint32)20 },
166 - { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
167 -, (PRUint32)16 },
168 - { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
169 -"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
170 -"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
171 -"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
172 -"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
173 -"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
174 -"\154"
175 -, (PRUint32)97 },
176 - { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
177 -"\074\114"
178 -, (PRUint32)18 },
179 - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
180 - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
181 - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
182 - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
183 -};
184 -static const NSSItem nss_builtins_items_188 [] = {
185 - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
186 - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
187 - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
188 - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
189 { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
190 { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
191 { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
192 @@ -12738,7 +12587,7 @@
193 "\244\140\114\260\125\240\240\173\127\262"
194 , (PRUint32)1002 }
195 };
196 -static const NSSItem nss_builtins_items_189 [] = {
197 +static const NSSItem nss_builtins_items_187 [] = {
198 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
199 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
200 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
201 @@ -12765,7 +12614,7 @@
202 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
203 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
204 };
205 -static const NSSItem nss_builtins_items_190 [] = {
206 +static const NSSItem nss_builtins_items_188 [] = {
207 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
208 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
209 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
210 @@ -12874,7 +12723,7 @@
211 "\333"
212 , (PRUint32)1217 }
213 };
214 -static const NSSItem nss_builtins_items_191 [] = {
215 +static const NSSItem nss_builtins_items_189 [] = {
216 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
217 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
218 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
219 @@ -12902,7 +12751,7 @@
220 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
221 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
222 };
223 -static const NSSItem nss_builtins_items_192 [] = {
224 +static const NSSItem nss_builtins_items_190 [] = {
225 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
226 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
227 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
228 @@ -12976,7 +12825,7 @@
229 "\334\335\363\377\035\054\072\026\127\331\222\071\326"
230 , (PRUint32)653 }
231 };
232 -static const NSSItem nss_builtins_items_193 [] = {
233 +static const NSSItem nss_builtins_items_191 [] = {
234 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
235 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
236 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
237 @@ -13005,7 +12854,7 @@
238 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
239 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
240 };
241 -static const NSSItem nss_builtins_items_194 [] = {
242 +static const NSSItem nss_builtins_items_192 [] = {
243 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
244 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
245 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
246 @@ -13097,7 +12946,7 @@
247 "\321\236\164\310\166\147"
248 , (PRUint32)1078 }
249 };
250 -static const NSSItem nss_builtins_items_195 [] = {
251 +static const NSSItem nss_builtins_items_193 [] = {
252 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
253 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
254 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
255 @@ -13122,7 +12971,7 @@
256 { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
257 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
258 };
259 -static const NSSItem nss_builtins_items_196 [] = {
260 +static const NSSItem nss_builtins_items_194 [] = {
261 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
262 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
263 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
264 @@ -13219,7 +13068,7 @@
265 "\253\205\322\140\126\132"
266 , (PRUint32)1030 }
267 };
268 -static const NSSItem nss_builtins_items_197 [] = {
269 +static const NSSItem nss_builtins_items_195 [] = {
270 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
271 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
272 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
273 @@ -13247,7 +13096,7 @@
274 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
275 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
276 };
277 -static const NSSItem nss_builtins_items_198 [] = {
278 +static const NSSItem nss_builtins_items_196 [] = {
279 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
280 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
281 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
282 @@ -13332,7 +13181,7 @@
283 "\164"
284 , (PRUint32)897 }
285 };
286 -static const NSSItem nss_builtins_items_199 [] = {
287 +static const NSSItem nss_builtins_items_197 [] = {
288 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
289 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
290 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
291 @@ -13358,7 +13207,7 @@
292 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
293 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
294 };
295 -static const NSSItem nss_builtins_items_200 [] = {
296 +static const NSSItem nss_builtins_items_198 [] = {
297 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
298 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
299 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
300 @@ -13455,7 +13304,7 @@
301 "\374\276\337\012\015"
302 , (PRUint32)1013 }
303 };
304 -static const NSSItem nss_builtins_items_201 [] = {
305 +static const NSSItem nss_builtins_items_199 [] = {
306 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
307 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
308 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
309 @@ -13484,7 +13333,7 @@
310 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
311 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
312 };
313 -static const NSSItem nss_builtins_items_202 [] = {
314 +static const NSSItem nss_builtins_items_200 [] = {
315 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
316 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
317 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
318 @@ -13595,7 +13444,7 @@
319 "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
320 , (PRUint32)1151 }
321 };
322 -static const NSSItem nss_builtins_items_203 [] = {
323 +static const NSSItem nss_builtins_items_201 [] = {
324 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
325 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
326 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
327 @@ -13627,7 +13476,7 @@
328 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
329 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
330 };
331 -static const NSSItem nss_builtins_items_204 [] = {
332 +static const NSSItem nss_builtins_items_202 [] = {
333 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
334 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
335 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
336 @@ -13781,7 +13630,7 @@
337 "\103\307\003\340\067\116\135\012\334\131\040\045"
338 , (PRUint32)1964 }
339 };
340 -static const NSSItem nss_builtins_items_205 [] = {
341 +static const NSSItem nss_builtins_items_203 [] = {
342 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
343 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
344 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
345 @@ -13809,7 +13658,7 @@
346 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
347 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
348 };
349 -static const NSSItem nss_builtins_items_206 [] = {
350 +static const NSSItem nss_builtins_items_204 [] = {
351 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
352 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
353 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
354 @@ -13890,7 +13739,7 @@
355 "\300\226\130\057\352\273\106\327\273\344\331\056"
356 , (PRUint32)940 }
357 };
358 -static const NSSItem nss_builtins_items_207 [] = {
359 +static const NSSItem nss_builtins_items_205 [] = {
360 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
361 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
362 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
363 @@ -13913,7 +13762,7 @@
364 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
365 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
366 };
367 -static const NSSItem nss_builtins_items_208 [] = {
368 +static const NSSItem nss_builtins_items_206 [] = {
369 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
370 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
371 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
372 @@ -14047,7 +13896,7 @@
373 "\005\211\374\170\326\134\054\046\103\251"
374 , (PRUint32)1642 }
375 };
376 -static const NSSItem nss_builtins_items_209 [] = {
377 +static const NSSItem nss_builtins_items_207 [] = {
378 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
379 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
380 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
381 @@ -14075,7 +13924,7 @@
382 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
383 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
384 };
385 -static const NSSItem nss_builtins_items_210 [] = {
386 +static const NSSItem nss_builtins_items_208 [] = {
387 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
388 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
389 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
390 @@ -14180,7 +14029,7 @@
391 "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
392 , (PRUint32)1198 }
393 };
394 -static const NSSItem nss_builtins_items_211 [] = {
395 +static const NSSItem nss_builtins_items_209 [] = {
396 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
397 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
398 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
399 @@ -14207,7 +14056,7 @@
400 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
401 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
402 };
403 -static const NSSItem nss_builtins_items_212 [] = {
404 +static const NSSItem nss_builtins_items_210 [] = {
405 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
406 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
407 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
408 @@ -14312,7 +14161,7 @@
409 "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
410 , (PRUint32)1198 }
411 };
412 -static const NSSItem nss_builtins_items_213 [] = {
413 +static const NSSItem nss_builtins_items_211 [] = {
414 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
415 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
416 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
417 @@ -14339,7 +14188,7 @@
418 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
419 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
420 };
421 -static const NSSItem nss_builtins_items_214 [] = {
422 +static const NSSItem nss_builtins_items_212 [] = {
423 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
424 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
425 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
426 @@ -14432,7 +14281,7 @@
427 "\230"
428 , (PRUint32)993 }
429 };
430 -static const NSSItem nss_builtins_items_215 [] = {
431 +static const NSSItem nss_builtins_items_213 [] = {
432 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
433 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
434 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
435 @@ -14459,7 +14308,7 @@
436 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
437 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
438 };
439 -static const NSSItem nss_builtins_items_216 [] = {
440 +static const NSSItem nss_builtins_items_214 [] = {
441 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
442 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
443 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
444 @@ -14548,7 +14397,7 @@
445 "\126\144\127"
446 , (PRUint32)931 }
447 };
448 -static const NSSItem nss_builtins_items_217 [] = {
449 +static const NSSItem nss_builtins_items_215 [] = {
450 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
451 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
452 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
453 @@ -14575,7 +14424,7 @@
454 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
455 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
456 };
457 -static const NSSItem nss_builtins_items_218 [] = {
458 +static const NSSItem nss_builtins_items_216 [] = {
459 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
460 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
461 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
462 @@ -14656,7 +14505,7 @@
463 "\000\147\240\161\000\202\110"
464 , (PRUint32)919 }
465 };
466 -static const NSSItem nss_builtins_items_219 [] = {
467 +static const NSSItem nss_builtins_items_217 [] = {
468 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
469 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
470 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
471 @@ -14680,7 +14529,7 @@
472 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
473 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
474 };
475 -static const NSSItem nss_builtins_items_220 [] = {
476 +static const NSSItem nss_builtins_items_218 [] = {
477 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
478 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
479 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
480 @@ -14762,7 +14611,7 @@
481 "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
482 , (PRUint32)943 }
483 };
484 -static const NSSItem nss_builtins_items_221 [] = {
485 +static const NSSItem nss_builtins_items_219 [] = {
486 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
487 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
488 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
489 @@ -14786,7 +14635,7 @@
490 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
491 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
492 };
493 -static const NSSItem nss_builtins_items_222 [] = {
494 +static const NSSItem nss_builtins_items_220 [] = {
495 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
496 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
497 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
498 @@ -14867,7 +14716,7 @@
499 "\246\210\070\316\125"
500 , (PRUint32)933 }
501 };
502 -static const NSSItem nss_builtins_items_223 [] = {
503 +static const NSSItem nss_builtins_items_221 [] = {
504 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
505 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
506 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
507 @@ -14890,7 +14739,7 @@
508 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
509 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
510 };
511 -static const NSSItem nss_builtins_items_224 [] = {
512 +static const NSSItem nss_builtins_items_222 [] = {
513 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
514 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
515 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
516 @@ -15009,7 +14858,7 @@
517 "\201\370\021\234"
518 , (PRUint32)1460 }
519 };
520 -static const NSSItem nss_builtins_items_225 [] = {
521 +static const NSSItem nss_builtins_items_223 [] = {
522 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
523 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
524 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
525 @@ -15035,7 +14884,7 @@
526 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
527 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
528 };
529 -static const NSSItem nss_builtins_items_226 [] = {
530 +static const NSSItem nss_builtins_items_224 [] = {
531 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
532 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
533 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
534 @@ -15169,7 +15018,7 @@
535 "\311\234\220\332\354\251\102\074\255\266\002"
536 , (PRUint32)1307 }
537 };
538 -static const NSSItem nss_builtins_items_227 [] = {
539 +static const NSSItem nss_builtins_items_225 [] = {
540 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
541 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
542 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
543 @@ -15207,7 +15056,7 @@
544 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
545 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
546 };
547 -static const NSSItem nss_builtins_items_228 [] = {
548 +static const NSSItem nss_builtins_items_226 [] = {
549 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
550 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
551 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
552 @@ -15285,7 +15134,7 @@
553 "\366\324\357\277\114\210\150"
554 , (PRUint32)855 }
555 };
556 -static const NSSItem nss_builtins_items_229 [] = {
557 +static const NSSItem nss_builtins_items_227 [] = {
558 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
559 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
560 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
561 @@ -15309,7 +15158,7 @@
562 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
563 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
564 };
565 -static const NSSItem nss_builtins_items_230 [] = {
566 +static const NSSItem nss_builtins_items_228 [] = {
567 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
568 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
569 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
570 @@ -15387,7 +15236,7 @@
571 "\246\347\313\100\003\335\171"
572 , (PRUint32)855 }
573 };
574 -static const NSSItem nss_builtins_items_231 [] = {
575 +static const NSSItem nss_builtins_items_229 [] = {
576 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
577 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
578 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
579 @@ -15411,7 +15260,7 @@
580 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
581 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
582 };
583 -static const NSSItem nss_builtins_items_232 [] = {
584 +static const NSSItem nss_builtins_items_230 [] = {
585 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
586 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
587 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
588 @@ -15538,7 +15387,7 @@
589 "\320\352\111\242\034\215\122\024\246\012\223"
590 , (PRUint32)1515 }
591 };
592 -static const NSSItem nss_builtins_items_233 [] = {
593 +static const NSSItem nss_builtins_items_231 [] = {
594 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
595 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
596 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
597 @@ -15566,7 +15415,7 @@
598 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
599 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
600 };
601 -static const NSSItem nss_builtins_items_234 [] = {
602 +static const NSSItem nss_builtins_items_232 [] = {
603 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
604 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
605 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
606 @@ -15640,7 +15489,7 @@
607 "\366\356\260\132\116\111\104\124\130\137\102\203"
608 , (PRUint32)828 }
609 };
610 -static const NSSItem nss_builtins_items_235 [] = {
611 +static const NSSItem nss_builtins_items_233 [] = {
612 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
613 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
614 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
615 @@ -15663,7 +15512,7 @@
616 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
617 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
618 };
619 -static const NSSItem nss_builtins_items_236 [] = {
620 +static const NSSItem nss_builtins_items_234 [] = {
621 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
622 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
623 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
624 @@ -15739,7 +15588,7 @@
625 "\011\333\212\101\202\236\146\233\021"
626 , (PRUint32)857 }
627 };
628 -static const NSSItem nss_builtins_items_237 [] = {
629 +static const NSSItem nss_builtins_items_235 [] = {
630 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
631 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
632 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
633 @@ -15762,7 +15611,7 @@
634 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
635 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
636 };
637 -static const NSSItem nss_builtins_items_238 [] = {
638 +static const NSSItem nss_builtins_items_236 [] = {
639 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
640 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
641 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
642 @@ -15845,7 +15694,7 @@
643 "\262\033\211\124"
644 , (PRUint32)932 }
645 };
646 -static const NSSItem nss_builtins_items_239 [] = {
647 +static const NSSItem nss_builtins_items_237 [] = {
648 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
649 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
650 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
651 @@ -15869,7 +15718,7 @@
652 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
653 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
654 };
655 -static const NSSItem nss_builtins_items_240 [] = {
656 +static const NSSItem nss_builtins_items_238 [] = {
657 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
658 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
659 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
660 @@ -15969,7 +15818,7 @@
661 "\021\055"
662 , (PRUint32)1026 }
663 };
664 -static const NSSItem nss_builtins_items_241 [] = {
665 +static const NSSItem nss_builtins_items_239 [] = {
666 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
667 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
668 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
669 @@ -15999,7 +15848,7 @@
670 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
671 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
672 };
673 -static const NSSItem nss_builtins_items_242 [] = {
674 +static const NSSItem nss_builtins_items_240 [] = {
675 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
676 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
677 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
678 @@ -16073,7 +15922,7 @@
679 "\367\130\077\056\162\002\127\243\217\241\024\056"
680 , (PRUint32)652 }
681 };
682 -static const NSSItem nss_builtins_items_243 [] = {
683 +static const NSSItem nss_builtins_items_241 [] = {
684 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
685 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
686 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
687 @@ -16102,7 +15951,7 @@
688 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
689 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
690 };
691 -static const NSSItem nss_builtins_items_244 [] = {
692 +static const NSSItem nss_builtins_items_242 [] = {
693 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
694 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
695 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
696 @@ -16208,7 +16057,7 @@
697 "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
698 , (PRUint32)1070 }
699 };
700 -static const NSSItem nss_builtins_items_245 [] = {
701 +static const NSSItem nss_builtins_items_243 [] = {
702 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
703 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
704 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
705 @@ -16240,7 +16089,7 @@
706 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
707 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
708 };
709 -static const NSSItem nss_builtins_items_246 [] = {
710 +static const NSSItem nss_builtins_items_244 [] = {
711 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
712 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
713 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
714 @@ -16319,7 +16168,7 @@
715 "\017\212"
716 , (PRUint32)690 }
717 };
718 -static const NSSItem nss_builtins_items_247 [] = {
719 +static const NSSItem nss_builtins_items_245 [] = {
720 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
721 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
722 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
723 @@ -16349,7 +16198,7 @@
724 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
725 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
726 };
727 -static const NSSItem nss_builtins_items_248 [] = {
728 +static const NSSItem nss_builtins_items_246 [] = {
729 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
730 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
731 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
732 @@ -16464,7 +16313,7 @@
733 "\354\315\202\141\361\070\346\117\227\230\052\132\215"
734 , (PRUint32)1213 }
735 };
736 -static const NSSItem nss_builtins_items_249 [] = {
737 +static const NSSItem nss_builtins_items_247 [] = {
738 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
739 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
740 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
741 @@ -16496,7 +16345,7 @@
742 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
743 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
744 };
745 -static const NSSItem nss_builtins_items_250 [] = {
746 +static const NSSItem nss_builtins_items_248 [] = {
747 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
748 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
749 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
750 @@ -16594,7 +16443,7 @@
751 "\055\247\330\206\052\335\056\020"
752 , (PRUint32)904 }
753 };
754 -static const NSSItem nss_builtins_items_251 [] = {
755 +static const NSSItem nss_builtins_items_249 [] = {
756 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
757 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
758 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
759 @@ -16627,7 +16476,7 @@
760 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
761 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
762 };
763 -static const NSSItem nss_builtins_items_252 [] = {
764 +static const NSSItem nss_builtins_items_250 [] = {
765 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
766 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
767 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
768 @@ -16729,7 +16578,7 @@
769 "\330\316\304\143\165\077\131\107\261"
770 , (PRUint32)1049 }
771 };
772 -static const NSSItem nss_builtins_items_253 [] = {
773 +static const NSSItem nss_builtins_items_251 [] = {
774 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
775 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
776 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
777 @@ -16759,7 +16608,7 @@
778 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
779 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
780 };
781 -static const NSSItem nss_builtins_items_254 [] = {
782 +static const NSSItem nss_builtins_items_252 [] = {
783 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
784 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
785 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
786 @@ -16878,7 +16727,7 @@
787 "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
788 , (PRUint32)1486 }
789 };
790 -static const NSSItem nss_builtins_items_255 [] = {
791 +static const NSSItem nss_builtins_items_253 [] = {
792 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
793 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
794 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
795 @@ -16903,7 +16752,7 @@
796 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
797 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
798 };
799 -static const NSSItem nss_builtins_items_256 [] = {
800 +static const NSSItem nss_builtins_items_254 [] = {
801 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
802 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
803 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
804 @@ -16993,7 +16842,7 @@
805 "\315\345\250"
806 , (PRUint32)1043 }
807 };
808 -static const NSSItem nss_builtins_items_257 [] = {
809 +static const NSSItem nss_builtins_items_255 [] = {
810 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
811 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
812 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
813 @@ -17017,7 +16866,7 @@
814 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
815 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
816 };
817 -static const NSSItem nss_builtins_items_258 [] = {
818 +static const NSSItem nss_builtins_items_256 [] = {
819 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
820 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
821 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
822 @@ -17122,7 +16971,7 @@
823 "\115\273\306\104\333\066\313\052\234\216"
824 , (PRUint32)1258 }
825 };
826 -static const NSSItem nss_builtins_items_259 [] = {
827 +static const NSSItem nss_builtins_items_257 [] = {
828 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
829 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
830 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
831 @@ -17147,7 +16996,7 @@
832 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
833 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
834 };
835 -static const NSSItem nss_builtins_items_260 [] = {
836 +static const NSSItem nss_builtins_items_258 [] = {
837 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
838 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
839 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
840 @@ -17223,7 +17072,7 @@
841 "\002\153\331\132"
842 , (PRUint32)820 }
843 };
844 -static const NSSItem nss_builtins_items_261 [] = {
845 +static const NSSItem nss_builtins_items_259 [] = {
846 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
847 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
848 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
849 @@ -17247,7 +17096,7 @@
850 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
851 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
852 };
853 -static const NSSItem nss_builtins_items_262 [] = {
854 +static const NSSItem nss_builtins_items_260 [] = {
855 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
856 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
857 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
858 @@ -17329,7 +17178,7 @@
859 "\362"
860 , (PRUint32)881 }
861 };
862 -static const NSSItem nss_builtins_items_263 [] = {
863 +static const NSSItem nss_builtins_items_261 [] = {
864 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
865 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
866 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
867 @@ -17354,7 +17203,7 @@
868 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
869 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
870 };
871 -static const NSSItem nss_builtins_items_264 [] = {
872 +static const NSSItem nss_builtins_items_262 [] = {
873 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
874 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
875 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
876 @@ -17470,7 +17319,7 @@
877 "\113\076\053\070\007\125\230\136\244"
878 , (PRUint32)1465 }
879 };
880 -static const NSSItem nss_builtins_items_265 [] = {
881 +static const NSSItem nss_builtins_items_263 [] = {
882 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
883 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
884 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
885 @@ -17494,7 +17343,7 @@
886 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
887 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
888 };
889 -static const NSSItem nss_builtins_items_266 [] = {
890 +static const NSSItem nss_builtins_items_264 [] = {
891 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
892 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
893 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
894 @@ -17559,7 +17408,7 @@
895 "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
896 , (PRUint32)576 }
897 };
898 -static const NSSItem nss_builtins_items_267 [] = {
899 +static const NSSItem nss_builtins_items_265 [] = {
900 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
901 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
902 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
903 @@ -17586,7 +17435,7 @@
904 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
905 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
906 };
907 -static const NSSItem nss_builtins_items_268 [] = {
908 +static const NSSItem nss_builtins_items_266 [] = {
909 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
910 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
911 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
912 @@ -17651,7 +17500,7 @@
913 "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
914 , (PRUint32)576 }
915 };
916 -static const NSSItem nss_builtins_items_269 [] = {
917 +static const NSSItem nss_builtins_items_267 [] = {
918 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
919 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
920 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
921 @@ -17678,7 +17527,7 @@
922 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
923 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
924 };
925 -static const NSSItem nss_builtins_items_270 [] = {
926 +static const NSSItem nss_builtins_items_268 [] = {
927 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
928 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
929 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
930 @@ -17775,7 +17624,7 @@
931 "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
932 , (PRUint32)1038 }
933 };
934 -static const NSSItem nss_builtins_items_271 [] = {
935 +static const NSSItem nss_builtins_items_269 [] = {
936 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
937 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
938 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
939 @@ -17803,7 +17652,7 @@
940 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
941 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
942 };
943 -static const NSSItem nss_builtins_items_272 [] = {
944 +static const NSSItem nss_builtins_items_270 [] = {
945 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
946 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
947 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
948 @@ -17894,7 +17743,7 @@
949 "\336\102\343\055\202\361\017\345\372\227"
950 , (PRUint32)954 }
951 };
952 -static const NSSItem nss_builtins_items_273 [] = {
953 +static const NSSItem nss_builtins_items_271 [] = {
954 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
955 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
956 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
957 @@ -17922,7 +17771,7 @@
958 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
959 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
960 };
961 -static const NSSItem nss_builtins_items_274 [] = {
962 +static const NSSItem nss_builtins_items_272 [] = {
963 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
964 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
965 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
966 @@ -18001,7 +17850,7 @@
967 "\130\077\137"
968 , (PRUint32)867 }
969 };
970 -static const NSSItem nss_builtins_items_275 [] = {
971 +static const NSSItem nss_builtins_items_273 [] = {
972 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
973 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
974 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
975 @@ -18025,7 +17874,7 @@
976 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
977 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
978 };
979 -static const NSSItem nss_builtins_items_276 [] = {
980 +static const NSSItem nss_builtins_items_274 [] = {
981 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
982 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
983 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
984 @@ -18118,7 +17967,7 @@
985 "\045\361\224\264\146"
986 , (PRUint32)997 }
987 };
988 -static const NSSItem nss_builtins_items_277 [] = {
989 +static const NSSItem nss_builtins_items_275 [] = {
990 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
991 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
992 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
993 @@ -18145,7 +17994,7 @@
994 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
995 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
996 };
997 -static const NSSItem nss_builtins_items_278 [] = {
998 +static const NSSItem nss_builtins_items_276 [] = {
999 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1000 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1001 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1002 @@ -18269,7 +18118,7 @@
1003 "\156\117\022\176\012\074\235\225"
1004 , (PRUint32)1560 }
1005 };
1006 -static const NSSItem nss_builtins_items_279 [] = {
1007 +static const NSSItem nss_builtins_items_277 [] = {
1008 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1009 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1010 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1011 @@ -18294,7 +18143,7 @@
1012 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1013 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1014 };
1015 -static const NSSItem nss_builtins_items_280 [] = {
1016 +static const NSSItem nss_builtins_items_278 [] = {
1017 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1018 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1019 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1020 @@ -18413,7 +18262,7 @@
1021 "\333\374\046\210\307"
1022 , (PRUint32)1525 }
1023 };
1024 -static const NSSItem nss_builtins_items_281 [] = {
1025 +static const NSSItem nss_builtins_items_279 [] = {
1026 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1027 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1028 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1029 @@ -18437,7 +18286,7 @@
1030 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1031 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1032 };
1033 -static const NSSItem nss_builtins_items_282 [] = {
1034 +static const NSSItem nss_builtins_items_280 [] = {
1035 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1036 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1037 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1038 @@ -18593,7 +18442,7 @@
1039 "\167\110\320"
1040 , (PRUint32)1875 }
1041 };
1042 -static const NSSItem nss_builtins_items_283 [] = {
1043 +static const NSSItem nss_builtins_items_281 [] = {
1044 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1045 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1046 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1047 @@ -18624,7 +18473,7 @@
1048 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1049 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1050 };
1051 -static const NSSItem nss_builtins_items_284 [] = {
1052 +static const NSSItem nss_builtins_items_282 [] = {
1053 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1054 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1055 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1056 @@ -18777,7 +18626,7 @@
1057 "\351\233\256\325\124\300\164\200\321\013\102\237\301"
1058 , (PRUint32)1869 }
1059 };
1060 -static const NSSItem nss_builtins_items_285 [] = {
1061 +static const NSSItem nss_builtins_items_283 [] = {
1062 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1063 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1064 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1065 @@ -18807,7 +18656,7 @@
1066 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1067 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1068 };
1069 -static const NSSItem nss_builtins_items_286 [] = {
1070 +static const NSSItem nss_builtins_items_284 [] = {
1071 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1072 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1073 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1074 @@ -18943,7 +18792,7 @@
1075 "\242\355\264\324\265\145\103\267\223\106\212\323"
1076 , (PRUint32)1532 }
1077 };
1078 -static const NSSItem nss_builtins_items_287 [] = {
1079 +static const NSSItem nss_builtins_items_285 [] = {
1080 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1081 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1082 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1083 @@ -18973,7 +18822,7 @@
1084 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1085 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1086 };
1087 -static const NSSItem nss_builtins_items_288 [] = {
1088 +static const NSSItem nss_builtins_items_286 [] = {
1089 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1090 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1091 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1092 @@ -19124,7 +18973,7 @@
1093 "\264"
1094 , (PRUint32)1761 }
1095 };
1096 -static const NSSItem nss_builtins_items_289 [] = {
1097 +static const NSSItem nss_builtins_items_287 [] = {
1098 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1099 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1100 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1101 @@ -19154,7 +19003,7 @@
1102 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1103 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1104 };
1105 -static const NSSItem nss_builtins_items_290 [] = {
1106 +static const NSSItem nss_builtins_items_288 [] = {
1107 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1108 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1109 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1110 @@ -19290,7 +19139,7 @@
1111 "\111\043"
1112 , (PRUint32)1522 }
1113 };
1114 -static const NSSItem nss_builtins_items_291 [] = {
1115 +static const NSSItem nss_builtins_items_289 [] = {
1116 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1117 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1118 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1119 @@ -19320,7 +19169,7 @@
1120 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1121 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1122 };
1123 -static const NSSItem nss_builtins_items_292 [] = {
1124 +static const NSSItem nss_builtins_items_290 [] = {
1125 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1126 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1127 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1128 @@ -19455,7 +19304,7 @@
1129 "\172\244\047\023\326\117\364\151"
1130 , (PRUint32)1512 }
1131 };
1132 -static const NSSItem nss_builtins_items_293 [] = {
1133 +static const NSSItem nss_builtins_items_291 [] = {
1134 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1135 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1136 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1137 @@ -19485,7 +19334,7 @@
1138 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1139 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1140 };
1141 -static const NSSItem nss_builtins_items_294 [] = {
1142 +static const NSSItem nss_builtins_items_292 [] = {
1143 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1144 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1145 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1146 @@ -19621,7 +19470,7 @@
1147 "\302\021\254"
1148 , (PRUint32)1523 }
1149 };
1150 -static const NSSItem nss_builtins_items_295 [] = {
1151 +static const NSSItem nss_builtins_items_293 [] = {
1152 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1153 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1154 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1155 @@ -19651,7 +19500,7 @@
1156 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1157 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1158 };
1159 -static const NSSItem nss_builtins_items_296 [] = {
1160 +static const NSSItem nss_builtins_items_294 [] = {
1161 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1162 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1163 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1164 @@ -19787,7 +19636,7 @@
1165 "\147\024\060"
1166 , (PRUint32)1523 }
1167 };
1168 -static const NSSItem nss_builtins_items_297 [] = {
1169 +static const NSSItem nss_builtins_items_295 [] = {
1170 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1171 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1172 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1173 @@ -19817,7 +19666,7 @@
1174 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1175 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1176 };
1177 -static const NSSItem nss_builtins_items_298 [] = {
1178 +static const NSSItem nss_builtins_items_296 [] = {
1179 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1180 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1181 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1182 @@ -19951,7 +19800,7 @@
1183 "\217\116\235\306\066\347\134\246\253\022\017\326\317"
1184 , (PRUint32)1501 }
1185 };
1186 -static const NSSItem nss_builtins_items_299 [] = {
1187 +static const NSSItem nss_builtins_items_297 [] = {
1188 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1189 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1190 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1191 @@ -19981,7 +19830,7 @@
1192 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1193 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1194 };
1195 -static const NSSItem nss_builtins_items_300 [] = {
1196 +static const NSSItem nss_builtins_items_298 [] = {
1197 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1198 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1199 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1200 @@ -20115,7 +19964,7 @@
1201 "\130\113\161\203\237\146\346\254\171\110\376\376\107"
1202 , (PRUint32)1501 }
1203 };
1204 -static const NSSItem nss_builtins_items_301 [] = {
1205 +static const NSSItem nss_builtins_items_299 [] = {
1206 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1207 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1208 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1209 @@ -20145,7 +19994,7 @@
1210 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1211 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1212 };
1213 -static const NSSItem nss_builtins_items_302 [] = {
1214 +static const NSSItem nss_builtins_items_300 [] = {
1215 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1216 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1217 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1218 @@ -20280,7 +20129,7 @@
1219 "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
1220 , (PRUint32)1520 }
1221 };
1222 -static const NSSItem nss_builtins_items_303 [] = {
1223 +static const NSSItem nss_builtins_items_301 [] = {
1224 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1225 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1226 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1227 @@ -20310,7 +20159,7 @@
1228 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1229 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1230 };
1231 -static const NSSItem nss_builtins_items_304 [] = {
1232 +static const NSSItem nss_builtins_items_302 [] = {
1233 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1234 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1235 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1236 @@ -20438,7 +20287,7 @@
1237 "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
1238 , (PRUint32)1392 }
1239 };
1240 -static const NSSItem nss_builtins_items_305 [] = {
1241 +static const NSSItem nss_builtins_items_303 [] = {
1242 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1243 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1244 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1245 @@ -20468,7 +20317,7 @@
1246 { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
1247 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1248 };
1249 -static const NSSItem nss_builtins_items_306 [] = {
1250 +static const NSSItem nss_builtins_items_304 [] = {
1251 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1252 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1253 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1254 @@ -20561,7 +20410,7 @@
1255 "\342\342\104\276\134\367\352\034\365"
1256 , (PRUint32)969 }
1257 };
1258 -static const NSSItem nss_builtins_items_307 [] = {
1259 +static const NSSItem nss_builtins_items_305 [] = {
1260 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1261 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1262 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1263 @@ -20589,7 +20438,7 @@
1264 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1265 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1266 };
1267 -static const NSSItem nss_builtins_items_308 [] = {
1268 +static const NSSItem nss_builtins_items_306 [] = {
1269 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1270 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1271 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1272 @@ -20686,7 +20535,7 @@
1273 "\364"
1274 , (PRUint32)993 }
1275 };
1276 -static const NSSItem nss_builtins_items_309 [] = {
1277 +static const NSSItem nss_builtins_items_307 [] = {
1278 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1279 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1280 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1281 @@ -20715,7 +20564,7 @@
1282 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1283 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1284 };
1285 -static const NSSItem nss_builtins_items_310 [] = {
1286 +static const NSSItem nss_builtins_items_308 [] = {
1287 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1288 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1289 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1290 @@ -20813,7 +20662,7 @@
1291 "\261\050\272"
1292 , (PRUint32)1011 }
1293 };
1294 -static const NSSItem nss_builtins_items_311 [] = {
1295 +static const NSSItem nss_builtins_items_309 [] = {
1296 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1297 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1298 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1299 @@ -20842,7 +20691,7 @@
1300 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1301 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1302 };
1303 -static const NSSItem nss_builtins_items_312 [] = {
1304 +static const NSSItem nss_builtins_items_310 [] = {
1305 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1306 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1307 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1308 @@ -20919,7 +20768,7 @@
1309 "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
1310 , (PRUint32)848 }
1311 };
1312 -static const NSSItem nss_builtins_items_313 [] = {
1313 +static const NSSItem nss_builtins_items_311 [] = {
1314 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1315 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1316 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1317 @@ -20943,7 +20792,7 @@
1318 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1319 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1320 };
1321 -static const NSSItem nss_builtins_items_314 [] = {
1322 +static const NSSItem nss_builtins_items_312 [] = {
1323 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1324 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1325 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1326 @@ -21020,7 +20869,7 @@
1327 "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
1328 , (PRUint32)848 }
1329 };
1330 -static const NSSItem nss_builtins_items_315 [] = {
1331 +static const NSSItem nss_builtins_items_313 [] = {
1332 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1333 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1334 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1335 @@ -21044,7 +20893,7 @@
1336 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1337 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1338 };
1339 -static const NSSItem nss_builtins_items_316 [] = {
1340 +static const NSSItem nss_builtins_items_314 [] = {
1341 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1342 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1343 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1344 @@ -21153,7 +21002,7 @@
1345 "\051\340\266\270\011\150\031\034\030\103"
1346 , (PRUint32)1354 }
1347 };
1348 -static const NSSItem nss_builtins_items_317 [] = {
1349 +static const NSSItem nss_builtins_items_315 [] = {
1350 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1351 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1352 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1353 @@ -21177,7 +21026,7 @@
1354 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1355 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1356 };
1357 -static const NSSItem nss_builtins_items_318 [] = {
1358 +static const NSSItem nss_builtins_items_316 [] = {
1359 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1360 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1361 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1362 @@ -21234,7 +21083,7 @@
1363 "\214\171"
1364 , (PRUint32)514 }
1365 };
1366 -static const NSSItem nss_builtins_items_319 [] = {
1367 +static const NSSItem nss_builtins_items_317 [] = {
1368 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1369 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1370 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1371 @@ -21258,7 +21107,7 @@
1372 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1373 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1374 };
1375 -static const NSSItem nss_builtins_items_320 [] = {
1376 +static const NSSItem nss_builtins_items_318 [] = {
1377 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1378 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1379 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1380 @@ -21348,7 +21197,7 @@
1381 "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
1382 , (PRUint32)959 }
1383 };
1384 -static const NSSItem nss_builtins_items_321 [] = {
1385 +static const NSSItem nss_builtins_items_319 [] = {
1386 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1387 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1388 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1389 @@ -21375,7 +21224,7 @@
1390 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1391 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1392 };
1393 -static const NSSItem nss_builtins_items_322 [] = {
1394 +static const NSSItem nss_builtins_items_320 [] = {
1395 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1396 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1397 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1398 @@ -21493,7 +21342,7 @@
1399 "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
1400 , (PRUint32)1440 }
1401 };
1402 -static const NSSItem nss_builtins_items_323 [] = {
1403 +static const NSSItem nss_builtins_items_321 [] = {
1404 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1405 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1406 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1407 @@ -21519,7 +21368,7 @@
1408 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1409 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1410 };
1411 -static const NSSItem nss_builtins_items_324 [] = {
1412 +static const NSSItem nss_builtins_items_322 [] = {
1413 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1414 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1415 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1416 @@ -21652,7 +21501,7 @@
1417 "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
1418 , (PRUint32)1679 }
1419 };
1420 -static const NSSItem nss_builtins_items_325 [] = {
1421 +static const NSSItem nss_builtins_items_323 [] = {
1422 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1423 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1424 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1425 @@ -21678,7 +21527,7 @@
1426 { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
1427 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1428 };
1429 -static const NSSItem nss_builtins_items_326 [] = {
1430 +static const NSSItem nss_builtins_items_324 [] = {
1431 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1432 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1433 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1434 @@ -21772,7 +21621,7 @@
1435 "\204\232\315"
1436 , (PRUint32)979 }
1437 };
1438 -static const NSSItem nss_builtins_items_327 [] = {
1439 +static const NSSItem nss_builtins_items_325 [] = {
1440 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1441 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1442 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1443 @@ -21800,7 +21649,7 @@
1444 { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
1445 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
1446 };
1447 -static const NSSItem nss_builtins_items_328 [] = {
1448 +static const NSSItem nss_builtins_items_326 [] = {
1449 { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1450 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1451 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1452 @@ -21884,7 +21733,7 @@
1453 "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
1454 , (PRUint32)895 }
1455 };
1456 -static const NSSItem nss_builtins_items_329 [] = {
1457 +static const NSSItem nss_builtins_items_327 [] = {
1458 { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
1459 { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
1460 { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
1461 @@ -22242,13 +22091,11 @@
1462 { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
1463 { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
1464 { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
1465 - { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
1466 - { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
1467 - { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
1468 + { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
1469 };
1470 const PRUint32
1471 #ifdef DEBUG
1472 - nss_builtins_nObjects = 329+1;
1473 + nss_builtins_nObjects = 327+1;
1474 #else
1475 - nss_builtins_nObjects = 329;
1476 + nss_builtins_nObjects = 327;
1477 #endif /* DEBUG */
1478 Index: security/nss/lib/ckfw/builtins/certdata.txt
1479 ===================================================================
1480 RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
1481 retrieving revision 1.64.2.10
1482 retrieving revision 1.64.2.11
1483 diff -u -r1.64.2.10 -r1.64.2.11
1484 --- security/nss/lib/ckfw/builtins/certdata.txt 1 Aug 2011 06:40:04 -0000 1.64.2.10
1485 +++ security/nss/lib/ckfw/builtins/certdata.txt 30 Aug 2011 20:04:39 -0000 1.64.2.11
1486 @@ -34,7 +34,7 @@
1487 # the terms of any one of the MPL, the GPL or the LGPL.
1488 #
1489 # ***** END LICENSE BLOCK *****
1490 -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
1491 +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
1492
1493 #
1494 # certdata.txt
1495 @@ -12461,161 +12461,6 @@
1496 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
1497
1498 #
1499 -# Certificate "DigiNotar Root CA"
1500 -#
1501 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
1502 -CKA_TOKEN CK_BBOOL CK_TRUE
1503 -CKA_PRIVATE CK_BBOOL CK_FALSE
1504 -CKA_MODIFIABLE CK_BBOOL CK_FALSE
1505 -CKA_LABEL UTF8 "DigiNotar Root CA"
1506 -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
1507 -CKA_SUBJECT MULTILINE_OCTAL
1508 -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
1509 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
1510 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
1511 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
1512 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
1513 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
1514 -\154
1515 -END
1516 -CKA_ID UTF8 "0"
1517 -CKA_ISSUER MULTILINE_OCTAL
1518 -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
1519 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
1520 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
1521 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
1522 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
1523 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
1524 -\154
1525 -END
1526 -CKA_SERIAL_NUMBER MULTILINE_OCTAL
1527 -\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
1528 -\074\114
1529 -END
1530 -CKA_VALUE MULTILINE_OCTAL
1531 -\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
1532 -\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
1533 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
1534 -\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
1535 -\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
1536 -\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
1537 -\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
1538 -\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
1539 -\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
1540 -\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
1541 -\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
1542 -\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
1543 -\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
1544 -\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
1545 -\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
1546 -\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
1547 -\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
1548 -\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
1549 -\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
1550 -\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
1551 -\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
1552 -\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
1553 -\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
1554 -\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
1555 -\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
1556 -\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
1557 -\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
1558 -\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
1559 -\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
1560 -\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
1561 -\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
1562 -\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
1563 -\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
1564 -\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
1565 -\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
1566 -\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
1567 -\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
1568 -\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
1569 -\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
1570 -\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
1571 -\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
1572 -\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
1573 -\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
1574 -\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
1575 -\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
1576 -\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
1577 -\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
1578 -\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
1579 -\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
1580 -\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
1581 -\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
1582 -\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
1583 -\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
1584 -\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
1585 -\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
1586 -\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
1587 -\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
1588 -\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
1589 -\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
1590 -\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
1591 -\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
1592 -\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
1593 -\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
1594 -\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
1595 -\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
1596 -\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
1597 -\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
1598 -\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
1599 -\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
1600 -\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
1601 -\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
1602 -\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
1603 -\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
1604 -\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
1605 -\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
1606 -\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
1607 -\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
1608 -\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
1609 -\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
1610 -\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
1611 -\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
1612 -\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
1613 -\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
1614 -\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
1615 -\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
1616 -\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
1617 -\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
1618 -\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
1619 -\262\345\214\360\206\231\270\345\305\337\204\301\267\353
1620 -END
1621 -
1622 -# Trust for Certificate "DigiNotar Root CA"
1623 -CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
1624 -CKA_TOKEN CK_BBOOL CK_TRUE
1625 -CKA_PRIVATE CK_BBOOL CK_FALSE
1626 -CKA_MODIFIABLE CK_BBOOL CK_FALSE
1627 -CKA_LABEL UTF8 "DigiNotar Root CA"
1628 -CKA_CERT_SHA1_HASH MULTILINE_OCTAL
1629 -\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
1630 -\201\147\107\214
1631 -END
1632 -CKA_CERT_MD5_HASH MULTILINE_OCTAL
1633 -\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
1634 -END
1635 -CKA_ISSUER MULTILINE_OCTAL
1636 -\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
1637 -\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
1638 -\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
1639 -\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
1640 -\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
1641 -\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
1642 -\154
1643 -END
1644 -CKA_SERIAL_NUMBER MULTILINE_OCTAL
1645 -\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
1646 -\074\114
1647 -END
1648 -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
1649 -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
1650 -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
1651 -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
1652 -
1653 -#
1654 # Certificate "Network Solutions Certificate Authority"
1655 #
1656 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
1657 Index: security/nss/lib/ckfw/builtins/nssckbi.h
1658 ===================================================================
1659 RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
1660 retrieving revision 1.24.2.5
1661 retrieving revision 1.24.2.6
1662 diff -u -r1.24.2.5 -r1.24.2.6
1663 --- security/nss/lib/ckfw/builtins/nssckbi.h 1 Aug 2011 06:40:04 -0000 1.24.2.5
1664 +++ security/nss/lib/ckfw/builtins/nssckbi.h 30 Aug 2011 20:04:40 -0000 1.24.2.6
1665 @@ -77,8 +77,8 @@
1666 * of the comment in the CK_VERSION type definition.
1667 */
1668 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
1669 -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
1670 -#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
1671 +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
1672 +#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
1673
1674 /* These version numbers detail the semantic changes to the ckfw engine. */
1675 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
AUR mirror