/[pkgs]/devel/openssl/openssl-1.0.0-beta3-namingstr.patch
ViewVC logotype

Contents of /devel/openssl/openssl-1.0.0-beta3-namingstr.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Thu Aug 20 14:18:42 2009 UTC (3 months ago) by tmraz
Branch: MAIN
CVS Tags: openssl-1_0_0-0_7_beta3_fc12, openssl-1_0_0-0_4_beta3_fc12, F-12-split, openssl-1_0_0-0_8_beta3_fc13, openssl-1_0_0-0_9_beta3_fc13, openssl-1_0_0-0_10_beta3_fc13, openssl-1_0_0-0_1_beta3_fc12, openssl-1_0_0-0_5_beta3_fc12, openssl-1_0_0-0_2_beta3_fc12, openssl-1_0_0-0_3_beta3_fc12, openssl-1_0_0-0_6_beta3_fc12
File MIME type: text/x-patch 
* Thu Aug 20 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.1.beta3
- update to new major upstream release
1 Index: openssl/apps/apps.c
2 RCS File: /v/openssl/cvs/openssl/apps/apps.c,v
3 rcsdiff -q -kk '-r1.133.2.6' '-r1.133.2.7' -u '/v/openssl/cvs/openssl/apps/apps.c,v' 2>/dev/null
4 --- openssl/apps/apps.c 2009/06/29 16:09:58 1.133.2.6
5 +++ openssl/apps/apps.c 2009/07/27 21:08:43 1.133.2.7
6 @@ -1488,7 +1488,7 @@
7 return p;
8 }
9
10 -static unsigned long index_serial_hash(const CSTRING *a)
11 +static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
12 {
13 const char *n;
14
15 @@ -1497,7 +1497,7 @@
16 return(lh_strhash(n));
17 }
18
19 -static int index_serial_cmp(const CSTRING *a, const CSTRING *b)
20 +static int index_serial_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
21 {
22 const char *aa,*bb;
23
24 @@ -1509,16 +1509,16 @@
25 static int index_name_qual(char **a)
26 { return(a[0][0] == 'V'); }
27
28 -static unsigned long index_name_hash(const CSTRING *a)
29 +static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
30 { return(lh_strhash(a[DB_name])); }
31
32 -int index_name_cmp(const CSTRING *a, const CSTRING *b)
33 +int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
34 { return(strcmp(a[DB_name], b[DB_name])); }
35
36 -static IMPLEMENT_LHASH_HASH_FN(index_serial, CSTRING)
37 -static IMPLEMENT_LHASH_COMP_FN(index_serial, CSTRING)
38 -static IMPLEMENT_LHASH_HASH_FN(index_name, CSTRING)
39 -static IMPLEMENT_LHASH_COMP_FN(index_name, CSTRING)
40 +static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
41 +static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
42 +static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
43 +static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
44
45 #undef BSIZE
46 #define BSIZE 256
47 Index: openssl/apps/apps.h
48 RCS File: /v/openssl/cvs/openssl/apps/apps.h,v
49 rcsdiff -q -kk '-r1.91' '-r1.91.2.1' -u '/v/openssl/cvs/openssl/apps/apps.h,v' 2>/dev/null
50 --- openssl/apps/apps.h 2008/11/24 17:27:05 1.91
51 +++ openssl/apps/apps.h 2009/07/27 21:08:44 1.91.2.1
52 @@ -295,9 +295,9 @@
53 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
54 void free_index(CA_DB *db);
55 #define index_name_cmp_noconst(a, b) \
56 - index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
57 - (const CSTRING *)CHECKED_PTR_OF(STRING, b))
58 -int index_name_cmp(const CSTRING *a, const CSTRING *b);
59 + index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
60 + (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
61 +int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
62 int parse_yesno(const char *str, int def);
63
64 X509_NAME *parse_name(char *str, long chtype, int multirdn);
65 Index: openssl/apps/asn1pars.c
66 RCS File: /v/openssl/cvs/openssl/apps/asn1pars.c,v
67 rcsdiff -q -kk '-r1.26' '-r1.26.2.1' -u '/v/openssl/cvs/openssl/apps/asn1pars.c,v' 2>/dev/null
68 --- openssl/apps/asn1pars.c 2008/11/05 18:38:51 1.26
69 +++ openssl/apps/asn1pars.c 2009/07/27 21:08:44 1.26.2.1
70 @@ -96,7 +96,7 @@
71 unsigned char *tmpbuf;
72 const unsigned char *ctmpbuf;
73 BUF_MEM *buf=NULL;
74 - STACK_OF(STRING) *osk=NULL;
75 + STACK_OF(OPENSSL_STRING) *osk=NULL;
76 ASN1_TYPE *at=NULL;
77
78 informat=FORMAT_PEM;
79 @@ -113,7 +113,7 @@
80 prog=argv[0];
81 argc--;
82 argv++;
83 - if ((osk=sk_STRING_new_null()) == NULL)
84 + if ((osk=sk_OPENSSL_STRING_new_null()) == NULL)
85 {
86 BIO_printf(bio_err,"Memory allocation failure\n");
87 goto end;
88 @@ -169,7 +169,7 @@
89 else if (strcmp(*argv,"-strparse") == 0)
90 {
91 if (--argc < 1) goto bad;
92 - sk_STRING_push(osk,*(++argv));
93 + sk_OPENSSL_STRING_push(osk,*(++argv));
94 }
95 else if (strcmp(*argv,"-genstr") == 0)
96 {
97 @@ -302,18 +302,18 @@
98
99 /* If any structs to parse go through in sequence */
100
101 - if (sk_STRING_num(osk))
102 + if (sk_OPENSSL_STRING_num(osk))
103 {
104 tmpbuf=(unsigned char *)str;
105 tmplen=num;
106 - for (i=0; i<sk_STRING_num(osk); i++)
107 + for (i=0; i<sk_OPENSSL_STRING_num(osk); i++)
108 {
109 ASN1_TYPE *atmp;
110 int typ;
111 - j=atoi(sk_STRING_value(osk,i));
112 + j=atoi(sk_OPENSSL_STRING_value(osk,i));
113 if (j == 0)
114 {
115 - BIO_printf(bio_err,"'%s' is an invalid number\n",sk_STRING_value(osk,i));
116 + BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i));
117 continue;
118 }
119 tmpbuf+=j;
120 @@ -378,7 +378,7 @@
121 ERR_print_errors(bio_err);
122 if (buf != NULL) BUF_MEM_free(buf);
123 if (at != NULL) ASN1_TYPE_free(at);
124 - if (osk != NULL) sk_STRING_free(osk);
125 + if (osk != NULL) sk_OPENSSL_STRING_free(osk);
126 OBJ_cleanup();
127 apps_shutdown();
128 OPENSSL_EXIT(ret);
129 Index: openssl/apps/ca.c
130 RCS File: /v/openssl/cvs/openssl/apps/ca.c,v
131 rcsdiff -q -kk '-r1.167' '-r1.167.2.1' -u '/v/openssl/cvs/openssl/apps/ca.c,v' 2>/dev/null
132 --- openssl/apps/ca.c 2009/03/09 13:59:07 1.167
133 +++ openssl/apps/ca.c 2009/07/27 21:08:44 1.167.2.1
134 @@ -883,9 +883,9 @@
135 if (db == NULL) goto err;
136
137 /* Lets check some fields */
138 - for (i=0; i<sk_PSTRING_num(db->db->data); i++)
139 + for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
140 {
141 - pp=sk_PSTRING_value(db->db->data,i);
142 + pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
143 if ((pp[DB_type][0] != DB_TYPE_REV) &&
144 (pp[DB_rev_date][0] != '\0'))
145 {
146 @@ -938,7 +938,7 @@
147 #endif
148 TXT_DB_write(out,db->db);
149 BIO_printf(bio_err,"%d entries loaded from the database\n",
150 - sk_PSTRING_num(db->db->data));
151 + sk_OPENSSL_PSTRING_num(db->db->data));
152 BIO_printf(bio_err,"generating index\n");
153 }
154
155 @@ -1408,9 +1408,9 @@
156
157 ASN1_TIME_free(tmptm);
158
159 - for (i=0; i<sk_PSTRING_num(db->db->data); i++)
160 + for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
161 {
162 - pp=sk_PSTRING_value(db->db->data,i);
163 + pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
164 if (pp[DB_type][0] == DB_TYPE_REV)
165 {
166 if ((r=X509_REVOKED_new()) == NULL) goto err;
167 @@ -1685,9 +1685,9 @@
168 int ok= -1,i,j,last,nid;
169 const char *p;
170 CONF_VALUE *cv;
171 - STRING row[DB_NUMBER];
172 - STRING *irow=NULL;
173 - STRING *rrow=NULL;
174 + OPENSSL_STRING row[DB_NUMBER];
175 + OPENSSL_STRING *irow=NULL;
176 + OPENSSL_STRING *rrow=NULL;
177 char buf[25];
178
179 tmptm=ASN1_UTCTIME_new();
180 @@ -1929,7 +1929,7 @@
181
182 if (db->attributes.unique_subject)
183 {
184 - STRING *crow=row;
185 + OPENSSL_STRING *crow=row;
186
187 rrow=TXT_DB_get_by_index(db->db,DB_name,crow);
188 if (rrow != NULL)
189 @@ -2632,9 +2632,9 @@
190 else
191 a_y2k = 0;
192
193 - for (i = 0; i < sk_PSTRING_num(db->db->data); i++)
194 + for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++)
195 {
196 - rrow = sk_PSTRING_value(db->db->data, i);
197 + rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
198
199 if (rrow[DB_type][0] == 'V')
200 {
201 Index: openssl/apps/cms.c
202 RCS File: /v/openssl/cvs/openssl/apps/cms.c,v
203 rcsdiff -q -kk '-r1.23.2.1' '-r1.23.2.2' -u '/v/openssl/cvs/openssl/apps/cms.c,v' 2>/dev/null
204 --- openssl/apps/cms.c 2009/04/16 17:22:47 1.23.2.1
205 +++ openssl/apps/cms.c 2009/07/27 21:08:44 1.23.2.2
206 @@ -71,9 +71,9 @@
207 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
208 static int cms_cb(int ok, X509_STORE_CTX *ctx);
209 static void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
210 -static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
211 +static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
212 int rr_allorfirst,
213 - STACK_OF(STRING) *rr_from);
214 + STACK_OF(OPENSSL_STRING) *rr_from);
215
216 #define SMIME_OP 0x10
217 #define SMIME_IP 0x20
218 @@ -108,7 +108,7 @@
219 const char *inmode = "r", *outmode = "w";
220 char *infile = NULL, *outfile = NULL, *rctfile = NULL;
221 char *signerfile = NULL, *recipfile = NULL;
222 - STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
223 + STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
224 char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
225 char *certsoutfile = NULL;
226 const EVP_CIPHER *cipher = NULL;
227 @@ -122,7 +122,7 @@
228 int flags = CMS_DETACHED, noout = 0, print = 0;
229 int verify_retcode = 0;
230 int rr_print = 0, rr_allorfirst = -1;
231 - STACK_OF(STRING) *rr_to = NULL, *rr_from = NULL;
232 + STACK_OF(OPENSSL_STRING) *rr_to = NULL, *rr_from = NULL;
233 CMS_ReceiptRequest *rr = NULL;
234 char *to = NULL, *from = NULL, *subject = NULL;
235 char *CAfile = NULL, *CApath = NULL;
236 @@ -281,8 +281,8 @@
237 goto argerr;
238 args++;
239 if (!rr_from)
240 - rr_from = sk_STRING_new_null();
241 - sk_STRING_push(rr_from, *args);
242 + rr_from = sk_OPENSSL_STRING_new_null();
243 + sk_OPENSSL_STRING_push(rr_from, *args);
244 }
245 else if (!strcmp(*args,"-receipt_request_to"))
246 {
247 @@ -290,8 +290,8 @@
248 goto argerr;
249 args++;
250 if (!rr_to)
251 - rr_to = sk_STRING_new_null();
252 - sk_STRING_push(rr_to, *args);
253 + rr_to = sk_OPENSSL_STRING_new_null();
254 + sk_OPENSSL_STRING_push(rr_to, *args);
255 }
256 else if (!strcmp (*args, "-print"))
257 {
258 @@ -387,13 +387,13 @@
259 if (signerfile)
260 {
261 if (!sksigners)
262 - sksigners = sk_STRING_new_null();
263 - sk_STRING_push(sksigners, signerfile);
264 + sksigners = sk_OPENSSL_STRING_new_null();
265 + sk_OPENSSL_STRING_push(sksigners, signerfile);
266 if (!keyfile)
267 keyfile = signerfile;
268 if (!skkeys)
269 - skkeys = sk_STRING_new_null();
270 - sk_STRING_push(skkeys, keyfile);
271 + skkeys = sk_OPENSSL_STRING_new_null();
272 + sk_OPENSSL_STRING_push(skkeys, keyfile);
273 keyfile = NULL;
274 }
275 signerfile = *++args;
276 @@ -435,12 +435,12 @@
277 goto argerr;
278 }
279 if (!sksigners)
280 - sksigners = sk_STRING_new_null();
281 - sk_STRING_push(sksigners, signerfile);
282 + sksigners = sk_OPENSSL_STRING_new_null();
283 + sk_OPENSSL_STRING_push(sksigners, signerfile);
284 signerfile = NULL;
285 if (!skkeys)
286 - skkeys = sk_STRING_new_null();
287 - sk_STRING_push(skkeys, keyfile);
288 + skkeys = sk_OPENSSL_STRING_new_null();
289 + sk_OPENSSL_STRING_push(skkeys, keyfile);
290 }
291 keyfile = *++args;
292 }
293 @@ -539,13 +539,13 @@
294 if (signerfile)
295 {
296 if (!sksigners)
297 - sksigners = sk_STRING_new_null();
298 - sk_STRING_push(sksigners, signerfile);
299 + sksigners = sk_OPENSSL_STRING_new_null();
300 + sk_OPENSSL_STRING_push(sksigners, signerfile);
301 if (!skkeys)
302 - skkeys = sk_STRING_new_null();
303 + skkeys = sk_OPENSSL_STRING_new_null();
304 if (!keyfile)
305 keyfile = signerfile;
306 - sk_STRING_push(skkeys, keyfile);
307 + sk_OPENSSL_STRING_push(skkeys, keyfile);
308 }
309 if (!sksigners)
310 {
311 @@ -980,11 +980,11 @@
312 }
313 else
314 flags |= CMS_REUSE_DIGEST;
315 - for (i = 0; i < sk_STRING_num(sksigners); i++)
316 + for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
317 {
318 CMS_SignerInfo *si;
319 - signerfile = sk_STRING_value(sksigners, i);
320 - keyfile = sk_STRING_value(skkeys, i);
321 + signerfile = sk_OPENSSL_STRING_value(sksigners, i);
322 + keyfile = sk_OPENSSL_STRING_value(skkeys, i);
323 signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
324 e, "signer certificate");
325 if (!signer)
326 @@ -1160,9 +1160,9 @@
327 if (vpm)
328 X509_VERIFY_PARAM_free(vpm);
329 if (sksigners)
330 - sk_STRING_free(sksigners);
331 + sk_OPENSSL_STRING_free(sksigners);
332 if (skkeys)
333 - sk_STRING_free(skkeys);
334 + sk_OPENSSL_STRING_free(skkeys);
335 if (secret_key)
336 OPENSSL_free(secret_key);
337 if (secret_keyid)
338 @@ -1172,9 +1172,9 @@
339 if (rr)
340 CMS_ReceiptRequest_free(rr);
341 if (rr_to)
342 - sk_STRING_free(rr_to);
343 + sk_OPENSSL_STRING_free(rr_to);
344 if (rr_from)
345 - sk_STRING_free(rr_from);
346 + sk_OPENSSL_STRING_free(rr_from);
347 X509_STORE_free(store);
348 X509_free(cert);
349 X509_free(recip);
350 @@ -1296,7 +1296,7 @@
351 }
352 }
353
354 -static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(STRING) *ns)
355 +static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
356 {
357 int i;
358 STACK_OF(GENERAL_NAMES) *ret;
359 @@ -1305,9 +1305,9 @@
360 ret = sk_GENERAL_NAMES_new_null();
361 if (!ret)
362 goto err;
363 - for (i = 0; i < sk_STRING_num(ns); i++)
364 + for (i = 0; i < sk_OPENSSL_STRING_num(ns); i++)
365 {
366 - char *str = sk_STRING_value(ns, i);
367 + char *str = sk_OPENSSL_STRING_value(ns, i);
368 gen = a2i_GENERAL_NAME(NULL, NULL, NULL, GEN_EMAIL, str, 0);
369 if (!gen)
370 goto err;
371 @@ -1335,9 +1335,9 @@
372 }
373
374
375 -static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
376 +static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
377 int rr_allorfirst,
378 - STACK_OF(STRING) *rr_from)
379 + STACK_OF(OPENSSL_STRING) *rr_from)
380 {
381 STACK_OF(GENERAL_NAMES) *rct_to, *rct_from;
382 CMS_ReceiptRequest *rr;
383 Index: openssl/apps/crl2p7.c
384 RCS File: /v/openssl/cvs/openssl/apps/crl2p7.c,v
385 rcsdiff -q -kk '-r1.19' '-r1.19.2.1' -u '/v/openssl/cvs/openssl/apps/crl2p7.c,v' 2>/dev/null
386 --- openssl/apps/crl2p7.c 2008/06/04 11:00:45 1.19
387 +++ openssl/apps/crl2p7.c 2009/07/27 21:08:45 1.19.2.1
388 @@ -92,7 +92,7 @@
389 PKCS7 *p7 = NULL;
390 PKCS7_SIGNED *p7s = NULL;
391 X509_CRL *crl=NULL;
392 - STACK_OF(STRING) *certflst=NULL;
393 + STACK_OF(OPENSSL_STRING) *certflst=NULL;
394 STACK_OF(X509_CRL) *crl_stack=NULL;
395 STACK_OF(X509) *cert_stack=NULL;
396 int ret=1,nocrl=0;
397 @@ -140,8 +140,8 @@
398 else if (strcmp(*argv,"-certfile") == 0)
399 {
400 if (--argc < 1) goto bad;
401 - if(!certflst) certflst = sk_STRING_new_null();
402 - sk_STRING_push(certflst,*(++argv));
403 + if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
404 + sk_OPENSSL_STRING_push(certflst,*(++argv));
405 }
406 else
407 {
408 @@ -226,8 +226,8 @@
409 if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
410 p7s->cert=cert_stack;
411
412 - if(certflst) for(i = 0; i < sk_STRING_num(certflst); i++) {
413 - certfile = sk_STRING_value(certflst, i);
414 + if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
415 + certfile = sk_OPENSSL_STRING_value(certflst, i);
416 if (add_certs_from_file(cert_stack,certfile) < 0)
417 {
418 BIO_printf(bio_err, "error loading certificates\n");
419 @@ -236,7 +236,7 @@
420 }
421 }
422
423 - sk_STRING_free(certflst);
424 + sk_OPENSSL_STRING_free(certflst);
425
426 if (outfile == NULL)
427 {
428 Index: openssl/apps/dgst.c
429 RCS File: /v/openssl/cvs/openssl/apps/dgst.c,v
430 rcsdiff -q -kk '-r1.54.2.3' '-r1.54.2.4' -u '/v/openssl/cvs/openssl/apps/dgst.c,v' 2>/dev/null
431 --- openssl/apps/dgst.c 2009/04/26 12:16:12 1.54.2.3
432 +++ openssl/apps/dgst.c 2009/07/27 21:08:45 1.54.2.4
433 @@ -127,7 +127,7 @@
434 #endif
435 char *hmac_key=NULL;
436 char *mac_name=NULL;
437 - STACK_OF(STRING) *sigopts = NULL, *macopts = NULL;
438 + STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
439
440 apps_startup();
441
442 @@ -230,8 +230,8 @@
443 if (--argc < 1)
444 break;
445 if (!sigopts)
446 - sigopts = sk_STRING_new_null();
447 - if (!sigopts || !sk_STRING_push(sigopts, *(++argv)))
448 + sigopts = sk_OPENSSL_STRING_new_null();
449 + if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
450 break;
451 }
452 else if (strcmp(*argv,"-macopt") == 0)
453 @@ -239,8 +239,8 @@
454 if (--argc < 1)
455 break;
456 if (!macopts)
457 - macopts = sk_STRING_new_null();
458 - if (!macopts || !sk_STRING_push(macopts, *(++argv)))
459 + macopts = sk_OPENSSL_STRING_new_null();
460 + if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
461 break;
462 }
463 else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
464 @@ -365,9 +365,9 @@
465 if (macopts)
466 {
467 char *macopt;
468 - for (i = 0; i < sk_STRING_num(macopts); i++)
469 + for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++)
470 {
471 - macopt = sk_STRING_value(macopts, i);
472 + macopt = sk_OPENSSL_STRING_value(macopts, i);
473 if (pkey_ctrl_string(mac_ctx, macopt) <= 0)
474 {
475 BIO_printf(bio_err,
476 @@ -424,9 +424,9 @@
477 if (sigopts)
478 {
479 char *sigopt;
480 - for (i = 0; i < sk_STRING_num(sigopts); i++)
481 + for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++)
482 {
483 - sigopt = sk_STRING_value(sigopts, i);
484 + sigopt = sk_OPENSSL_STRING_value(sigopts, i);
485 if (pkey_ctrl_string(pctx, sigopt) <= 0)
486 {
487 BIO_printf(bio_err,
488 @@ -531,9 +531,9 @@
489 BIO_free_all(out);
490 EVP_PKEY_free(sigkey);
491 if (sigopts)
492 - sk_STRING_free(sigopts);
493 + sk_OPENSSL_STRING_free(sigopts);
494 if (macopts)
495 - sk_STRING_free(macopts);
496 + sk_OPENSSL_STRING_free(macopts);
497 if(sigbuf) OPENSSL_free(sigbuf);
498 if (bmd != NULL) BIO_free(bmd);
499 apps_shutdown();
500 Index: openssl/apps/engine.c
501 RCS File: /v/openssl/cvs/openssl/apps/engine.c,v
502 rcsdiff -q -kk '-r1.34' '-r1.34.2.1' -u '/v/openssl/cvs/openssl/apps/engine.c,v' 2>/dev/null
503 --- openssl/apps/engine.c 2009/02/15 15:29:59 1.34
504 +++ openssl/apps/engine.c 2009/07/27 21:08:45 1.34.2.1
505 @@ -200,7 +200,7 @@
506 char *desc = NULL;
507 int flags;
508 int xpos = 0;
509 - STACK_OF(STRING) *cmds = NULL;
510 + STACK_OF(OPENSSL_STRING) *cmds = NULL;
511 if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
512 ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
513 0, NULL, NULL)) <= 0))
514 @@ -211,7 +211,7 @@
515 return 1;
516 }
517
518 - cmds = sk_STRING_new_null();
519 + cmds = sk_OPENSSL_STRING_new_null();
520
521 if(!cmds)
522 goto err;
523 @@ -284,16 +284,16 @@
524 BIO_printf(bio_out, "\n");
525 ret = 1;
526 err:
527 - if(cmds) sk_STRING_pop_free(cmds, identity);
528 + if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity);
529 if(name) OPENSSL_free(name);
530 if(desc) OPENSSL_free(desc);
531 return ret;
532 }
533
534 -static void util_do_cmds(ENGINE *e, STACK_OF(STRING) *cmds, BIO *bio_out,
535 - const char *indent)
536 +static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
537 + BIO *bio_out, const char *indent)
538 {
539 - int loop, res, num = sk_STRING_num(cmds);
540 + int loop, res, num = sk_OPENSSL_STRING_num(cmds);
541
542 if(num < 0)
543 {
544 @@ -304,7 +304,7 @@
545 {
546 char buf[256];
547 const char *cmd, *arg;
548 - cmd = sk_STRING_value(cmds, loop);
549 + cmd = sk_OPENSSL_STRING_value(cmds, loop);
550 res = 1; /* assume success */
551 /* Check if this command has no ":arg" */
552 if((arg = strstr(cmd, ":")) == NULL)
553 @@ -344,9 +344,9 @@
554 const char **pp;
555 int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
556 ENGINE *e;
557 - STACK_OF(STRING) *engines = sk_STRING_new_null();
558 - STACK_OF(STRING) *pre_cmds = sk_STRING_new_null();
559 - STACK_OF(STRING) *post_cmds = sk_STRING_new_null();
560 + STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
561 + STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
562 + STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
563 int badops=1;
564 BIO *bio_out=NULL;
565 const char *indent = " ";
566 @@ -393,20 +393,20 @@
567 argc--; argv++;
568 if (argc == 0)
569 goto skip_arg_loop;
570 - sk_STRING_push(pre_cmds,*argv);
571 + sk_OPENSSL_STRING_push(pre_cmds,*argv);
572 }
573 else if (strcmp(*argv,"-post") == 0)
574 {
575 argc--; argv++;
576 if (argc == 0)
577 goto skip_arg_loop;
578 - sk_STRING_push(post_cmds,*argv);
579 + sk_OPENSSL_STRING_push(post_cmds,*argv);
580 }
581 else if ((strncmp(*argv,"-h",2) == 0) ||
582 (strcmp(*argv,"-?") == 0))
583 goto skip_arg_loop;
584 else
585 - sk_STRING_push(engines,*argv);
586 + sk_OPENSSL_STRING_push(engines,*argv);
587 argc--;
588 argv++;
589 }
590 @@ -421,17 +421,17 @@
591 goto end;
592 }
593
594 - if (sk_STRING_num(engines) == 0)
595 + if (sk_OPENSSL_STRING_num(engines) == 0)
596 {
597 for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
598 {
599 - sk_STRING_push(engines,(char *)ENGINE_get_id(e));
600 + sk_OPENSSL_STRING_push(engines,(char *)ENGINE_get_id(e));
601 }
602 }
603
604 - for (i=0; i<sk_STRING_num(engines); i++)
605 + for (i=0; i<sk_OPENSSL_STRING_num(engines); i++)
606 {
607 - const char *id = sk_STRING_value(engines,i);
608 + const char *id = sk_OPENSSL_STRING_value(engines,i);
609 if ((e = ENGINE_by_id(id)) != NULL)
610 {
611 const char *name = ENGINE_get_name(e);
612 @@ -533,9 +533,9 @@
613 end:
614
615 ERR_print_errors(bio_err);
616 - sk_STRING_pop_free(engines, identity);
617 - sk_STRING_pop_free(pre_cmds, identity);
618 - sk_STRING_pop_free(post_cmds, identity);
619 + sk_OPENSSL_STRING_pop_free(engines, identity);
620 + sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
621 + sk_OPENSSL_STRING_pop_free(post_cmds, identity);
622 if (bio_out != NULL) BIO_free_all(bio_out);
623 apps_shutdown();
624 OPENSSL_EXIT(ret);
625 Index: openssl/apps/ocsp.c
626 RCS File: /v/openssl/cvs/openssl/apps/ocsp.c,v
627 rcsdiff -q -kk '-r1.54.2.1' '-r1.54.2.2' -u '/v/openssl/cvs/openssl/apps/ocsp.c,v' 2>/dev/null
628 --- openssl/apps/ocsp.c 2009/04/02 15:19:03 1.54.2.1
629 +++ openssl/apps/ocsp.c 2009/07/27 21:08:45 1.54.2.2
630 @@ -99,7 +99,7 @@
631 static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD * cert_id_md, X509 *issuer,
632 STACK_OF(OCSP_CERTID) *ids);
633 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
634 - STACK_OF(STRING) *names,
635 + STACK_OF(OPENSSL_STRING) *names,
636 STACK_OF(OCSP_CERTID) *ids, long nsec,
637 long maxage);
638
639 @@ -153,7 +153,7 @@
640 int badarg = 0;
641 int i;
642 int ignore_err = 0;
643 - STACK_OF(STRING) *reqnames = NULL;
644 + STACK_OF(OPENSSL_STRING) *reqnames = NULL;
645 STACK_OF(OCSP_CERTID) *ids = NULL;
646
647 X509 *rca_cert = NULL;
648 @@ -170,7 +170,7 @@
649 SSL_load_error_strings();
650 OpenSSL_add_ssl_algorithms();
651 args = argv + 1;
652 - reqnames = sk_STRING_new_null();
653 + reqnames = sk_OPENSSL_STRING_new_null();
654 ids = sk_OCSP_CERTID_new_null();
655 while (!badarg && *args && *args[0] == '-')
656 {
657 @@ -432,7 +432,7 @@
658 if (!cert_id_md) cert_id_md = EVP_sha1();
659 if(!add_ocsp_cert(&req, cert, cert_id_md, issuer, ids))
660 goto end;
661 - if(!sk_STRING_push(reqnames, *args))
662 + if(!sk_OPENSSL_STRING_push(reqnames, *args))
663 goto end;
664 }
665 else badarg = 1;
666 @@ -445,7 +445,7 @@
667 if (!cert_id_md) cert_id_md = EVP_sha1();
668 if(!add_ocsp_serial(&req, *args, cert_id_md, issuer, ids))
669 goto end;
670 - if(!sk_STRING_push(reqnames, *args))
671 + if(!sk_OPENSSL_STRING_push(reqnames, *args))
672 goto end;
673 }
674 else badarg = 1;
675 @@ -901,7 +901,7 @@
676 OCSP_REQUEST_free(req);
677 OCSP_RESPONSE_free(resp);
678 OCSP_BASICRESP_free(bs);
679 - sk_STRING_free(reqnames);
680 + sk_OPENSSL_STRING_free(reqnames);
681 sk_OCSP_CERTID_free(ids);
682 sk_X509_pop_free(sign_other, X509_free);
683 sk_X509_pop_free(verify_other, X509_free);
684 @@ -971,7 +971,7 @@
685 }
686
687 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
688 - STACK_OF(STRING) *names,
689 + STACK_OF(OPENSSL_STRING) *names,
690 STACK_OF(OCSP_CERTID) *ids, long nsec,
691 long maxage)
692 {
693 @@ -983,13 +983,13 @@
694
695 ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
696
697 - if (!bs || !req || !sk_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
698 + if (!bs || !req || !sk_OPENSSL_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
699 return 1;
700
701 for (i = 0; i < sk_OCSP_CERTID_num(ids); i++)
702 {
703 id = sk_OCSP_CERTID_value(ids, i);
704 - name = sk_STRING_value(names, i);
705 + name = sk_OPENSSL_STRING_value(names, i);
706 BIO_printf(out, "%s: ", name);
707
708 if(!OCSP_resp_find_status(bs, id, &status, &reason,
709 Index: openssl/apps/pkcs12.c
710 RCS File: /v/openssl/cvs/openssl/apps/pkcs12.c,v
711 rcsdiff -q -kk '-r1.92.2.1' '-r1.92.2.2' -u '/v/openssl/cvs/openssl/apps/pkcs12.c,v' 2>/dev/null
712 --- openssl/apps/pkcs12.c 2009/06/17 12:05:49 1.92.2.1
713 +++ openssl/apps/pkcs12.c 2009/07/27 21:08:45 1.92.2.2
714 @@ -117,7 +117,7 @@
715 int ret = 1;
716 int macver = 1;
717 int noprompt = 0;
718 - STACK_OF(STRING) *canames = NULL;
719 + STACK_OF(OPENSSL_STRING) *canames = NULL;
720 char *cpass = NULL, *mpass = NULL;
721 char *passargin = NULL, *passargout = NULL, *passarg = NULL;
722 char *passin = NULL, *passout = NULL;
723 @@ -222,8 +222,8 @@
724 } else if (!strcmp (*args, "-caname")) {
725 if (args[1]) {
726 args++;
727 - if (!canames) canames = sk_STRING_new_null();
728 - sk_STRING_push(canames, *args);
729 + if (!canames) canames = sk_OPENSSL_STRING_new_null();
730 + sk_OPENSSL_STRING_push(canames, *args);
731 } else badarg = 1;
732 } else if (!strcmp (*args, "-in")) {
733 if (args[1]) {
734 @@ -549,9 +549,9 @@
735
736 /* Add any CA names */
737
738 - for (i = 0; i < sk_STRING_num(canames); i++)
739 + for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++)
740 {
741 - catmp = (unsigned char *)sk_STRING_value(canames, i);
742 + catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
743 X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
744 }
745
746 @@ -687,7 +687,7 @@
747 #endif
748 BIO_free(in);
749 BIO_free_all(out);
750 - if (canames) sk_STRING_free(canames);
751 + if (canames) sk_OPENSSL_STRING_free(canames);
752 if(passin) OPENSSL_free(passin);
753 if(passout) OPENSSL_free(passout);
754 apps_shutdown();
755 Index: openssl/apps/req.c
756 RCS File: /v/openssl/cvs/openssl/apps/req.c,v
757 rcsdiff -q -kk '-r1.139.2.2' '-r1.139.2.3' -u '/v/openssl/cvs/openssl/apps/req.c,v' 2>/dev/null
758 --- openssl/apps/req.c 2009/04/23 17:16:38 1.139.2.2
759 +++ openssl/apps/req.c 2009/07/27 21:08:45 1.139.2.3
760 @@ -165,7 +165,7 @@
761 EVP_PKEY_CTX *genctx = NULL;
762 const char *keyalg = NULL;
763 char *keyalgstr = NULL;
764 - STACK_OF(STRING) *pkeyopts = NULL;
765 + STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
766 EVP_PKEY *pkey=NULL;
767 int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
768 long newkey = -1;
769 @@ -306,8 +306,8 @@
770 if (--argc < 1)
771 goto bad;
772 if (!pkeyopts)
773 - pkeyopts = sk_STRING_new_null();
774 - if (!pkeyopts || !sk_STRING_push(pkeyopts, *(++argv)))
775 + pkeyopts = sk_OPENSSL_STRING_new_null();
776 + if (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, *(++argv)))
777 goto bad;
778 }
779 else if (strcmp(*argv,"-batch") == 0)
780 @@ -667,9 +667,9 @@
781 if (pkeyopts)
782 {
783 char *genopt;
784 - for (i = 0; i < sk_STRING_num(pkeyopts); i++)
785 + for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++)
786 {
787 - genopt = sk_STRING_value(pkeyopts, i);
788 + genopt = sk_OPENSSL_STRING_value(pkeyopts, i);
789 if (pkey_ctrl_string(genctx, genopt) <= 0)
790 {
791 BIO_printf(bio_err,
792 @@ -1083,7 +1083,7 @@
793 if (genctx)
794 EVP_PKEY_CTX_free(genctx);
795 if (pkeyopts)
796 - sk_STRING_free(pkeyopts);
797 + sk_OPENSSL_STRING_free(pkeyopts);
798 #ifndef OPENSSL_NO_ENGINE
799 if (gen_eng)
800 ENGINE_free(gen_eng);
801 Index: openssl/apps/s_server.c
802 RCS File: /v/openssl/cvs/openssl/apps/s_server.c,v
803 rcsdiff -q -kk '-r1.136.2.4' '-r1.136.2.5' -u '/v/openssl/cvs/openssl/apps/s_server.c,v' 2>/dev/null
804 --- openssl/apps/s_server.c 2009/06/30 16:10:24 1.136.2.4
805 +++ openssl/apps/s_server.c 2009/07/27 21:08:46 1.136.2.5
806 @@ -712,7 +712,7 @@
807 int use_ssl;
808 unsigned char *rspder = NULL;
809 int rspderlen;
810 - STACK_OF(STRING) *aia = NULL;
811 + STACK_OF(OPENSSL_STRING) *aia = NULL;
812 X509 *x = NULL;
813 X509_STORE_CTX inctx;
814 X509_OBJECT obj;
815 @@ -734,7 +734,7 @@
816 aia = X509_get1_ocsp(x);
817 if (aia)
818 {
819 - if (!OCSP_parse_url(sk_STRING_value(aia, 0),
820 + if (!OCSP_parse_url(sk_OPENSSL_STRING_value(aia, 0),
821 &host, &port, &path, &use_ssl))
822 {
823 BIO_puts(err, "cert_status: can't parse AIA URL\n");
824 @@ -742,7 +742,7 @@
825 }
826 if (srctx->verbose)
827 BIO_printf(err, "cert_status: AIA URL: %s\n",
828 - sk_STRING_value(aia, 0));
829 + sk_OPENSSL_STRING_value(aia, 0));
830 }
831 else
832 {
833 Index: openssl/apps/smime.c
834 RCS File: /v/openssl/cvs/openssl/apps/smime.c,v
835 rcsdiff -q -kk '-r1.69' '-r1.69.2.1' -u '/v/openssl/cvs/openssl/apps/smime.c,v' 2>/dev/null
836 --- openssl/apps/smime.c 2008/11/05 18:38:51 1.69
837 +++ openssl/apps/smime.c 2009/07/27 21:08:46 1.69.2.1
838 @@ -93,7 +93,7 @@
839 const char *inmode = "r", *outmode = "w";
840 char *infile = NULL, *outfile = NULL;
841 char *signerfile = NULL, *recipfile = NULL;
842 - STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
843 + STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
844 char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
845 const EVP_CIPHER *cipher = NULL;
846 PKCS7 *p7 = NULL;
847 @@ -260,13 +260,13 @@
848 if (signerfile)
849 {
850 if (!sksigners)
851 - sksigners = sk_STRING_new_null();
852 - sk_STRING_push(sksigners, signerfile);
853 + sksigners = sk_OPENSSL_STRING_new_null();
854 + sk_OPENSSL_STRING_push(sksigners, signerfile);
855 if (!keyfile)
856 keyfile = signerfile;
857 if (!skkeys)
858 - skkeys = sk_STRING_new_null();
859 - sk_STRING_push(skkeys, keyfile);
860 + skkeys = sk_OPENSSL_STRING_new_null();
861 + sk_OPENSSL_STRING_push(skkeys, keyfile);
862 keyfile = NULL;
863 }
864 signerfile = *++args;
865 @@ -302,12 +302,12 @@
866 goto argerr;
867 }
868 if (!sksigners)
869 - sksigners = sk_STRING_new_null();
870 - sk_STRING_push(sksigners, signerfile);
871 + sksigners = sk_OPENSSL_STRING_new_null();
872 + sk_OPENSSL_STRING_push(sksigners, signerfile);
873 signerfile = NULL;
874 if (!skkeys)
875 - skkeys = sk_STRING_new_null();
876 - sk_STRING_push(skkeys, keyfile);
877 + skkeys = sk_OPENSSL_STRING_new_null();
878 + sk_OPENSSL_STRING_push(skkeys, keyfile);
879 }
880 keyfile = *++args;
881 }
882 @@ -389,13 +389,13 @@
883 if (signerfile)
884 {
885 if (!sksigners)
886 - sksigners = sk_STRING_new_null();
887 - sk_STRING_push(sksigners, signerfile);
888 + sksigners = sk_OPENSSL_STRING_new_null();
889 + sk_OPENSSL_STRING_push(sksigners, signerfile);
890 if (!skkeys)
891 - skkeys = sk_STRING_new_null();
892 + skkeys = sk_OPENSSL_STRING_new_null();
893 if (!keyfile)
894 keyfile = signerfile;
895 - sk_STRING_push(skkeys, keyfile);
896 + sk_OPENSSL_STRING_push(skkeys, keyfile);
897 }
898 if (!sksigners)
899 {
900 @@ -707,10 +707,10 @@
901 }
902 else
903 flags |= PKCS7_REUSE_DIGEST;
904 - for (i = 0; i < sk_STRING_num(sksigners); i++)
905 + for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
906 {
907 - signerfile = sk_STRING_value(sksigners, i);
908 - keyfile = sk_STRING_value(skkeys, i);
909 + signerfile = sk_OPENSSL_STRING_value(sksigners, i);
910 + keyfile = sk_OPENSSL_STRING_value(skkeys, i);
911 signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
912 e, "signer certificate");
913 if (!signer)
914 @@ -807,9 +807,9 @@
915 if (vpm)
916 X509_VERIFY_PARAM_free(vpm);
917 if (sksigners)
918 - sk_STRING_free(sksigners);
919 + sk_OPENSSL_STRING_free(sksigners);
920 if (skkeys)
921 - sk_STRING_free(skkeys);
922 + sk_OPENSSL_STRING_free(skkeys);
923 X509_STORE_free(store);
924 X509_free(cert);
925 X509_free(recip);
926 Index: openssl/apps/x509.c
927 RCS File: /v/openssl/cvs/openssl/apps/x509.c,v
928 rcsdiff -q -kk '-r1.102.2.3' '-r1.102.2.4' -u '/v/openssl/cvs/openssl/apps/x509.c,v' 2>/dev/null
929 --- openssl/apps/x509.c 2009/07/14 15:14:39 1.102.2.3
930 +++ openssl/apps/x509.c 2009/07/27 21:08:46 1.102.2.4
931 @@ -738,14 +738,14 @@
932 else if ((email == i) || (ocsp_uri == i))
933 {
934 int j;
935 - STACK_OF(STRING) *emlst;
936 + STACK_OF(OPENSSL_STRING) *emlst;
937 if (email == i)
938 emlst = X509_get1_email(x);
939 else
940 emlst = X509_get1_ocsp(x);
941 - for (j = 0; j < sk_STRING_num(emlst); j++)
942 + for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
943 BIO_printf(STDout, "%s\n",
944 - sk_STRING_value(emlst, j));
945 + sk_OPENSSL_STRING_value(emlst, j));
946 X509_email_free(emlst);
947 }
948 else if (aliasout == i)
949 Index: openssl/crypto/cryptlib.c
950 RCS File: /v/openssl/cvs/openssl/crypto/cryptlib.c,v
951 rcsdiff -q -kk '-r1.75.2.2' '-r1.75.2.3' -u '/v/openssl/cvs/openssl/crypto/cryptlib.c,v' 2>/dev/null
952 --- openssl/crypto/cryptlib.c 2009/05/05 19:23:14 1.75.2.2
953 +++ openssl/crypto/cryptlib.c 2009/07/27 21:08:48 1.75.2.3
954 @@ -174,7 +174,7 @@
955
956 /* This is for applications to allocate new type names in the non-dynamic
957 array of lock names. These are numbered with positive numbers. */
958 -static STACK_OF(STRING) *app_locks=NULL;
959 +static STACK_OF(OPENSSL_STRING) *app_locks=NULL;
960
961 /* For applications that want a more dynamic way of handling threads, the
962 following stack is used. These are externally numbered with negative
963 @@ -210,7 +210,7 @@
964 SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
965 #endif
966
967 - if ((app_locks == NULL) && ((app_locks=sk_STRING_new_null()) == NULL))
968 + if ((app_locks == NULL) && ((app_locks=sk_OPENSSL_STRING_new_null()) == NULL))
969 {
970 CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
971 return(0);
972 @@ -220,7 +220,7 @@
973 CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
974 return(0);
975 }
976 - i=sk_STRING_push(app_locks,str);
977 + i=sk_OPENSSL_STRING_push(app_locks,str);
978 if (!i)
979 OPENSSL_free(str);
980 else
981 @@ -651,10 +651,10 @@
982 return("dynamic");
983 else if (type < CRYPTO_NUM_LOCKS)
984 return(lock_names[type]);
985 - else if (type-CRYPTO_NUM_LOCKS > sk_STRING_num(app_locks))
986 + else if (type-CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks))
987 return("ERROR");
988 else
989 - return(sk_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
990 + return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
991 }
992
993 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
994 Index: openssl/crypto/engine/eng_dyn.c
995 RCS File: /v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v
996 rcsdiff -q -kk '-r1.14' '-r1.14.2.1' -u '/v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v' 2>/dev/null
997 --- openssl/crypto/engine/eng_dyn.c 2008/06/04 11:01:29 1.14
998 +++ openssl/crypto/engine/eng_dyn.c 2009/07/27 21:08:49 1.14.2.1
999 @@ -146,7 +146,7 @@
1000 * 'dirs' for loading. Default is to use 'dirs' as a fallback. */
1001 int dir_load;
1002 /* A stack of directories from which ENGINEs could be loaded */
1003 - STACK_OF(STRING) *dirs;
1004 + STACK_OF(OPENSSL_STRING) *dirs;
1005 };
1006
1007 /* This is the "ex_data" index we obtain and reserve for use with our context
1008 @@ -174,7 +174,7 @@
1009 if(ctx->engine_id)
1010 OPENSSL_free((void*)ctx->engine_id);
1011 if(ctx->dirs)
1012 - sk_STRING_pop_free(ctx->dirs, int_free_str);
1013 + sk_OPENSSL_STRING_pop_free(ctx->dirs, int_free_str);
1014 OPENSSL_free(ctx);
1015 }
1016 }
1017 @@ -203,7 +203,7 @@
1018 c->DYNAMIC_F1 = "v_check";
1019 c->DYNAMIC_F2 = "bind_engine";
1020 c->dir_load = 1;
1021 - c->dirs = sk_STRING_new_null();
1022 + c->dirs = sk_OPENSSL_STRING_new_null();
1023 if(!c->dirs)
1024 {
1025 ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX,ERR_R_MALLOC_FAILURE);
1026 @@ -393,7 +393,7 @@
1027 ERR_R_MALLOC_FAILURE);
1028 return 0;
1029 }
1030 - sk_STRING_insert(ctx->dirs, tmp_str, -1);
1031 + sk_OPENSSL_STRING_insert(ctx->dirs, tmp_str, -1);
1032 }
1033 return 1;
1034 default:
1035 @@ -411,11 +411,11 @@
1036 ctx->DYNAMIC_LIBNAME, NULL, 0)) != NULL)
1037 return 1;
1038 /* If we're not allowed to use 'dirs' or we have none, fail */
1039 - if(!ctx->dir_load || (num = sk_STRING_num(ctx->dirs)) < 1)
1040 + if(!ctx->dir_load || (num = sk_OPENSSL_STRING_num(ctx->dirs)) < 1)
1041 return 0;
1042 for(loop = 0; loop < num; loop++)
1043 {
1044 - const char *s = sk_STRING_value(ctx->dirs, loop);
1045 + const char *s = sk_OPENSSL_STRING_value(ctx->dirs, loop);
1046 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s);
1047 if(!merge)
1048 return 0;
1049 Index: openssl/crypto/lhash/lhash.h
1050 RCS File: /v/openssl/cvs/openssl/crypto/lhash/lhash.h,v
1051 rcsdiff -q -kk '-r1.23' '-r1.23.2.1' -u '/v/openssl/cvs/openssl/crypto/lhash/lhash.h,v' 2>/dev/null
1052 --- openssl/crypto/lhash/lhash.h 2008/06/04 11:01:31 1.23
1053 +++ openssl/crypto/lhash/lhash.h 2009/07/27 21:08:50 1.23.2.1
1054 @@ -230,8 +230,8 @@
1055 lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
1056 #define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
1057
1058 -DECLARE_LHASH_OF(STRING);
1059 -DECLARE_LHASH_OF(CSTRING);
1060 +DECLARE_LHASH_OF(OPENSSL_STRING);
1061 +DECLARE_LHASH_OF(OPENSSL_CSTRING);
1062
1063 #ifdef __cplusplus
1064 }
1065 Index: openssl/crypto/stack/safestack.h
1066 RCS File: /v/openssl/cvs/openssl/crypto/stack/safestack.h,v
1067 rcsdiff -q -kk '-r1.72.2.3' '-r1.72.2.4' -u '/v/openssl/cvs/openssl/crypto/stack/safestack.h,v' 2>/dev/null
1068 --- openssl/crypto/stack/safestack.h 2009/04/28 21:56:04 1.72.2.3
1069 +++ openssl/crypto/stack/safestack.h 2009/07/27 21:08:50 1.72.2.4
1070 @@ -110,9 +110,9 @@
1071 * string. For now, I'm settling for dealing with the fact it is a
1072 * string at all.
1073 */
1074 -typedef char *STRING;
1075 +typedef char *OPENSSL_STRING;
1076
1077 -typedef const char *CSTRING;
1078 +typedef const char *OPENSSL_CSTRING;
1079
1080 /* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
1081 * STACK_OF(STRING) is really more like STACK_OF(char), only, as
1082 @@ -122,7 +122,7 @@
1083 * macros below.
1084 */
1085
1086 -DECLARE_SPECIAL_STACK_OF(STRING, char)
1087 +DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
1088
1089 /* Similarly, we sometimes use a block of characters, NOT
1090 * nul-terminated. These should also be distinguished from "normal"
1091 @@ -2030,29 +2030,29 @@
1092 #define sk_void_sort(st) SKM_sk_sort(void, (st))
1093 #define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
1094
1095 -#define sk_STRING_new(cmp) ((STACK_OF(STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
1096 -#define sk_STRING_new_null() ((STACK_OF(STRING) *)sk_new_null())
1097 -#define sk_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
1098 -#define sk_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
1099 -#define sk_STRING_value(st, i) ((STRING)sk_value(CHECKED_PTR_OF(STACK_OF(STRING), st), i))
1100 -#define sk_STRING_num(st) SKM_sk_num(STRING, st)
1101 -#define sk_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_FREE_FUNC2(STRING, free_func))
1102 -#define sk_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val), i)
1103 -#define sk_STRING_free(st) SKM_sk_free(STRING, st)
1104 -#define sk_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), i, CHECKED_PTR_OF(char, val))
1105 -#define sk_STRING_zero(st) SKM_sk_zero(STRING, (st))
1106 -#define sk_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
1107 -#define sk_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(STRING), st), CHECKED_CONST_PTR_OF(char, val))
1108 -#define sk_STRING_delete(st, i) SKM_sk_delete(STRING, (st), (i))
1109 -#define sk_STRING_delete_ptr(st, ptr) (STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, ptr))
1110 -#define sk_STRING_set_cmp_func(st, cmp) \
1111 +#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
1112 +#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
1113 +#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
1114 +#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
1115 +#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
1116 +#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
1117 +#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
1118 +#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
1119 +#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
1120 +#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
1121 +#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
1122 +#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
1123 +#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
1124 +#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
1125 +#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
1126 +#define sk_OPENSSL_STRING_set_cmp_func(st, cmp) \
1127 ((int (*)(const char * const *,const char * const *)) \
1128 - sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
1129 -#define sk_STRING_dup(st) SKM_sk_dup(STRING, st)
1130 -#define sk_STRING_shift(st) SKM_sk_shift(STRING, (st))
1131 -#define sk_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st))
1132 -#define sk_STRING_sort(st) SKM_sk_sort(STRING, (st))
1133 -#define sk_STRING_is_sorted(st) SKM_sk_is_sorted(STRING, (st))
1134 + sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
1135 +#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
1136 +#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
1137 +#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
1138 +#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
1139 +#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
1140
1141
1142 #define sk_BLOCK_new(cmp) ((STACK_OF(BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
1143 @@ -2080,29 +2080,29 @@
1144 #define sk_BLOCK_is_sorted(st) SKM_sk_is_sorted(BLOCK, (st))
1145
1146
1147 -#define sk_PSTRING_new(cmp) ((STACK_OF(PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(STRING, cmp)))
1148 -#define sk_PSTRING_new_null() ((STACK_OF(PSTRING) *)sk_new_null())
1149 -#define sk_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
1150 -#define sk_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
1151 -#define sk_PSTRING_value(st, i) ((PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(PSTRING), st), i))
1152 -#define sk_PSTRING_num(st) SKM_sk_num(PSTRING, st)
1153 -#define sk_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_FREE_FUNC2(PSTRING, free_func))
1154 -#define sk_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val), i)
1155 -#define sk_PSTRING_free(st) SKM_sk_free(PSTRING, st)
1156 -#define sk_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), i, CHECKED_PTR_OF(STRING, val))
1157 -#define sk_PSTRING_zero(st) SKM_sk_zero(PSTRING, (st))
1158 -#define sk_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
1159 -#define sk_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(PSTRING), st), CHECKED_CONST_PTR_OF(STRING, val))
1160 -#define sk_PSTRING_delete(st, i) SKM_sk_delete(PSTRING, (st), (i))
1161 -#define sk_PSTRING_delete_ptr(st, ptr) (PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, ptr))
1162 -#define sk_PSTRING_set_cmp_func(st, cmp) \
1163 - ((int (*)(const STRING * const *,const STRING * const *)) \
1164 - sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_CMP_FUNC(STRING, cmp)))
1165 -#define sk_PSTRING_dup(st) SKM_sk_dup(PSTRING, st)
1166 -#define sk_PSTRING_shift(st) SKM_sk_shift(PSTRING, (st))
1167 -#define sk_PSTRING_pop(st) (STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st))
1168 -#define sk_PSTRING_sort(st) SKM_sk_sort(PSTRING, (st))
1169 -#define sk_PSTRING_is_sorted(st) SKM_sk_is_sorted(PSTRING, (st))
1170 +#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
1171 +#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
1172 +#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
1173 +#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
1174 +#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i))
1175 +#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
1176 +#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
1177 +#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
1178 +#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
1179 +#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
1180 +#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
1181 +#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
1182 +#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
1183 +#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
1184 +#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
1185 +#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp) \
1186 + ((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
1187 + sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
1188 +#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
1189 +#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
1190 +#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st))
1191 +#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
1192 +#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
1193
1194
1195 #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
1196 @@ -2390,24 +2390,6 @@
1197 LHM_lh_stats_bio(CONF_VALUE,lh,out)
1198 #define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
1199
1200 -#define lh_CSTRING_new() LHM_lh_new(CSTRING,cstring)
1201 -#define lh_CSTRING_insert(lh,inst) LHM_lh_insert(CSTRING,lh,inst)
1202 -#define lh_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(CSTRING,lh,inst)
1203 -#define lh_CSTRING_delete(lh,inst) LHM_lh_delete(CSTRING,lh,inst)
1204 -#define lh_CSTRING_doall(lh,fn) LHM_lh_doall(CSTRING,lh,fn)
1205 -#define lh_CSTRING_doall_arg(lh,fn,arg_type,arg) \
1206 - LHM_lh_doall_arg(CSTRING,lh,fn,arg_type,arg)
1207 -#define lh_CSTRING_error(lh) LHM_lh_error(CSTRING,lh)
1208 -#define lh_CSTRING_num_items(lh) LHM_lh_num_items(CSTRING,lh)
1209 -#define lh_CSTRING_down_load(lh) LHM_lh_down_load(CSTRING,lh)
1210 -#define lh_CSTRING_node_stats_bio(lh,out) \
1211 - LHM_lh_node_stats_bio(CSTRING,lh,out)
1212 -#define lh_CSTRING_node_usage_stats_bio(lh,out) \
1213 - LHM_lh_node_usage_stats_bio(CSTRING,lh,out)
1214 -#define lh_CSTRING_stats_bio(lh,out) \
1215 - LHM_lh_stats_bio(CSTRING,lh,out)
1216 -#define lh_CSTRING_free(lh) LHM_lh_free(CSTRING,lh)
1217 -
1218 #define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
1219 #define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
1220 #define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
1221 @@ -2534,6 +2516,42 @@
1222 LHM_lh_stats_bio(OBJ_NAME,lh,out)
1223 #define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
1224
1225 +#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
1226 +#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
1227 +#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
1228 +#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
1229 +#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
1230 +#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
1231 + LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
1232 +#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
1233 +#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
1234 +#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
1235 +#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
1236 + LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
1237 +#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
1238 + LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
1239 +#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
1240 + LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
1241 +#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
1242 +
1243 +#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
1244 +#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
1245 +#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
1246 +#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
1247 +#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
1248 +#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
1249 + LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
1250 +#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
1251 +#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
1252 +#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
1253 +#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
1254 + LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
1255 +#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
1256 + LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
1257 +#define lh_OPENSSL_STRING_stats_bio(lh,out) \
1258 + LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
1259 +#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
1260 +
1261 #define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
1262 #define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
1263 #define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
1264 @@ -2551,24 +2569,6 @@
1265 #define lh_SSL_SESSION_stats_bio(lh,out) \
1266 LHM_lh_stats_bio(SSL_SESSION,lh,out)
1267 #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
1268 -
1269 -#define lh_STRING_new() LHM_lh_new(STRING,string)
1270 -#define lh_STRING_insert(lh,inst) LHM_lh_insert(STRING,lh,inst)
1271 -#define lh_STRING_retrieve(lh,inst) LHM_lh_retrieve(STRING,lh,inst)
1272 -#define lh_STRING_delete(lh,inst) LHM_lh_delete(STRING,lh,inst)
1273 -#define lh_STRING_doall(lh,fn) LHM_lh_doall(STRING,lh,fn)
1274 -#define lh_STRING_doall_arg(lh,fn,arg_type,arg) \
1275 - LHM_lh_doall_arg(STRING,lh,fn,arg_type,arg)
1276 -#define lh_STRING_error(lh) LHM_lh_error(STRING,lh)
1277 -#define lh_STRING_num_items(lh) LHM_lh_num_items(STRING,lh)
1278 -#define lh_STRING_down_load(lh) LHM_lh_down_load(STRING,lh)
1279 -#define lh_STRING_node_stats_bio(lh,out) \
1280 - LHM_lh_node_stats_bio(STRING,lh,out)
1281 -#define lh_STRING_node_usage_stats_bio(lh,out) \
1282 - LHM_lh_node_usage_stats_bio(STRING,lh,out)
1283 -#define lh_STRING_stats_bio(lh,out) \
1284 - LHM_lh_stats_bio(STRING,lh,out)
1285 -#define lh_STRING_free(lh) LHM_lh_free(STRING,lh)
1286 /* End of util/mkstack.pl block, you may now edit :-) */
1287
1288 #endif /* !defined HEADER_SAFESTACK_H */
1289 Index: openssl/crypto/txt_db/txt_db.c
1290 RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v
1291 rcsdiff -q -kk '-r1.25' '-r1.25.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v' 2>/dev/null
1292 --- openssl/crypto/txt_db/txt_db.c 2008/07/04 23:12:51 1.25
1293 +++ openssl/crypto/txt_db/txt_db.c 2009/07/27 21:08:51 1.25.2.1
1294 @@ -78,7 +78,7 @@
1295 int size=BUFSIZE;
1296 int offset=0;
1297 char *p,*f;
1298 - STRING *pp;
1299 + OPENSSL_STRING *pp;
1300 BUF_MEM *buf=NULL;
1301
1302 if ((buf=BUF_MEM_new()) == NULL) goto err;
1303 @@ -89,7 +89,7 @@
1304 ret->num_fields=num;
1305 ret->index=NULL;
1306 ret->qual=NULL;
1307 - if ((ret->data=sk_PSTRING_new_null()) == NULL)
1308 + if ((ret->data=sk_OPENSSL_PSTRING_new_null()) == NULL)
1309 goto err;
1310 if ((ret->index=OPENSSL_malloc(sizeof(*ret->index)*num)) == NULL)
1311 goto err;
1312 @@ -163,7 +163,7 @@
1313 goto err;
1314 }
1315 pp[n]=p;
1316 - if (!sk_PSTRING_push(ret->data,pp))
1317 + if (!sk_OPENSSL_PSTRING_push(ret->data,pp))
1318 {
1319 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
1320 fprintf(stderr,"failure in sk_push\n");
1321 @@ -182,7 +182,7 @@
1322 #endif
1323 if (ret != NULL)
1324 {
1325 - if (ret->data != NULL) sk_PSTRING_free(ret->data);
1326 + if (ret->data != NULL) sk_OPENSSL_PSTRING_free(ret->data);
1327 if (ret->index != NULL) OPENSSL_free(ret->index);
1328 if (ret->qual != NULL) OPENSSL_free(ret->qual);
1329 if (ret != NULL) OPENSSL_free(ret);
1330 @@ -193,10 +193,10 @@
1331 return(ret);
1332 }
1333
1334 -STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value)
1335 +OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
1336 {
1337 - STRING *ret;
1338 - LHASH_OF(STRING) *lh;
1339 + OPENSSL_STRING *ret;
1340 + LHASH_OF(OPENSSL_STRING) *lh;
1341
1342 if (idx >= db->num_fields)
1343 {
1344 @@ -209,16 +209,16 @@
1345 db->error=DB_ERROR_NO_INDEX;
1346 return(NULL);
1347 }
1348 - ret=lh_STRING_retrieve(lh,value);
1349 + ret=lh_OPENSSL_STRING_retrieve(lh,value);
1350 db->error=DB_ERROR_OK;
1351 return(ret);
1352 }
1353
1354 -int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(STRING *),
1355 +int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
1356 LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
1357 {
1358 - LHASH_OF(STRING) *idx;
1359 - STRING *r;
1360 + LHASH_OF(OPENSSL_STRING) *idx;
1361 + OPENSSL_STRING *r;
1362 int i,n;
1363
1364 if (field >= db->num_fields)
1365 @@ -227,26 +227,26 @@
1366 return(0);
1367 }
1368 /* FIXME: we lose type checking at this point */
1369 - if ((idx=(LHASH_OF(STRING) *)lh_new(hash,cmp)) == NULL)
1370 + if ((idx=(LHASH_OF(OPENSSL_STRING) *)lh_new(hash,cmp)) == NULL)
1371 {
1372 db->error=DB_ERROR_MALLOC;
1373 return(0);
1374 }
1375 - n=sk_PSTRING_num(db->data);
1376 + n=sk_OPENSSL_PSTRING_num(db->data);
1377 for (i=0; i<n; i++)
1378 {
1379 - r=sk_PSTRING_value(db->data,i);
1380 + r=sk_OPENSSL_PSTRING_value(db->data,i);
1381 if ((qual != NULL) && (qual(r) == 0)) continue;
1382 - if ((r=lh_STRING_insert(idx,r)) != NULL)
1383 + if ((r=lh_OPENSSL_STRING_insert(idx,r)) != NULL)
1384 {
1385 db->error=DB_ERROR_INDEX_CLASH;
1386 - db->arg1=sk_PSTRING_find(db->data,r);
1387 + db->arg1=sk_OPENSSL_PSTRING_find(db->data,r);
1388 db->arg2=i;
1389 - lh_STRING_free(idx);
1390 + lh_OPENSSL_STRING_free(idx);
1391 return(0);
1392 }
1393 }
1394 - if (db->index[field] != NULL) lh_STRING_free(db->index[field]);
1395 + if (db->index[field] != NULL) lh_OPENSSL_STRING_free(db->index[field]);
1396 db->index[field]=idx;
1397 db->qual[field]=qual;
1398 return(1);
1399 @@ -261,11 +261,11 @@
1400
1401 if ((buf=BUF_MEM_new()) == NULL)
1402 goto err;
1403 - n=sk_PSTRING_num(db->data);
1404 + n=sk_OPENSSL_PSTRING_num(db->data);
1405 nn=db->num_fields;
1406 for (i=0; i<n; i++)
1407 {
1408 - pp=sk_PSTRING_value(db->data,i);
1409 + pp=sk_OPENSSL_PSTRING_value(db->data,i);
1410
1411 l=0;
1412 for (j=0; j<nn; j++)
1413 @@ -300,10 +300,10 @@
1414 return(ret);
1415 }
1416
1417 -int TXT_DB_insert(TXT_DB *db, STRING *row)
1418 +int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
1419 {
1420 int i;
1421 - STRING *r;
1422 + OPENSSL_STRING *r;
1423
1424 for (i=0; i<db->num_fields; i++)
1425 {
1426 @@ -311,7 +311,7 @@
1427 {
1428 if ((db->qual[i] != NULL) &&
1429 (db->qual[i](row) == 0)) continue;
1430 - r=lh_STRING_retrieve(db->index[i],row);
1431 + r=lh_OPENSSL_STRING_retrieve(db->index[i],row);
1432 if (r != NULL)
1433 {
1434 db->error=DB_ERROR_INDEX_CLASH;
1435 @@ -322,7 +322,7 @@
1436 }
1437 }
1438 /* We have passed the index checks, now just append and insert */
1439 - if (!sk_PSTRING_push(db->data,row))
1440 + if (!sk_OPENSSL_PSTRING_push(db->data,row))
1441 {
1442 db->error=DB_ERROR_MALLOC;
1443 goto err;
1444 @@ -334,7 +334,7 @@
1445 {
1446 if ((db->qual[i] != NULL) &&
1447 (db->qual[i](row) == 0)) continue;
1448 - (void)lh_STRING_insert(db->index[i],row);
1449 + (void)lh_OPENSSL_STRING_insert(db->index[i],row);
1450 }
1451 }
1452 return(1);
1453 @@ -353,18 +353,18 @@
1454 if (db->index != NULL)
1455 {
1456 for (i=db->num_fields-1; i>=0; i--)
1457 - if (db->index[i] != NULL) lh_STRING_free(db->index[i]);
1458 + if (db->index[i] != NULL) lh_OPENSSL_STRING_free(db->index[i]);
1459 OPENSSL_free(db->index);
1460 }
1461 if (db->qual != NULL)
1462 OPENSSL_free(db->qual);
1463 if (db->data != NULL)
1464 {
1465 - for (i=sk_PSTRING_num(db->data)-1; i>=0; i--)
1466 + for (i=sk_OPENSSL_PSTRING_num(db->data)-1; i>=0; i--)
1467 {
1468 /* check if any 'fields' have been allocated
1469 * from outside of the initial block */
1470 - p=sk_PSTRING_value(db->data,i);
1471 + p=sk_OPENSSL_PSTRING_value(db->data,i);
1472 max=p[db->num_fields]; /* last address */
1473 if (max == NULL) /* new row */
1474 {
1475 @@ -380,9 +380,9 @@
1476 OPENSSL_free(p[n]);
1477 }
1478 }
1479 - OPENSSL_free(sk_PSTRING_value(db->data,i));
1480 + OPENSSL_free(sk_OPENSSL_PSTRING_value(db->data,i));
1481 }
1482 - sk_PSTRING_free(db->data);
1483 + sk_OPENSSL_PSTRING_free(db->data);
1484 }
1485 OPENSSL_free(db);
1486 }
1487 Index: openssl/crypto/txt_db/txt_db.h
1488 RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v
1489 rcsdiff -q -kk '-r1.11' '-r1.11.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v' 2>/dev/null
1490 --- openssl/crypto/txt_db/txt_db.h 2008/06/04 11:01:38 1.11
1491 +++ openssl/crypto/txt_db/txt_db.h 2009/07/27 21:08:51 1.11.2.1
1492 @@ -77,19 +77,19 @@
1493 extern "C" {
1494 #endif
1495
1496 -typedef STRING *PSTRING;
1497 -DECLARE_SPECIAL_STACK_OF(PSTRING, STRING)
1498 +typedef OPENSSL_STRING *OPENSSL_PSTRING;
1499 +DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
1500
1501 typedef struct txt_db_st
1502 {
1503 int num_fields;
1504 - STACK_OF(PSTRING) *data;
1505 - LHASH_OF(STRING) **index;
1506 - int (**qual)(STRING *);
1507 + STACK_OF(OPENSSL_PSTRING) *data;
1508 + LHASH_OF(OPENSSL_STRING) **index;
1509 + int (**qual)(OPENSSL_STRING *);
1510 long error;
1511 long arg1;
1512 long arg2;
1513 - STRING *arg_row;
1514 + OPENSSL_STRING *arg_row;
1515 } TXT_DB;
1516
1517 #ifndef OPENSSL_NO_BIO
1518 @@ -99,11 +99,11 @@
1519 TXT_DB *TXT_DB_read(char *in, int num);
1520 long TXT_DB_write(char *out, TXT_DB *db);
1521 #endif
1522 -int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(STRING *),
1523 +int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
1524 LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
1525 void TXT_DB_free(TXT_DB *db);
1526 -STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value);
1527 -int TXT_DB_insert(TXT_DB *db, STRING *value);
1528 +OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
1529 +int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
1530
1531 #ifdef __cplusplus
1532 }
1533 Index: openssl/crypto/x509v3/v3_utl.c
1534 RCS File: /v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v
1535 rcsdiff -q -kk '-r1.44' '-r1.44.2.1' -u '/v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v' 2>/dev/null
1536 --- openssl/crypto/x509v3/v3_utl.c 2009/02/14 21:49:36 1.44
1537 +++ openssl/crypto/x509v3/v3_utl.c 2009/07/27 21:08:53 1.44.2.1
1538 @@ -67,9 +67,9 @@
1539
1540 static char *strip_spaces(char *name);
1541 static int sk_strcmp(const char * const *a, const char * const *b);
1542 -static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
1543 -static void str_free(STRING str);
1544 -static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email);
1545 +static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
1546 +static void str_free(OPENSSL_STRING str);
1547 +static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email);
1548
1549 static int ipv4_from_asc(unsigned char *v4, const char *in);
1550 static int ipv6_from_asc(unsigned char *v6, const char *in);
1551 @@ -463,10 +463,10 @@
1552 return strcmp(*a, *b);
1553 }
1554
1555 -STACK_OF(STRING) *X509_get1_email(X509 *x)
1556 +STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x)
1557 {
1558 GENERAL_NAMES *gens;
1559 - STACK_OF(STRING) *ret;
1560 + STACK_OF(OPENSSL_STRING) *ret;
1561
1562 gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
1563 ret = get_email(X509_get_subject_name(x), gens);
1564 @@ -474,10 +474,10 @@
1565 return ret;
1566 }
1567
1568 -STACK_OF(STRING) *X509_get1_ocsp(X509 *x)
1569 +STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
1570 {
1571 AUTHORITY_INFO_ACCESS *info;
1572 - STACK_OF(STRING) *ret = NULL;
1573 + STACK_OF(OPENSSL_STRING) *ret = NULL;
1574 int i;
1575
1576 info = X509_get_ext_d2i(x, NID_info_access, NULL, NULL);
1577 @@ -499,11 +499,11 @@
1578 return ret;
1579 }
1580
1581 -STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x)
1582 +STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
1583 {
1584 GENERAL_NAMES *gens;
1585 STACK_OF(X509_EXTENSION) *exts;
1586 - STACK_OF(STRING) *ret;
1587 + STACK_OF(OPENSSL_STRING) *ret;
1588
1589 exts = X509_REQ_get_extensions(x);
1590 gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
1591 @@ -514,9 +514,9 @@
1592 }
1593
1594
1595 -static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
1596 +static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
1597 {
1598 - STACK_OF(STRING) *ret = NULL;
1599 + STACK_OF(OPENSSL_STRING) *ret = NULL;
1600 X509_NAME_ENTRY *ne;
1601 ASN1_IA5STRING *email;
1602 GENERAL_NAME *gen;
1603 @@ -539,23 +539,23 @@
1604 return ret;
1605 }
1606
1607 -static void str_free(STRING str)
1608 +static void str_free(OPENSSL_STRING str)
1609 {
1610 OPENSSL_free(str);
1611 }
1612
1613 -static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email)
1614 +static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email)
1615 {
1616 char *emtmp;
1617 /* First some sanity checks */
1618 if(email->type != V_ASN1_IA5STRING) return 1;
1619 if(!email->data || !email->length) return 1;
1620 - if(!*sk) *sk = sk_STRING_new(sk_strcmp);
1621 + if(!*sk) *sk = sk_OPENSSL_STRING_new(sk_strcmp);
1622 if(!*sk) return 0;
1623 /* Don't add duplicates */
1624 - if(sk_STRING_find(*sk, (char *)email->data) != -1) return 1;
1625 + if(sk_OPENSSL_STRING_find(*sk, (char *)email->data) != -1) return 1;
1626 emtmp = BUF_strdup((char *)email->data);
1627 - if(!emtmp || !sk_STRING_push(*sk, emtmp)) {
1628 + if(!emtmp || !sk_OPENSSL_STRING_push(*sk, emtmp)) {
1629 X509_email_free(*sk);
1630 *sk = NULL;
1631 return 0;
1632 @@ -563,9 +563,9 @@
1633 return 1;
1634 }
1635
1636 -void X509_email_free(STACK_OF(STRING) *sk)
1637 +void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
1638 {
1639 - sk_STRING_pop_free(sk, str_free);
1640 + sk_OPENSSL_STRING_pop_free(sk, str_free);
1641 }
1642
1643 /* Convert IP addresses both IPv4 and IPv6 into an
1644 Index: openssl/crypto/x509v3/x509v3.h
1645 RCS File: /v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v
1646 rcsdiff -q -kk '-r1.126.2.1' '-r1.126.2.2' -u '/v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v' 2>/dev/null
1647 --- openssl/crypto/x509v3/x509v3.h 2009/04/19 17:58:01 1.126.2.1
1648 +++ openssl/crypto/x509v3/x509v3.h 2009/07/27 21:08:53 1.126.2.2
1649 @@ -693,10 +693,10 @@
1650 void X509_PURPOSE_cleanup(void);
1651 int X509_PURPOSE_get_id(X509_PURPOSE *);
1652
1653 -STACK_OF(STRING) *X509_get1_email(X509 *x);
1654 -STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x);
1655 -void X509_email_free(STACK_OF(STRING) *sk);
1656 -STACK_OF(STRING) *X509_get1_ocsp(X509 *x);
1657 +STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
1658 +STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
1659 +void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
1660 +STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
1661
1662 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
1663 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2