From: Josh Cooper Date: Wed, 16 Oct 2024 19:24:03 +0000 (-0700) Subject: Revert "Work around Windows ftell() bug as per Microsoft engineering's suggestion" X-Git-Tag: openssl-3.5.0-alpha1~676 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed3ce7545797e2c7202a6fcbf83c8bba3ead460d;p=thirdparty%2Fopenssl.git Revert "Work around Windows ftell() bug as per Microsoft engineering's suggestion" This reverts commit 8300a8742b2abc487594a09b5e6ee726dbd30771. Reviewed-by: Viktor Dukhovni Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25716) --- diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 05d87cfe90f..9082fce1595 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -235,15 +235,6 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) _setmode(fd, _O_TEXT); else _setmode(fd, _O_BINARY); - /* - * Reports show that ftell() isn't trustable in text mode. - * This has been confirmed as a bug in the Universal C RTL, see - * https://developercommunity.visualstudio.com/content/problem/425878/fseek-ftell-fail-in-text-mode-for-unix-style-text.html - * The suggested work-around from Microsoft engineering is to - * turn off buffering until the bug is resolved. - */ - if ((num & BIO_FP_TEXT) != 0) - setvbuf((FILE *)ptr, NULL, _IONBF, 0); # elif defined(OPENSSL_SYS_MSDOS) int fd = fileno((FILE *)ptr); /* Set correct text/binary mode */