QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-30 11:44:37 +00:00
Code Issues Projects Releases Wiki Activity

VMS: for testutil, make sure to use BIO_f_linebuffer

Browse Source 
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5352)
This commit is contained in:
Richard Levitte 2018-02-13 19:10:22 +01:00
parent 9b7e82f8d9
commit f11a023ada
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/bio/bf_lbuf.c
View File

@ -120,9 +120,10 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
do { do {
const char *p; const char *p;
char c;
for (p = in; p < in + inl && *p != '\n'; p++) ; for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++) ;
if (*p == '\n') { if (c == '\n') {
p++; p++;
foundnl = 1; foundnl = 1;
} else } else

6
test/testutil/basic_output.c
View File

@ -21,6 +21,10 @@ void test_open_streams(void)
{ {
bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT); bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
bio_err = BIO_new_fp(stderr, 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); bio_err = BIO_push(BIO_new(BIO_f_tap()), bio_err);
OPENSSL_assert(bio_out != NULL); OPENSSL_assert(bio_out != NULL);
@ -29,7 +33,7 @@ void test_open_streams(void)
void test_close_streams(void) void test_close_streams(void)
{ {
BIO_free(bio_out); BIO_free_all(bio_out);
BIO_free_all(bio_err); BIO_free_all(bio_err);
} }