From: Eugene Syromiatnikov Date: Mon, 21 Jul 2025 11:37:16 +0000 (+0200) Subject: apps/lib/apps.c: remove HARNESS_OSSL_PREFIX envvar handling X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=082a81404cd8e4dfbc7a4cbda23b882a6f7488cb;p=thirdparty%2Fopenssl.git apps/lib/apps.c: remove HARNESS_OSSL_PREFIX envvar handling As the environment variable is no longer used by the test harness, its support can be removed from the openssl command, along with the possible unintended consequences of prefixing the standard output of the openssl command with an arbitrary string set in the environment. Signed-off-by: Eugene Syromiatnikov Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/28025) --- diff --git a/apps/lib/apps.c b/apps/lib/apps.c index a6278f6745e..f005d71ddea 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -3047,15 +3047,11 @@ BIO *dup_bio_out(int format) { BIO *b = BIO_new_fp(stdout, BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0)); - void *prefix = NULL; - BIO *btmp; - - if (b == NULL) - return NULL; #ifdef OPENSSL_SYS_VMS - if (FMT_istext(format)) { - btmp = BIO_new(BIO_f_linebuffer()); + if (b != NULL && FMT_istext(format)) { + BIO *btmp = BIO_new(BIO_f_linebuffer()); + if (btmp == NULL) { BIO_free(b); return NULL; @@ -3064,17 +3060,6 @@ BIO *dup_bio_out(int format) } #endif - if (FMT_istext(format) - && (prefix = getenv("HARNESS_OSSL_PREFIX")) != NULL) { - btmp = BIO_new(BIO_f_prefix()); - if (btmp == NULL) { - BIO_free_all(b); - return NULL; - } - b = BIO_push(btmp, b); - BIO_set_prefix(b, prefix); - } - return b; }