EGD socket info.

[openssl.git] / apps / sess_id.c

diff --git a/apps/sess_id.c b/apps/sess_id.c
index 4a1860d080ec685461178fa9d1742f0c69b066c0..71d5aa0b7c6cde62d68759445f954d696df9716e 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 "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
@@ -72,7 +72,7 @@
 static char *sess_id_usage[]={
 "usage: sess_id args\n",
 "\n",
-" -inform arg     - input format - default PEM (one of DER, TXT or PEM)\n",
+" -inform arg     - input format - default PEM (DER or PEM)\n",
 " -outform arg    - output format - default PEM\n",
 " -in arg         - input file - default stdin\n",
 " -out arg        - output file - default stdout\n",
@@ -83,15 +83,11 @@ static char *sess_id_usage[]={
 NULL
 };
 
-#ifndef NOPROTO
 static SSL_SESSION *load_sess_id(char *file, int format);
-#else
-static SSL_SESSION *load_sess_id();
-#endif
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
        {
        SSL_SESSION *x=NULL;
        int ret=1,i,num,badops=0;
@@ -271,9 +267,7 @@ end:
        EXIT(ret);
        }
 
-static SSL_SESSION *load_sess_id(infile, format)
-char *infile;
-int format;
+static SSL_SESSION *load_sess_id(char *infile, int format)
        {
        SSL_SESSION *x=NULL;
        BIO *in=NULL;
@@ -298,7 +292,7 @@ int format;
        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;