You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cl...@apache.org on 2022/06/02 01:29:00 UTC
[qpid-proton] branch main updated: PROTON-2544: temporary warning-as-error disable for DH_xxx calls in openssl related code
This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 5aaa655cb PROTON-2544: temporary warning-as-error disable for DH_xxx calls in openssl related code
5aaa655cb is described below
commit 5aaa655cb1023e9fb48e59f64e3d0c1307ea54f2
Author: Clifford Jansen <cl...@apache.org>
AuthorDate: Wed Jun 1 18:28:03 2022 -0700
PROTON-2544: temporary warning-as-error disable for DH_xxx calls in openssl related code
---
c/src/ssl/openssl.c | 7 +++++++
c/src/tls/openssl.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/c/src/ssl/openssl.c b/c/src/ssl/openssl.c
index 2681d2d63..145f60e0b 100644
--- a/c/src/ssl/openssl.c
+++ b/c/src/ssl/openssl.c
@@ -371,6 +371,10 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
return preverify_ok;
}
+// Temporary: PROTON-2544 for build. Next release: replace or remove DH_xxx() functions.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
// This was introduced in v1.1
#if OPENSSL_VERSION_NUMBER < 0x10100000
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
@@ -570,6 +574,9 @@ static bool pni_init_ssl_domain( pn_ssl_domain_t * domain, pn_ssl_mode_t mode )
return true;
}
+// PROTON-2544: see earlier related push. Temporary only.
+#pragma GCC diagnostic pop
+
pn_ssl_domain_t *pn_ssl_domain( pn_ssl_mode_t mode )
{
pn_ssl_domain_t *domain = (pn_ssl_domain_t *) calloc(1, sizeof(pn_ssl_domain_t));
diff --git a/c/src/tls/openssl.c b/c/src/tls/openssl.c
index d26836c0d..de07aca62 100644
--- a/c/src/tls/openssl.c
+++ b/c/src/tls/openssl.c
@@ -692,6 +692,10 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
return preverify_ok;
}
+// Temporary: PROTON-2544 for build. Next release: replace or remove DH_xxx() functions.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
// This was introduced in v1.1
#if OPENSSL_VERSION_NUMBER < 0x10100000
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
@@ -868,6 +872,9 @@ static bool pni_init_ssl_domain( pn_tls_config_t * domain, pn_tls_mode_t mode )
return true;
}
+// PROTON-2544: see earlier related push. Temporary only.
+#pragma GCC diagnostic pop
+
pn_tls_config_t *pn_tls_config( pn_tls_mode_t mode )
{
pn_tls_config_t *domain = (pn_tls_config_t *) calloc(1, sizeof(pn_tls_config_t));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org