projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It was a very bad idea to use #include "../e_os.h" -- when this occurs
[oweals/openssl.git]
/
apps
/
crl2p7.c
diff --git
a/apps/crl2p7.c
b/apps/crl2p7.c
index beadc96cafc325ec0f0bd3ac07961185b9b2548b..ba4eba16bf9ca1932dd5524ae80de0e9a00a1c89 100644
(file)
--- a/
apps/crl2p7.c
+++ b/
apps/crl2p7.c
@@
-65,19
+65,14
@@
#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
@@
-87,9
+82,7
@@
static int add_certs_from_file();
* -out arg - output file - default stdout
*/
* -out arg - output file - default stdout
*/
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
{
int i,badops=0;
BIO *in=NULL,*out=NULL;
{
int i,badops=0;
BIO *in=NULL,*out=NULL;
@@
-288,15
+281,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))
@@
-320,9
+311,9
@@
char *certfile;
}
/* scan over it and pull out the CRL's */
}
/* 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
+327,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);
}