3 files changed, 11 insertions, 72 deletions

diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c
index a750ac413f..f6943ea3f3 100644
--- a/src/lib/libcrypto/bio/b_print.c
+++ b/src/lib/libcrypto/bio/b_print.c
@@ -1,21 +1,10 @@
-/* $OpenBSD: b_print.c,v 1.27 2023/07/05 21:23:37 beck Exp $ */
+/* $OpenBSD: b_print.c,v 1.28 2024/03/02 09:18:28 tb Exp $ */
 
 /* Theo de Raadt places this file in the public domain. */
 
 #include <openssl/bio.h>
 
-int
-BIO_printf(BIO *bio, const char *format, ...)
-{
-        va_list args;
-        int ret;
-
-        va_start(args, format);
-        ret = BIO_vprintf(bio, format, args);
-        va_end(args);
-        return (ret);
-}
-LCRYPTO_ALIAS(BIO_printf);
+#include "bio_local.h"
 
 #ifdef HAVE_FUNOPEN
 static int
@@ -40,7 +29,6 @@ BIO_vprintf(BIO *bio, const char *format, va_list args)
 fail:
         return (ret);
 }
-LCRYPTO_ALIAS(BIO_vprintf);
 
 #else /* !HAVE_FUNOPEN */
 
@@ -57,55 +45,18 @@ BIO_vprintf(BIO *bio, const char *format, va_list args)
         free(buf);
         return (ret);
 }
-LCRYPTO_ALIAS(BIO_vprintf);
 
 #endif /* HAVE_FUNOPEN */
 
-/*
- * BIO_snprintf and BIO_vsnprintf return -1 for overflow,
- * due to the history of this API.  Justification:
- *
- * Traditional snprintf surfaced in 4.4BSD, and returned
- * "number of bytes wanted". Solaris and Windows opted to
- * return -1.  A draft standard was written which returned -1.
- * Due to the large volume of code already using the first
- * semantics, the draft was repaired before standardization to
- * specify "number of bytes wanted" plus "-1 for character conversion
- * style errors".  Solaris adapted to this rule, but Windows stuck
- * with -1.
- *
- * Original OpenSSL comment which is full of lies:
- *
- * "In case of truncation, return -1 like traditional snprintf.
- * (Current drafts for ISO/IEC 9899 say snprintf should return
- * the number of characters that would have been written,
- * had the buffer been large enough.)"
- */
 int
-BIO_snprintf(char *buf, size_t n, const char *format, ...)
+BIO_printf(BIO *bio, const char *format, ...)
 {
         va_list args;
         int ret;
 
         va_start(args, format);
-        ret = vsnprintf(buf, n, format, args);
+        ret = BIO_vprintf(bio, format, args);
         va_end(args);
-
-        if (ret >= n || ret == -1)
-                return (-1);
-        return (ret);
-}
-LCRYPTO_ALIAS(BIO_snprintf);
-
-int
-BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-{
-        int ret;
-
-        ret = vsnprintf(buf, n, format, args);
-
-        if (ret >= n || ret == -1)
-                return (-1);
         return (ret);
 }
-LCRYPTO_ALIAS(BIO_vsnprintf);
+LCRYPTO_ALIAS(BIO_printf);
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index b955524c45..10b0924f73 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.60 2023/08/25 12:37:33 schwarze Exp $ */
+/* $OpenBSD: bio.h,v 1.61 2024/03/02 09:18:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -648,25 +648,9 @@ void BIO_copy_next_retry(BIO *b);
 #ifndef __MINGW_PRINTF_FORMAT
 int BIO_printf(BIO *bio, const char *format, ...)
         __attribute__((__format__(__printf__, 2, 3), __nonnull__(2)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-        __attribute__((__format__(__printf__, 2, 0), __nonnull__(2)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-        __attribute__((__deprecated__, __format__(__printf__, 3, 4),
-            __nonnull__(3)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-        __attribute__((__deprecated__, __format__(__printf__, 3, 0),
-            __nonnull__(3)));
 #else
 int BIO_printf(BIO *bio, const char *format, ...)
         __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3), __nonnull__(2)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-        __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 0), __nonnull__(2)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-        __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 4),
-            __nonnull__(3)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-        __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0),
-            __nonnull__(3)));
 #endif
 
 void ERR_load_BIO_strings(void);
diff --git a/src/lib/libcrypto/bio/bio_local.h b/src/lib/libcrypto/bio/bio_local.h
index 4eecf7e04a..f59b5756c9 100644
--- a/src/lib/libcrypto/bio/bio_local.h
+++ b/src/lib/libcrypto/bio/bio_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_local.h,v 1.5 2022/12/02 19:44:04 tb Exp $ */
+/* $OpenBSD: bio_local.h,v 1.6 2024/03/02 09:18:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,6 +59,8 @@
 #ifndef HEADER_BIO_LOCAL_H
 #define HEADER_BIO_LOCAL_H
 
+#include <stdarg.h>
+
 __BEGIN_HIDDEN_DECLS
 
 struct bio_method_st {
@@ -118,6 +120,8 @@ typedef struct bio_f_buffer_ctx_struct {
         int obuf_off;   /* write/read offset */
 } BIO_F_BUFFER_CTX;
 
+int BIO_vprintf(BIO *bio, const char *format, va_list args);
+
 __END_HIDDEN_DECLS
 
 #endif /* !HEADER_BIO_LOCAL_H */