From: Richard Levitte Date: Fri, 20 Nov 2020 09:03:07 +0000 (+0100) Subject: Switch deprecation method for BIO X-Git-Tag: openssl-3.0.0-alpha10~165 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=894fe6e1d68216b8c656c4f5e6cde157747b7ae0;p=thirdparty%2Fopenssl.git Switch deprecation method for BIO Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13460) --- diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in index d52392def87..6bb4876022d 100644 --- a/include/openssl/bio.h.in +++ b/include/openssl/bio.h.in @@ -731,12 +731,13 @@ int BIO_sock_init(void); # define BIO_sock_cleanup() while(0) continue # endif int BIO_set_tcp_ndelay(int sock, int turn_on); - -DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name)) -DEPRECATEDIN_1_1_0(int BIO_get_port(const char *str, unsigned short *port_ptr)) -DEPRECATEDIN_1_1_0(int BIO_get_host_ip(const char *str, unsigned char *ip)) -DEPRECATEDIN_1_1_0(int BIO_get_accept_socket(char *host_port, int mode)) -DEPRECATEDIN_1_1_0(int BIO_accept(int sock, char **ip_port)) +# ifndef OPENSSL_NO_DEPRECATED_1_1_0 +OSSL_DEPRECATEDIN_1_1_0 struct hostent *BIO_gethostbyname(const char *name); +OSSL_DEPRECATEDIN_1_1_0 int BIO_get_port(const char *str, unsigned short *port_ptr); +OSSL_DEPRECATEDIN_1_1_0 int BIO_get_host_ip(const char *str, unsigned char *ip); +OSSL_DEPRECATEDIN_1_1_0 int BIO_get_accept_socket(char *host_port, int mode); +OSSL_DEPRECATEDIN_1_1_0 int BIO_accept(int sock, char **ip_port); +# endif union BIO_sock_info_u { BIO_ADDR *addr;