diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
| commit | 4386445c180179aa446a3f52b06f27c665169b97 (patch) | |
| tree | 8a6985f406a9449148ffbddac844117b679bccc5 /apps/crl2p7.c | |
| parent | a585aa67507f8916f592e37b0fa8618e2bbbe08c (diff) | |
Change STRING to OPENSSL_STRING etc as common words such
as "STRING" cause conflicts with other headers/libraries.
Diffstat (limited to 'apps/crl2p7.c')
| -rw-r--r-- | apps/crl2p7.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/crl2p7.c b/apps/crl2p7.c index 194971d5d9..bbc83774db 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -92,7 +92,7 @@ int MAIN(int argc, char **argv) PKCS7 *p7 = NULL; PKCS7_SIGNED *p7s = NULL; X509_CRL *crl=NULL; - STACK_OF(STRING) *certflst=NULL; + STACK_OF(OPENSSL_STRING) *certflst=NULL; STACK_OF(X509_CRL) *crl_stack=NULL; STACK_OF(X509) *cert_stack=NULL; int ret=1,nocrl=0; @@ -140,8 +140,8 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-certfile") == 0) { if (--argc < 1) goto bad; - if(!certflst) certflst = sk_STRING_new_null(); - sk_STRING_push(certflst,*(++argv)); + if(!certflst) certflst = sk_OPENSSL_STRING_new_null(); + sk_OPENSSL_STRING_push(certflst,*(++argv)); } else { @@ -226,8 +226,8 @@ bad: if ((cert_stack=sk_X509_new_null()) == NULL) goto end; p7s->cert=cert_stack; - if(certflst) for(i = 0; i < sk_STRING_num(certflst); i++) { - certfile = sk_STRING_value(certflst, i); + if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) { + certfile = sk_OPENSSL_STRING_value(certflst, i); if (add_certs_from_file(cert_stack,certfile) < 0) { BIO_printf(bio_err, "error loading certificates\n"); @@ -236,7 +236,7 @@ bad: } } - sk_STRING_free(certflst); + sk_OPENSSL_STRING_free(certflst); if (outfile == NULL) { |