diff options
author | tb <> | 2022-09-11 17:26:03 +0000 |
---|---|---|
committer | tb <> | 2022-09-11 17:26:03 +0000 |
commit | cb56d1fb93a60d708f4f76e974ce8c085034779d (patch) | |
tree | 3904b3bb0910cfcd70bf0f7ec8b793c1eb89ed34 /src/lib | |
parent | 07270f9a29f82d959f50200c6abdf09a80bb1f71 (diff) | |
download | openbsd-cb56d1fb93a60d708f4f76e974ce8c085034779d.tar.gz openbsd-cb56d1fb93a60d708f4f76e974ce8c085034779d.tar.bz2 openbsd-cb56d1fb93a60d708f4f76e974ce8c085034779d.zip |
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
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/bio/bio.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index 0a729bded9..5030a2c2d2 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio.h,v 1.55 2022/07/12 14:42:48 kn Exp $ */ | 1 | /* $OpenBSD: bio.h,v 1.56 2022/09/11 17:26:03 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -276,8 +276,9 @@ void BIO_set_callback_arg(BIO *b, char *arg); | |||
276 | const char *BIO_method_name(const BIO *b); | 276 | const char *BIO_method_name(const BIO *b); |
277 | int BIO_method_type(const BIO *b); | 277 | int BIO_method_type(const BIO *b); |
278 | 278 | ||
279 | typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long); | ||
280 | typedef int BIO_info_cb(BIO *, int, int); | 279 | typedef int BIO_info_cb(BIO *, int, int); |
280 | /* Compatibility with OpenSSL's backward compatibility. */ | ||
281 | typedef BIO_info_cb bio_info_cb; | ||
281 | 282 | ||
282 | typedef struct bio_method_st BIO_METHOD; | 283 | typedef struct bio_method_st BIO_METHOD; |
283 | 284 | ||