projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -clrext option to 'x509'
[openssl.git]
/
apps
/
crl2p7.c
diff --git
a/apps/crl2p7.c
b/apps/crl2p7.c
index beadc96cafc325ec0f0bd3ac07961185b9b2548b..40565916769896f35ca44437cf85488786b75b31 100644
(file)
--- a/
apps/crl2p7.c
+++ b/
apps/crl2p7.c
@@
-65,31
+65,26
@@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
-#include
"err.h"
-#include
"evp.h"
-#include
"x509.h"
-#include
"pkcs7.h"
-#include
"pem.h"
-#include
"objects.h"
+#include
<openssl/err.h>
+#include
<openssl/evp.h>
+#include
<openssl/x509.h>
+#include
<openssl/pkcs7.h>
+#include
<openssl/pem.h>
+#include
<openssl/objects.h>
-#ifndef NOPROTO
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
-#else
-static int add_certs_from_file();
-#endif
-
#undef PROG
#define PROG crl2pkcs7_main
#undef PROG
#define PROG crl2pkcs7_main
-/* -inform arg - input format - default PEM (
one of DER, TXT
or PEM)
+/* -inform arg - input format - default PEM (
DER
or PEM)
* -outform arg - output format - default PEM
* -in arg - input file - default stdin
* -out arg - output file - default stdout
*/
* -outform arg - output format - default PEM
* -in arg - input file - default stdin
* -out arg - output file - default stdout
*/
-int MAIN(
argc, argv)
-int argc;
-char **argv;
+int MAIN(
int, char **);
+
+int MAIN(int argc, char **argv)
{
int i,badops=0;
BIO *in=NULL,*out=NULL;
{
int i,badops=0;
BIO *in=NULL,*out=NULL;
@@
-99,7
+94,7
@@
char **argv;
PKCS7_SIGNED *p7s = NULL;
X509_CRL *crl=NULL;
STACK *certflst=NULL;
PKCS7_SIGNED *p7s = NULL;
X509_CRL *crl=NULL;
STACK *certflst=NULL;
- STACK *crl_stack=NULL;
+ STACK
_OF(X509_CRL)
*crl_stack=NULL;
STACK_OF(X509) *cert_stack=NULL;
int ret=1,nocrl=0;
STACK_OF(X509) *cert_stack=NULL;
int ret=1,nocrl=0;
@@
-164,8
+159,8
@@
char **argv;
bad:
BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
BIO_printf(bio_err,"where options are\n");
bad:
BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
BIO_printf(bio_err,"where options are\n");
- BIO_printf(bio_err," -inform arg input format -
one of DER TXT
PEM\n");
- BIO_printf(bio_err," -outform arg output format -
one of DER TXT
PEM\n");
+ BIO_printf(bio_err," -inform arg input format -
DER or
PEM\n");
+ BIO_printf(bio_err," -outform arg output format -
DER or
PEM\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file\n");
BIO_printf(bio_err," -certfile arg certificates file of chain to a trusted CA\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file\n");
BIO_printf(bio_err," -certfile arg certificates file of chain to a trusted CA\n");
@@
-200,7
+195,7
@@
bad:
if (informat == FORMAT_ASN1)
crl=d2i_X509_CRL_bio(in,NULL);
else if (informat == FORMAT_PEM)
if (informat == FORMAT_ASN1)
crl=d2i_X509_CRL_bio(in,NULL);
else if (informat == FORMAT_PEM)
- crl=PEM_read_bio_X509_CRL(in,NULL,NULL);
+ crl=PEM_read_bio_X509_CRL(in,NULL,NULL
,NULL
);
else {
BIO_printf(bio_err,"bad input format specified for input crl\n");
goto end;
else {
BIO_printf(bio_err,"bad input format specified for input crl\n");
goto end;
@@
-220,11
+215,11
@@
bad:
p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
- if ((crl_stack=sk_new(NULL)) == NULL) goto end;
+ if ((crl_stack=sk_
X509_CRL_
new(NULL)) == NULL) goto end;
p7s->crl=crl_stack;
if (crl != NULL)
{
p7s->crl=crl_stack;
if (crl != NULL)
{
- sk_
push(crl_stack,(char *)
crl);
+ sk_
X509_CRL_push(crl_stack,
crl);
crl=NULL; /* now part of p7 for Freeing */
}
crl=NULL; /* now part of p7 for Freeing */
}
@@
-288,15
+283,13
@@
end:
* number of certs added if successful, -1 if not.
*----------------------------------------------------------------------
*/
* number of certs added if successful, -1 if not.
*----------------------------------------------------------------------
*/
-static int add_certs_from_file(stack,certfile)
-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;
{
struct stat st;
BIO *in=NULL;
int count=0;
int ret= -1;
- STACK *sk=NULL;
+ STACK
_OF(X509_INFO)
*sk=NULL;
X509_INFO *xi;
if ((stat(certfile,&st) != 0))
X509_INFO *xi;
if ((stat(certfile,&st) != 0))
@@
-313,16
+306,16
@@
char *certfile;
}
/* This loads from a file, a stack of x509/crl/pkey sets */
}
/* This loads from a file, a stack of x509/crl/pkey sets */
- sk=PEM_X509_INFO_read_bio(in,NULL,NULL);
+ sk=PEM_X509_INFO_read_bio(in,NULL,NULL
,NULL
);
if (sk == NULL) {
BIO_printf(bio_err,"error reading the file, %s\n",certfile);
goto end;
}
/* scan over it and pull out the CRL's */
if (sk == NULL) {
BIO_printf(bio_err,"error reading the file, %s\n",certfile);
goto end;
}
/* scan over it and pull out the CRL's */
- while (sk_num(sk))
+ while (sk_
X509_INFO_
num(sk))
{
{
- xi=
(X509_INFO *)sk
_shift(sk);
+ xi=
sk_X509_INFO
_shift(sk);
if (xi->x509 != NULL)
{
sk_X509_push(stack,xi->x509);
if (xi->x509 != NULL)
{
sk_X509_push(stack,xi->x509);
@@
-336,7
+329,7
@@
char *certfile;
end:
/* never need to Free x */
if (in != NULL) BIO_free(in);
end:
/* never need to Free x */
if (in != NULL) BIO_free(in);
- if (sk != NULL) sk_free(sk);
+ if (sk != NULL) sk_
X509_INFO_
free(sk);
return(ret);
}
return(ret);
}