projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add loaded dynamic ENGINEs to list.
[openssl.git]
/
apps
/
crl2p7.c
diff --git
a/apps/crl2p7.c
b/apps/crl2p7.c
index 194971d5d9d5245a901a1623129932d45a82a73a..bbc83774dbee7193bc38b988c7d2b38f2aef769d 100644
(file)
--- 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;
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;
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;
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
{
}
else
{
@@
-226,8
+226,8
@@
bad:
if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
p7s->cert=cert_stack;
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");
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)
{
if (outfile == NULL)
{