From: tb <tb@openbsd.org>
Date: Sun, 11 Sep 2022 17:26:03 +0000 (+0000)
Subject: Make BIO_info_cb() identical to bio_info_cb()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f78b0aad06714b40060262ac130c20cc50ffad52;p=openbsd

Make BIO_info_cb() identical to bio_info_cb()

Various projects use bio_info_cb and BIO_info_cb interchangeably, for
example mupdf and freerdp. This is because this was changed in OpenSSL
commit fce78bd4 (2017), triggered by new warnings in gcc 8.

https://github.com/openssl/openssl/pull/4493

This results in some scary compiler warnings and useless patches in ports.
Nobody seems to be using the old bio_info_cb() version.

ok jsing
---

diff --git a/lib/libcrypto/bio/bio.h b/lib/libcrypto/bio/bio.h
index 0a729bded91..5030a2c2d2f 100644
--- a/lib/libcrypto/bio/bio.h
+++ b/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.55 2022/07/12 14:42:48 kn Exp $ */
+/* $OpenBSD: bio.h,v 1.56 2022/09/11 17:26:03 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -276,8 +276,9 @@ void BIO_set_callback_arg(BIO *b, char *arg);
 const char *BIO_method_name(const BIO *b);
 int BIO_method_type(const BIO *b);
 
-typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
 typedef int BIO_info_cb(BIO *, int, int);
+/* Compatibility with OpenSSL's backward compatibility. */
+typedef BIO_info_cb bio_info_cb;
 
 typedef struct bio_method_st BIO_METHOD;