From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro
Date: Mon, 10 Feb 2025 17:21:35 +0100 [thread overview]
Message-ID: <20250210162135.14123-7-philmd@linaro.org> (raw)
In-Reply-To: <20250210162135.14123-1-philmd@linaro.org>
Prefer accessing QCryptoTLSCredsAnon's QOM parent via the
QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredsanon.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 15808329d89..d42404acd8b 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -36,14 +36,15 @@ static int
qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *anon_creds,
Error **errp)
{
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(anon_creds);
g_autofree char *dhparams = NULL;
int ret;
trace_qcrypto_tls_creds_anon_load(anon_creds,
- anon_creds->parent_obj.dir ? anon_creds->parent_obj.dir : "<nodir>");
+ creds->dir ? creds->dir : "<nodir>");
- if (anon_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_path(&anon_creds->parent_obj,
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0) {
return -1;
@@ -56,14 +57,14 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *anon_creds,
return -1;
}
- if (qcrypto_tls_creds_get_dh_params_file(&anon_creds->parent_obj, dhparams,
- &anon_creds->parent_obj.dh_params,
+ if (qcrypto_tls_creds_get_dh_params_file(creds, dhparams,
+ &creds->dh_params,
errp) < 0) {
return -1;
}
gnutls_anon_set_server_dh_params(anon_creds->data.server,
- anon_creds->parent_obj.dh_params);
+ creds->dh_params);
} else {
ret = gnutls_anon_allocate_client_credentials(&anon_creds->data.client);
if (ret < 0) {
@@ -80,7 +81,9 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *anon_creds,
static void
qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *anon_creds)
{
- if (anon_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(anon_creds);
+
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
if (anon_creds->data.client) {
gnutls_anon_free_client_credentials(anon_creds->data.client);
anon_creds->data.client = NULL;
@@ -91,9 +94,9 @@ qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *anon_creds)
anon_creds->data.server = NULL;
}
}
- if (anon_creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(anon_creds->parent_obj.dh_params);
- anon_creds->parent_obj.dh_params = NULL;
+ if (creds->dh_params) {
+ gnutls_dh_params_deinit(creds->dh_params);
+ creds->dh_params = NULL;
}
}
--
2.47.1
prev parent reply other threads:[~2025-02-10 16:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-10 16:21 [PATCH 0/6] crypto/tlscreds: QOM style cleanups Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 1/6] crypto/tlscredsx509: Rename 'creds' -> 'x509_creds' Philippe Mathieu-Daudé
2025-02-10 16:32 ` Daniel P. Berrangé
2025-02-10 16:21 ` [PATCH 2/6] crypto/tlscredsx509: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 3/6] crypto/tlscredspsk: Rename 'creds' -> 'psk_creds' Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 4/6] crypto/tlscredspsk: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 5/6] crypto/tlscredsanon: Rename 'creds' -> 'anon_creds' Philippe Mathieu-Daudé
2025-02-10 16:21 ` Philippe Mathieu-Daudé [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250210162135.14123-7-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).