[v1] crypto: support multiple parallel certificate identities

[PATCH 07/21] crypto: remove needless indirection via parent_obj field

Posted by Daniel P. Berrangé 2 weeks, 1 day ago

The reload method already has a pointer to the parent object in
the 'creds' parameter that is passed in, so indirect access via
the subclass 'parent_obj' field is redundant.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 crypto/tlscredsx509.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index e5b869a35f..39f80b33ad 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -773,15 +773,15 @@ qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp)
     QCryptoTLSCredsX509 *x509_creds = QCRYPTO_TLS_CREDS_X509(creds);
     Error *local_err = NULL;
     gnutls_certificate_credentials_t creds_data = x509_creds->data;
-    gnutls_dh_params_t creds_dh_params = x509_creds->parent_obj.dh_params;
+    gnutls_dh_params_t creds_dh_params = creds->dh_params;
 
     x509_creds->data = NULL;
-    x509_creds->parent_obj.dh_params = NULL;
+    creds->dh_params = NULL;
     qcrypto_tls_creds_x509_load(x509_creds, &local_err);
     if (local_err) {
         qcrypto_tls_creds_x509_unload(x509_creds);
         x509_creds->data = creds_data;
-        x509_creds->parent_obj.dh_params = creds_dh_params;
+        creds->dh_params = creds_dh_params;
         error_propagate(errp, local_err);
         return false;
     }
-- 
2.51.1

Re: [PATCH 07/21] crypto: remove needless indirection via parent_obj field

Posted by Philippe Mathieu-Daudé 2 weeks ago

On 30/10/25 15:49, Daniel P. Berrangé wrote:
> The reload method already has a pointer to the parent object in
> the 'creds' parameter that is passed in, so indirect access via
> the subclass 'parent_obj' field is redundant.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   crypto/tlscredsx509.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 07/21] crypto: remove needless indirection via parent_obj field

Posted by Marc-André Lureau 2 weeks ago

Hi

On Thu, Oct 30, 2025 at 6:49 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> The reload method already has a pointer to the parent object in
> the 'creds' parameter that is passed in, so indirect access via
> the subclass 'parent_obj' field is redundant.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  crypto/tlscredsx509.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
> index e5b869a35f..39f80b33ad 100644
> --- a/crypto/tlscredsx509.c
> +++ b/crypto/tlscredsx509.c
> @@ -773,15 +773,15 @@ qcrypto_tls_creds_x509_reload(QCryptoTLSCreds
> *creds, Error **errp)
>      QCryptoTLSCredsX509 *x509_creds = QCRYPTO_TLS_CREDS_X509(creds);
>      Error *local_err = NULL;
>      gnutls_certificate_credentials_t creds_data = x509_creds->data;
> -    gnutls_dh_params_t creds_dh_params = x509_creds->parent_obj.dh_params;
> +    gnutls_dh_params_t creds_dh_params = creds->dh_params;
>
>      x509_creds->data = NULL;
> -    x509_creds->parent_obj.dh_params = NULL;
> +    creds->dh_params = NULL;
>      qcrypto_tls_creds_x509_load(x509_creds, &local_err);
>      if (local_err) {
>          qcrypto_tls_creds_x509_unload(x509_creds);
>          x509_creds->data = creds_data;
> -        x509_creds->parent_obj.dh_params = creds_dh_params;
> +        creds->dh_params = creds_dh_params;
>          error_propagate(errp, local_err);
>          return false;
>      }
> --
> 2.51.1
>
>