[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Tue Feb 13 20:14:48 UTC 2018
The branch master has been updated
via f11a023adaae8ba037f952fd72dfbcc34733c993 (commit)
from 9b7e82f8d939ca6894f941268b219da55f069b26 (commit)
- Log -----------------------------------------------------------------
commit f11a023adaae8ba037f952fd72dfbcc34733c993
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Feb 13 19:10:22 2018 +0100
VMS: for testutil, make sure to use BIO_f_linebuffer
Without that, output comes one character per line. It's the same
issue as has been observed before, this happens when using write()
on a record oriented stream (possibly unbuffered too).
This also uncovered a bug in BIO_f_linebuffer, where this would cause
an error:
BIO_write(bio, "1\n", 1);
I.e. there's a \n just after the part of the string that we currently
ask to get written.
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5352)
-----------------------------------------------------------------------
Summary of changes:
crypto/bio/bf_lbuf.c | 5 +++--
test/testutil/basic_output.c | 6 +++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 812ed3f..2a4d1e6 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -120,9 +120,10 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
do {
const char *p;
+ char c;
- for (p = in; p < in + inl && *p != '\n'; p++) ;
- if (*p == '\n') {
+ for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++) ;
+ if (c == '\n') {
p++;
foundnl = 1;
} else
diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c
index 6a06b36..1fb12c8 100644
--- a/test/testutil/basic_output.c
+++ b/test/testutil/basic_output.c
@@ -21,6 +21,10 @@ void test_open_streams(void)
{
bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+#ifdef __VMS
+ bio_out = BIO_push(BIO_new(BIO_f_linebuffer()), bio_out);
+ bio_err = BIO_push(BIO_new(BIO_f_linebuffer()), bio_err);
+#endif
bio_err = BIO_push(BIO_new(BIO_f_tap()), bio_err);
OPENSSL_assert(bio_out != NULL);
@@ -29,7 +33,7 @@ void test_open_streams(void)
void test_close_streams(void)
{
- BIO_free(bio_out);
+ BIO_free_all(bio_out);
BIO_free_all(bio_err);
}
More information about the openssl-commits
mailing list