add -rmd option to set OCSP response signing digest

[openssl.git] / apps / errstr.c

diff --git a/apps/errstr.c b/apps/errstr.c
index c86b5d940bcac9e87482f1c5e7215c3b12028847..fe3b98077ee25a7ef9fc676b71686dcd17d32615 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -68,6 +68,8 @@
 #undef PROG
 #define PROG   errstr_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,ret=0;
@@ -89,12 +91,20 @@ int MAIN(int argc, char **argv)
                out=BIO_new(BIO_s_file());
                if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
                        {
-                       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);
+#ifdef OPENSSL_SYS_VMS
+                       {
+                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                       out = BIO_push(tmpbio, out);
+                       }
+#endif
+                       lh_ERR_STRING_DATA_node_stats_bio(
+                                                 ERR_get_string_table(), out);
+                       lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(),
+                                                    out);
+                       lh_ERR_STRING_DATA_node_usage_stats_bio(
+                                                   ERR_get_string_table(),out);
                        }
-               if (out != NULL) BIO_free(out);
+               if (out != NULL) BIO_free_all(out);
                argc--;
                argv++;
                }
@@ -102,7 +112,10 @@ int MAIN(int argc, char **argv)
        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]);
@@ -110,5 +123,6 @@ int MAIN(int argc, char **argv)
                        ret++;
                        }
                }
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }