projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make it compile under -pedantic.
[oweals/openssl.git]
/
apps
/
sess_id.c
diff --git
a/apps/sess_id.c
b/apps/sess_id.c
index c1b497981ee8f95408216183342b0cce103f860e..8ac118d4a1e6e013ea70fc5c3a83760483b0c0de 100644
(file)
--- a/
apps/sess_id.c
+++ b/
apps/sess_id.c
@@
-60,11
+60,11
@@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include <stdlib.h>
#include <string.h>
#include "apps.h"
-#include
"bio.h"
-#include
"err.h"
-#include
"x509.h"
-#include
"pem.h"
-#include
"ssl.h"
+#include
<openssl/bio.h>
+#include
<openssl/err.h>
+#include
<openssl/x509.h>
+#include
<openssl/pem.h>
+#include
<openssl/ssl.h>
#undef PROG
#define PROG sess_id_main
#undef PROG
#define PROG sess_id_main
@@
-83,12
+83,7
@@
static char *sess_id_usage[]={
NULL
};
NULL
};
-#ifndef NOPROTO
static SSL_SESSION *load_sess_id(char *file, int format);
static SSL_SESSION *load_sess_id(char *file, int format);
-#else
-static SSL_SESSION *load_sess_id();
-#endif
-
int MAIN(int argc, char **argv)
{
SSL_SESSION *x=NULL;
int MAIN(int argc, char **argv)
{
SSL_SESSION *x=NULL;
@@
-294,7
+289,7
@@
static SSL_SESSION *load_sess_id(char *infile, int format)
if (format == FORMAT_ASN1)
x=d2i_SSL_SESSION_bio(in,NULL);
else if (format == FORMAT_PEM)
if (format == FORMAT_ASN1)
x=d2i_SSL_SESSION_bio(in,NULL);
else if (format == FORMAT_PEM)
- x=PEM_read_bio_SSL_SESSION(in,NULL,NULL);
+ x=PEM_read_bio_SSL_SESSION(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;