[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dcdb4028b3981585537c6d57635ea91cd59589fa (commit)
      from  47a11172f1dfa8e2c9448753acd78a1cbba0e32d (commit)


- Log -----------------------------------------------------------------
commit dcdb4028b3981585537c6d57635ea91cd59589fa
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 29 21:36:06 2016 +0200

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bf_lbuf.c  | 2 +-
 crypto/bio/build.info | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 77462f2..d8c90f5 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 f462c50..d1e7d73 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