From: Richard Levitte <levitte@openssl.org>
Date: Tue, 2 Feb 2016 20:42:45 +0000 (+0100)
Subject: Temporary pragma to have GCC quiet down about deprecated functions
X-Git-Tag: OpenSSL_1_1_0-pre3~309
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b00b21242ae96aeb5521252bf0cdece5be0047a1;p=oweals%2Fopenssl.git

Temporary pragma to have GCC quiet down about deprecated functions

Future commits will change our use to newer functions and the pragmas
will go away at that time.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index af40454e5c..e07141b9da 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -88,6 +88,12 @@ static int wsa_init_done = 0;
 #  define WSAAPI
 # endif
 
+/*
+ * We are currently using deprecated functions here, and GCC warns
+ * us about them, but since we know, we don't want to hear it.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 # if OPENSSL_API_COMPAT < 0x10100000L
 static int get_ip(const char *str, unsigned char *ip);
 int BIO_get_host_ip(const char *str, unsigned char *ip)
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index a489ba4d2e..e3b88504a3 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -63,6 +63,12 @@
 
 #ifndef OPENSSL_NO_SOCK
 
+/*
+ * We are currently using deprecated functions here, and GCC warns
+ * us about them, but since we know, we don't want to hear it.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 # if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #  undef FIONBIO
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 2308ad210f..89ab910f73 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -63,6 +63,12 @@
 
 #ifndef OPENSSL_NO_SOCK
 
+/*
+ * We are currently using deprecated functions here, and GCC warns
+ * us about them, but since we know, we don't want to hear it.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 # if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #  undef FIONBIO