diff mbox series

[6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro

Message ID 20250210162135.14123-7-philmd@linaro.org
State New
Headers show
Series crypto/tlscreds: QOM style cleanups | expand

Commit Message

Philippe Mathieu-Daudé Feb. 10, 2025, 4:21 p.m. UTC 
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 mbox series

Patch

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;
     }
 }