* [PATCH 0/6] crypto/tlscreds: QOM style cleanups
@ 2025-02-10 16:21 Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 1/6] crypto/tlscredsx509: Rename 'creds' -> 'x509_creds' Philippe Mathieu-Daudé
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
Style cleanup to avoid spreading bad examples:
Prefer accessing parent via QOM cast macro,
avoid using internal 'parent_obj' field.
Philippe Mathieu-Daudé (6):
crypto/tlscredsx509: Rename 'creds' -> 'x509_creds'
crypto/tlscredsx509: Access QOM parent via QCRYPTO_TLS_CREDS() macro
crypto/tlscredspsk: Rename 'creds' -> 'psk_creds'
crypto/tlscredspsk: Access QOM parent via QCRYPTO_TLS_CREDS() macro
crypto/tlscredsanon: Rename 'creds' -> 'anon_creds'
crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro
crypto/tlscredsanon.c | 47 ++++++++++++++-------------
crypto/tlscredspsk.c | 61 ++++++++++++++++++-----------------
crypto/tlscredsx509.c | 75 ++++++++++++++++++++++---------------------
3 files changed, 96 insertions(+), 87 deletions(-)
--
2.47.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/6] crypto/tlscredsx509: Rename 'creds' -> 'x509_creds'
2025-02-10 16:21 [PATCH 0/6] crypto/tlscreds: QOM style cleanups Philippe Mathieu-Daudé
@ 2025-02-10 16:21 ` 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é
` (4 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
In preparation of naming the QCryptoTLSCreds 'creds' in the
next commit, rename QCryptoTLSCredsX509 creds as 'x509_creds'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredsx509.c | 66 +++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index 24ec5849222..eb197e145f3 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -531,7 +531,7 @@ qcrypto_tls_creds_x509_sanity_check(QCryptoTLSCredsX509 *creds,
static int
-qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
+qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
Error **errp)
{
char *cacert = NULL, *cacrl = NULL, *cert = NULL,
@@ -539,56 +539,56 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
int ret;
int rv = -1;
- trace_qcrypto_tls_creds_x509_load(creds,
- creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
+ trace_qcrypto_tls_creds_x509_load(x509_creds,
+ x509_creds->parent_obj.dir ? x509_creds->parent_obj.dir : "<nodir>");
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_path(&creds->parent_obj,
+ if (x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CA_CERT,
true, &cacert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CA_CRL,
false, &cacrl, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_SERVER_CERT,
true, &cert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_SERVER_KEY,
true, &key, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0) {
goto cleanup;
}
} else {
- if (qcrypto_tls_creds_get_path(&creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CA_CERT,
true, &cacert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CLIENT_CERT,
false, &cert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CLIENT_KEY,
false, &key, errp) < 0) {
goto cleanup;
}
}
- if (creds->sanityCheck &&
- qcrypto_tls_creds_x509_sanity_check(creds,
- creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ if (x509_creds->sanityCheck &&
+ qcrypto_tls_creds_x509_sanity_check(x509_creds,
+ x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
cacert, cert, errp) < 0) {
goto cleanup;
}
- ret = gnutls_certificate_allocate_credentials(&creds->data);
+ ret = gnutls_certificate_allocate_credentials(&x509_creds->data);
if (ret < 0) {
error_setg(errp, "Cannot allocate credentials: '%s'",
gnutls_strerror(ret));
goto cleanup;
}
- ret = gnutls_certificate_set_x509_trust_file(creds->data,
+ ret = gnutls_certificate_set_x509_trust_file(x509_creds->data,
cacert,
GNUTLS_X509_FMT_PEM);
if (ret < 0) {
@@ -599,14 +599,14 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
if (cert != NULL && key != NULL) {
char *password = NULL;
- if (creds->passwordid) {
- password = qcrypto_secret_lookup_as_utf8(creds->passwordid,
+ if (x509_creds->passwordid) {
+ password = qcrypto_secret_lookup_as_utf8(x509_creds->passwordid,
errp);
if (!password) {
goto cleanup;
}
}
- ret = gnutls_certificate_set_x509_key_file2(creds->data,
+ ret = gnutls_certificate_set_x509_key_file2(x509_creds->data,
cert, key,
GNUTLS_X509_FMT_PEM,
password,
@@ -620,7 +620,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
}
if (cacrl != NULL) {
- ret = gnutls_certificate_set_x509_crl_file(creds->data,
+ ret = gnutls_certificate_set_x509_crl_file(x509_creds->data,
cacrl,
GNUTLS_X509_FMT_PEM);
if (ret < 0) {
@@ -630,14 +630,14 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
}
}
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
- &creds->parent_obj.dh_params,
+ if (x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_dh_params_file(&x509_creds->parent_obj, dhparams,
+ &x509_creds->parent_obj.dh_params,
errp) < 0) {
goto cleanup;
}
- gnutls_certificate_set_dh_params(creds->data,
- creds->parent_obj.dh_params);
+ gnutls_certificate_set_dh_params(x509_creds->data,
+ x509_creds->parent_obj.dh_params);
}
rv = 0;
@@ -652,15 +652,15 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
static void
-qcrypto_tls_creds_x509_unload(QCryptoTLSCredsX509 *creds)
+qcrypto_tls_creds_x509_unload(QCryptoTLSCredsX509 *x509_creds)
{
- if (creds->data) {
- gnutls_certificate_free_credentials(creds->data);
- creds->data = NULL;
+ if (x509_creds->data) {
+ gnutls_certificate_free_credentials(x509_creds->data);
+ x509_creds->data = NULL;
}
- if (creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(creds->parent_obj.dh_params);
- creds->parent_obj.dh_params = NULL;
+ if (x509_creds->parent_obj.dh_params) {
+ gnutls_dh_params_deinit(x509_creds->parent_obj.dh_params);
+ x509_creds->parent_obj.dh_params = NULL;
}
}
--
2.47.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] crypto/tlscredsx509: Access QOM parent via QCRYPTO_TLS_CREDS() macro
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:21 ` Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 3/6] crypto/tlscredspsk: Rename 'creds' -> 'psk_creds' Philippe Mathieu-Daudé
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
Prefer accessing QCryptoTLSCredsX509's QOM parent via the
QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredsx509.c | 45 +++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index eb197e145f3..84b88747f21 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -534,40 +534,41 @@ static int
qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
Error **errp)
{
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(x509_creds);
char *cacert = NULL, *cacrl = NULL, *cert = NULL,
*key = NULL, *dhparams = NULL;
int ret;
int rv = -1;
trace_qcrypto_tls_creds_x509_load(x509_creds,
- x509_creds->parent_obj.dir ? x509_creds->parent_obj.dir : "<nodir>");
+ creds->dir ? creds->dir : "<nodir>");
- if (x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_CA_CERT,
true, &cacert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_CA_CRL,
false, &cacrl, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_SERVER_CERT,
true, &cert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_SERVER_KEY,
true, &key, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0) {
goto cleanup;
}
} else {
- if (qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_CA_CERT,
true, &cacert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_CLIENT_CERT,
false, &cert, errp) < 0 ||
- qcrypto_tls_creds_get_path(&x509_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_X509_CLIENT_KEY,
false, &key, errp) < 0) {
goto cleanup;
@@ -576,7 +577,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
if (x509_creds->sanityCheck &&
qcrypto_tls_creds_x509_sanity_check(x509_creds,
- x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
cacert, cert, errp) < 0) {
goto cleanup;
}
@@ -630,14 +631,14 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
}
}
- if (x509_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_dh_params_file(&x509_creds->parent_obj, dhparams,
- &x509_creds->parent_obj.dh_params,
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_dh_params_file(creds, dhparams,
+ &creds->dh_params,
errp) < 0) {
goto cleanup;
}
gnutls_certificate_set_dh_params(x509_creds->data,
- x509_creds->parent_obj.dh_params);
+ creds->dh_params);
}
rv = 0;
@@ -654,13 +655,15 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
static void
qcrypto_tls_creds_x509_unload(QCryptoTLSCredsX509 *x509_creds)
{
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(x509_creds);
+
if (x509_creds->data) {
gnutls_certificate_free_credentials(x509_creds->data);
x509_creds->data = NULL;
}
- if (x509_creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(x509_creds->parent_obj.dh_params);
- x509_creds->parent_obj.dh_params = NULL;
+ if (creds->dh_params) {
+ gnutls_dh_params_deinit(creds->dh_params);
+ creds->dh_params = NULL;
}
}
@@ -746,15 +749,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.47.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] crypto/tlscredspsk: Rename 'creds' -> 'psk_creds'
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:21 ` [PATCH 2/6] crypto/tlscredsx509: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
@ 2025-02-10 16:21 ` Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 4/6] crypto/tlscredspsk: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
In preparation of naming the QCryptoTLSCreds 'creds' in the
next commit, rename QCryptoTLSCredsPSK creds as 'psk_creds'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredspsk.c | 58 ++++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c
index aa270d7988b..033f1d4287b 100644
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -68,7 +68,7 @@ lookup_key(const char *pskfile, const char *username, gnutls_datum_t *key,
}
static int
-qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds,
+qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
Error **errp)
{
g_autofree char *pskfile = NULL;
@@ -78,54 +78,54 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds,
int rv = -1;
gnutls_datum_t key = { .data = NULL };
- trace_qcrypto_tls_creds_psk_load(creds,
- creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
+ trace_qcrypto_tls_creds_psk_load(psk_creds,
+ psk_creds->parent_obj.dir ? psk_creds->parent_obj.dir : "<nodir>");
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (creds->username) {
+ if (psk_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (psk_creds->username) {
error_setg(errp, "username should not be set when endpoint=server");
goto cleanup;
}
- if (qcrypto_tls_creds_get_path(&creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0 ||
- qcrypto_tls_creds_get_path(&creds->parent_obj,
+ qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
QCRYPTO_TLS_CREDS_PSKFILE,
true, &pskfile, errp) < 0) {
goto cleanup;
}
- ret = gnutls_psk_allocate_server_credentials(&creds->data.server);
+ ret = gnutls_psk_allocate_server_credentials(&psk_creds->data.server);
if (ret < 0) {
error_setg(errp, "Cannot allocate credentials: %s",
gnutls_strerror(ret));
goto cleanup;
}
- if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
- &creds->parent_obj.dh_params,
+ if (qcrypto_tls_creds_get_dh_params_file(&psk_creds->parent_obj, dhparams,
+ &psk_creds->parent_obj.dh_params,
errp) < 0) {
goto cleanup;
}
- ret = gnutls_psk_set_server_credentials_file(creds->data.server, pskfile);
+ ret = gnutls_psk_set_server_credentials_file(psk_creds->data.server, pskfile);
if (ret < 0) {
error_setg(errp, "Cannot set PSK server credentials: %s",
gnutls_strerror(ret));
goto cleanup;
}
- gnutls_psk_set_server_dh_params(creds->data.server,
- creds->parent_obj.dh_params);
+ gnutls_psk_set_server_dh_params(psk_creds->data.server,
+ psk_creds->parent_obj.dh_params);
} else {
- if (qcrypto_tls_creds_get_path(&creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
QCRYPTO_TLS_CREDS_PSKFILE,
true, &pskfile, errp) < 0) {
goto cleanup;
}
- if (creds->username) {
- username = creds->username;
+ if (psk_creds->username) {
+ username = psk_creds->username;
} else {
username = "qemu";
}
@@ -133,14 +133,14 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds,
goto cleanup;
}
- ret = gnutls_psk_allocate_client_credentials(&creds->data.client);
+ ret = gnutls_psk_allocate_client_credentials(&psk_creds->data.client);
if (ret < 0) {
error_setg(errp, "Cannot allocate credentials: %s",
gnutls_strerror(ret));
goto cleanup;
}
- ret = gnutls_psk_set_client_credentials(creds->data.client,
+ ret = gnutls_psk_set_client_credentials(psk_creds->data.client,
username, &key, GNUTLS_PSK_KEY_HEX);
if (ret < 0) {
error_setg(errp, "Cannot set PSK client credentials: %s",
@@ -157,22 +157,22 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds,
static void
-qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *creds)
+qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *psk_creds)
{
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
- if (creds->data.client) {
- gnutls_psk_free_client_credentials(creds->data.client);
- creds->data.client = NULL;
+ if (psk_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
+ if (psk_creds->data.client) {
+ gnutls_psk_free_client_credentials(psk_creds->data.client);
+ psk_creds->data.client = NULL;
}
} else {
- if (creds->data.server) {
- gnutls_psk_free_server_credentials(creds->data.server);
- creds->data.server = NULL;
+ if (psk_creds->data.server) {
+ gnutls_psk_free_server_credentials(psk_creds->data.server);
+ psk_creds->data.server = NULL;
}
}
- if (creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(creds->parent_obj.dh_params);
- creds->parent_obj.dh_params = NULL;
+ if (psk_creds->parent_obj.dh_params) {
+ gnutls_dh_params_deinit(psk_creds->parent_obj.dh_params);
+ psk_creds->parent_obj.dh_params = NULL;
}
}
--
2.47.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] crypto/tlscredspsk: Access QOM parent via QCRYPTO_TLS_CREDS() macro
2025-02-10 16:21 [PATCH 0/6] crypto/tlscreds: QOM style cleanups Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2025-02-10 16:21 ` [PATCH 3/6] crypto/tlscredspsk: Rename 'creds' -> 'psk_creds' Philippe Mathieu-Daudé
@ 2025-02-10 16:21 ` 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 ` [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
5 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
Prefer accessing QCryptoTLSCredsPSK's QOM parent via the
QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredspsk.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c
index 033f1d4287b..69769bc0b28 100644
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -71,6 +71,7 @@ static int
qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
Error **errp)
{
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(psk_creds);
g_autofree char *pskfile = NULL;
g_autofree char *dhparams = NULL;
const char *username;
@@ -79,18 +80,18 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
gnutls_datum_t key = { .data = NULL };
trace_qcrypto_tls_creds_psk_load(psk_creds,
- psk_creds->parent_obj.dir ? psk_creds->parent_obj.dir : "<nodir>");
+ creds->dir ? creds->dir : "<nodir>");
- if (psk_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
if (psk_creds->username) {
error_setg(errp, "username should not be set when endpoint=server");
goto cleanup;
}
- if (qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0 ||
- qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
+ qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_PSKFILE,
true, &pskfile, errp) < 0) {
goto cleanup;
@@ -103,8 +104,8 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
goto cleanup;
}
- if (qcrypto_tls_creds_get_dh_params_file(&psk_creds->parent_obj, dhparams,
- &psk_creds->parent_obj.dh_params,
+ if (qcrypto_tls_creds_get_dh_params_file(creds, dhparams,
+ &creds->dh_params,
errp) < 0) {
goto cleanup;
}
@@ -116,9 +117,9 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
goto cleanup;
}
gnutls_psk_set_server_dh_params(psk_creds->data.server,
- psk_creds->parent_obj.dh_params);
+ creds->dh_params);
} else {
- if (qcrypto_tls_creds_get_path(&psk_creds->parent_obj,
+ if (qcrypto_tls_creds_get_path(creds,
QCRYPTO_TLS_CREDS_PSKFILE,
true, &pskfile, errp) < 0) {
goto cleanup;
@@ -159,7 +160,9 @@ qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *psk_creds,
static void
qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *psk_creds)
{
- if (psk_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
+ QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(psk_creds);
+
+ if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
if (psk_creds->data.client) {
gnutls_psk_free_client_credentials(psk_creds->data.client);
psk_creds->data.client = NULL;
@@ -170,9 +173,9 @@ qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *psk_creds)
psk_creds->data.server = NULL;
}
}
- if (psk_creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(psk_creds->parent_obj.dh_params);
- psk_creds->parent_obj.dh_params = NULL;
+ if (creds->dh_params) {
+ gnutls_dh_params_deinit(creds->dh_params);
+ creds->dh_params = NULL;
}
}
--
2.47.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] crypto/tlscredsanon: Rename 'creds' -> 'anon_creds'
2025-02-10 16:21 [PATCH 0/6] crypto/tlscreds: QOM style cleanups Philippe Mathieu-Daudé
` (3 preceding siblings ...)
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 ` Philippe Mathieu-Daudé
2025-02-10 16:21 ` [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
5 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
In preparation of naming the QCryptoTLSCreds 'creds' in the
next commit, rename QCryptoTLSCredsAnon creds as 'anon_creds'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
crypto/tlscredsanon.c | 44 +++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 476cf89c963..15808329d89 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -33,39 +33,39 @@
static int
-qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
+qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *anon_creds,
Error **errp)
{
g_autofree char *dhparams = NULL;
int ret;
- trace_qcrypto_tls_creds_anon_load(creds,
- creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
+ trace_qcrypto_tls_creds_anon_load(anon_creds,
+ anon_creds->parent_obj.dir ? anon_creds->parent_obj.dir : "<nodir>");
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- if (qcrypto_tls_creds_get_path(&creds->parent_obj,
+ if (anon_creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
+ if (qcrypto_tls_creds_get_path(&anon_creds->parent_obj,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0) {
return -1;
}
- ret = gnutls_anon_allocate_server_credentials(&creds->data.server);
+ ret = gnutls_anon_allocate_server_credentials(&anon_creds->data.server);
if (ret < 0) {
error_setg(errp, "Cannot allocate credentials: %s",
gnutls_strerror(ret));
return -1;
}
- if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
- &creds->parent_obj.dh_params,
+ if (qcrypto_tls_creds_get_dh_params_file(&anon_creds->parent_obj, dhparams,
+ &anon_creds->parent_obj.dh_params,
errp) < 0) {
return -1;
}
- gnutls_anon_set_server_dh_params(creds->data.server,
- creds->parent_obj.dh_params);
+ gnutls_anon_set_server_dh_params(anon_creds->data.server,
+ anon_creds->parent_obj.dh_params);
} else {
- ret = gnutls_anon_allocate_client_credentials(&creds->data.client);
+ ret = gnutls_anon_allocate_client_credentials(&anon_creds->data.client);
if (ret < 0) {
error_setg(errp, "Cannot allocate credentials: %s",
gnutls_strerror(ret));
@@ -78,22 +78,22 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
static void
-qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *creds)
+qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *anon_creds)
{
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
- if (creds->data.client) {
- gnutls_anon_free_client_credentials(creds->data.client);
- creds->data.client = NULL;
+ if (anon_creds->parent_obj.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;
}
} else {
- if (creds->data.server) {
- gnutls_anon_free_server_credentials(creds->data.server);
- creds->data.server = NULL;
+ if (anon_creds->data.server) {
+ gnutls_anon_free_server_credentials(anon_creds->data.server);
+ anon_creds->data.server = NULL;
}
}
- if (creds->parent_obj.dh_params) {
- gnutls_dh_params_deinit(creds->parent_obj.dh_params);
- creds->parent_obj.dh_params = 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;
}
}
--
2.47.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro
2025-02-10 16:21 [PATCH 0/6] crypto/tlscreds: QOM style cleanups Philippe Mathieu-Daudé
` (4 preceding siblings ...)
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é
5 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-02-10 16:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/6] crypto/tlscredsx509: Rename 'creds' -> 'x509_creds'
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é
0 siblings, 0 replies; 8+ messages in thread
From: Daniel P. Berrangé @ 2025-02-10 16:32 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel
On Mon, Feb 10, 2025 at 05:21:30PM +0100, Philippe Mathieu-Daudé wrote:
> In preparation of naming the QCryptoTLSCreds 'creds' in the
> next commit, rename QCryptoTLSCredsX509 creds as 'x509_creds'.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> crypto/tlscredsx509.c | 66 +++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
> index 24ec5849222..eb197e145f3 100644
> --- a/crypto/tlscredsx509.c
> +++ b/crypto/tlscredsx509.c
> @@ -531,7 +531,7 @@ qcrypto_tls_creds_x509_sanity_check(QCryptoTLSCredsX509 *creds,
>
>
> static int
> -qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
> +qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *x509_creds,
I can't say I like this naming.
If we want a variable for the parent class to not clash, imho,
just make the next patch use 'pcreds' (as short for "parent creds")
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-02-10 16:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro Philippe Mathieu-Daudé
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).