Just like bio_out, bio_err needs the linebuffer filter on VMS

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index c76e3e345db916c88275442d21c70bc7c0a80ac6..128f387593289bd4910acba36cc117ad0c728c1c 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -640,7 +640,7 @@ static int load_pkcs12(BIO *in, const char *desc,
     return ret;
 }
 
     return ret;
 }
 

-#ifndef OPENSSL_NO_OCSP
+#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

 static int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
 {
     char *host = NULL, *port = NULL, *path = NULL;
 static int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
 {
     char *host = NULL, *port = NULL, *path = NULL;


@@ -695,7 +695,7 @@ X509 *load_cert(const char *file, int format, const char *cert_descrip)
     BIO *cert;
 
     if (format == FORMAT_HTTP) {
     BIO *cert;
 
     if (format == FORMAT_HTTP) {

-#ifndef OPENSSL_NO_OCSP
+#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

         load_cert_crl_http(file, &x, NULL);
 #endif
         return x;
         load_cert_crl_http(file, &x, NULL);
 #endif
         return x;


@@ -736,7 +736,7 @@ X509_CRL *load_crl(const char *infile, int format)
     BIO *in = NULL;
 
     if (format == FORMAT_HTTP) {
     BIO *in = NULL;
 
     if (format == FORMAT_HTTP) {

-#ifndef OPENSSL_NO_OCSP
+#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

         load_cert_crl_http(infile, NULL, &x);
 #endif
         return x;
         load_cert_crl_http(infile, NULL, &x);
 #endif
         return x;


@@ -2203,30 +2203,6 @@ double app_tminterval(int stop, int usertime)
 
     return (ret);
 }
 
     return (ret);
 }

-#elif defined(OPENSSL_SYS_NETWARE)
-# include <time.h>
-
-double app_tminterval(int stop, int usertime)
-{
-    static clock_t tmstart;
-    static int warning = 1;
-    double ret = 0;
-
-    if (usertime && warning) {
-        BIO_printf(bio_err, "To get meaningful results, run "
-                   "this program on idle system.\n");
-        warning = 0;
-    }
-
-    if (stop == TM_START)
-        tmstart = clock();
-    else
-        ret = (clock() - tmstart) / (double)CLOCKS_PER_SEC;
-
-    return (ret);
-}
-
-

 #elif defined(OPENSSL_SYSTEM_VXWORKS)
 # include <time.h>
 
 #elif defined(OPENSSL_SYSTEM_VXWORKS)
 # include <time.h>
 


@@ -2510,6 +2486,17 @@ BIO *dup_bio_out(int format)
     return b;
 }
 
     return b;
 }
 

+BIO *dup_bio_err(int format)
+{
+    BIO *b = BIO_new_fp(stderr,
+                        BIO_NOCLOSE | (istext(format) ? BIO_FP_TEXT : 0));
+#ifdef OPENSSL_SYS_VMS
+    if (istext(format))
+        b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
+#endif
+    return b;
+}
+

 void unbuffer(FILE *fp)
 {
     setbuf(fp, NULL);
 void unbuffer(FILE *fp)
 {
     setbuf(fp, NULL);