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 8729068462baa840f934e5c13bac4d38c784767c..bbc83774dbee7193bc38b988c7d2b38f2aef769d 100644
(file)
--- a/
apps/crl2p7.c
+++ b/
apps/crl2p7.c
@@
-63,7
+63,6
@@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include "apps.h"
#include <openssl/err.h>
#include <openssl/evp.h>
#include "apps.h"
#include <openssl/err.h>
#include <openssl/evp.h>
@@
-93,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 *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;
@@
-141,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_new_null();
- sk_push(certflst,*(++argv));
+ if(!certflst) certflst = sk_
OPENSSL_STRING_
new_null();
+ sk_
OPENSSL_STRING_
push(certflst,*(++argv));
}
else
{
}
else
{
@@
-227,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_num(certflst); i++) {
- certfile = sk_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");
@@
-237,7
+236,7
@@
bad:
}
}
}
}
- sk_free(certflst);
+ sk_
OPENSSL_STRING_
free(certflst);
if (outfile == NULL)
{
if (outfile == NULL)
{
@@
-280,7
+279,7
@@
end:
if (crl != NULL) X509_CRL_free(crl);
apps_shutdown();
if (crl != NULL) X509_CRL_free(crl);
apps_shutdown();
- EXIT(ret);
+
OPENSSL_
EXIT(ret);
}
/*
}
/*
@@
-295,19
+294,12
@@
end:
*/
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
{
*/
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
{
- struct stat st;
BIO *in=NULL;
int count=0;
int ret= -1;
STACK_OF(X509_INFO) *sk=NULL;
X509_INFO *xi;
BIO *in=NULL;
int count=0;
int ret= -1;
STACK_OF(X509_INFO) *sk=NULL;
X509_INFO *xi;
- if ((stat(certfile,&st) != 0))
- {
- BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
- goto end;
- }
-
in=BIO_new(BIO_s_file());
if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
{
in=BIO_new(BIO_s_file());
if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
{