Modify verify code to handle self signed certificates.

[openssl.git] / apps / sess_id.c

diff --git a/apps/sess_id.c b/apps/sess_id.c
index 4a1860d080ec685461178fa9d1742f0c69b066c0..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,15 +83,8 @@ 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(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)

        {
        SSL_SESSION *x=NULL;
        int ret=1,i,num,badops=0;
        {
        SSL_SESSION *x=NULL;
        int ret=1,i,num,badops=0;


@@ -271,9 +264,7 @@ end:
        EXIT(ret);
        }
 
        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;
        {
        SSL_SESSION *x=NULL;
        BIO *in=NULL;


@@ -298,7 +289,7 @@ 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;