From: Richard Levitte <levitte@openssl.org>
Date: Tue, 29 Mar 2016 19:36:06 +0000 (+0200)
Subject: Adapt bf_lbuf for opaque BIO
X-Git-Tag: OpenSSL_1_1_0-pre5~200
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dcdb4028b3981585537c6d57635ea91cd59589fa;p=oweals%2Fopenssl.git

Adapt bf_lbuf for opaque BIO

Also, have it always be built, even though it's only (currently) used
on VMS.  That will assure it will get the same changes as all others.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 77462f2445..d8c90f58af 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -57,8 +57,8 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include "bio_lcl.h"
 #include "internal/cryptlib.h"
-#include <openssl/bio.h>
 #include <openssl/evp.h>
 
 static int linebuffer_write(BIO *h, const char *buf, int num);
diff --git a/crypto/bio/build.info b/crypto/bio/build.info
index f462c50ad0..d1e7d73c55 100644
--- a/crypto/bio/build.info
+++ b/crypto/bio/build.info
@@ -5,5 +5,4 @@ SOURCE[../../libcrypto]=\
         bss_file.c bss_sock.c bss_conn.c \
         bf_null.c bf_buff.c b_print.c b_dump.c b_addr.c \
         b_sock.c b_sock2.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \
-        bss_dgram.c bio_meth.c \
-        {- $config{target} =~ /^VMS/i ? "bf_lbuf.c" : "" -}
+        bss_dgram.c bio_meth.c bf_lbuf.c