new option "openssl ciphers -V"

[openssl.git] / apps / errstr.c

diff --git a/apps/errstr.c b/apps/errstr.c
index 6d0f9d137be27a0615c1cf279e60fc035135300b..19489b0df3b7b9d7a83c924e77fc2107bce84e1e 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -1,5 +1,5 @@
 /* apps/errstr.c */
 /* apps/errstr.c */

-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

  * All rights reserved.
  *
  * This package is an SSL implementation written
  * All rights reserved.
  *
  * This package is an SSL implementation written


@@ -60,17 +60,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"

-#include "bio.h"
-#include "lhash.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>

 
 #undef PROG
 #define PROG   errstr_main
 
 
 #undef PROG
 #define PROG   errstr_main
 

-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)

        {
        int i,ret=0;
        char buf[256];
        {
        int i,ret=0;
        char buf[256];


@@ -80,7 +80,7 @@ char **argv;
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)

-                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE);
+                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);

 
        SSL_load_error_strings();
 
 
        SSL_load_error_strings();
 


@@ -91,12 +91,18 @@ char **argv;
                out=BIO_new(BIO_s_file());
                if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
                        {
                out=BIO_new(BIO_s_file());
                if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
                        {

+#ifdef OPENSSL_SYS_VMS
+                       {
+                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                       out = BIO_push(tmpbio, out);
+                       }
+#endif

                        lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
                        lh_stats_bio((LHASH *)ERR_get_string_table(),out);
                        lh_node_usage_stats_bio((LHASH *)
                                ERR_get_string_table(),out);
                        }
                        lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
                        lh_stats_bio((LHASH *)ERR_get_string_table(),out);
                        lh_node_usage_stats_bio((LHASH *)
                                ERR_get_string_table(),out);
                        }

-               if (out != NULL) BIO_free(out);
+               if (out != NULL) BIO_free_all(out);

                argc--;
                argv++;
                }
                argc--;
                argv++;
                }


@@ -104,7 +110,10 @@ char **argv;
        for (i=1; i<argc; i++)
                {
                if (sscanf(argv[i],"%lx",&l))
        for (i=1; i<argc; i++)
                {
                if (sscanf(argv[i],"%lx",&l))

-                       printf("%s\n",ERR_error_string(l,buf));
+                       {
+                       ERR_error_string_n(l, buf, sizeof buf);
+                       printf("%s\n",buf);
+                       }

                else
                        {
                        printf("%s: bad error code\n",argv[i]);
                else
                        {
                        printf("%s: bad error code\n",argv[i]);


@@ -112,5 +121,6 @@ char **argv;
                        ret++;
                        }
                }
                        ret++;
                        }
                }

-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);

        }
        }