From patchwork Mon Feb 10 16:21:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863808 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1679508wrt; Mon, 10 Feb 2025 08:24:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVUqRta42IOkdQItBuNgEJvaPPc2jUlt0Ub15B8N3Hy4HkkX4NKjAVue5htEwndXkwCzyJJLQ==@linaro.org X-Google-Smtp-Source: AGHT+IGPQFgLyAJ65MjQr3WWfKqAEvfgh1Q9IdEIEaCm5Frd0tmTB9bpRc6JlH6+ElDe3kYHVCfF X-Received: by 2002:a5d:64af:0:b0:38d:d371:e01d with SMTP id ffacd0b85a97d-38dd371e466mr7728129f8f.49.1739204650089; Mon, 10 Feb 2025 08:24:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204650; cv=none; d=google.com; s=arc-20240605; b=N/lG1LiPFsvbDsaXuduMwvau0QC3Yh9UFJBfd0YfafT6MzEwXeqiME4V7Igc8+scYi MPqjQ19gbaasUwwVUkSe0Ia+iDGjeY8bLFNgC5+FpAWUqhIXmulfNN2R/gOJwZ9UGDTJ fnyV5lMaUHWEaFVgZ2dvnV2Xqs9KfCZis13tEFSjG+P4Kcx8nS4ZniLAZRw/sKVqrdBZ TqPm+NVM/2Cuq34O9yjjaHud/nWYtBxuOvNb3xHRhgSonpo1aqO7SJIVsNE0CAzZIP15 FChwDap4Hi72PdJb4lLxVeSRZ7zkkoHZyRiXZ4MIsepF538OcalZtW9ePR7GFrpXlLV5 QzEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jGsIufIqKlssjun5TXHkqohjkAkuZtcXK/WYSEIHmcE=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=aw04i/l13NYRObHtOSFSLkV/5UsCm3y5CdLDKCwYYvb+9e0z1HN6W1yJVeJalqVfap 8kkiAEVbAcVA5Eao2FyeWM0EOT/IhZzI7ThcuOVtLRDbrffh84SGgzksqjEbqRPk8Pcl pOcEgjU2pRNxBUZGLyihwMZzpXkADmkdEY8y8EyfXIxha7COA05F95red+cBhCvgA17U 5hddOVDYAY0EeQLgDjFkLLtlTpCqlcnXKtQRAm4d+Gf8J9iDqo9FJ9wTEk11oPBQyBmA lt2fiemMgmcaidknnwR4mbAuNjN3KUUneiauuAMRMqel7bCMWlYY/78YCCRsnxn0wsX6 G82w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sYr6vG0y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-38dca32b5ddsi4932460f8f.120.2025.02.10.08.24.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:24:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sYr6vG0y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWY6-00034Q-OB; Mon, 10 Feb 2025 11:22:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXa-0002Ty-3u for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:50 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXY-0002lO-8R for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:45 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43944181e68so12882475e9.0 for ; Mon, 10 Feb 2025 08:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204502; x=1739809302; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jGsIufIqKlssjun5TXHkqohjkAkuZtcXK/WYSEIHmcE=; b=sYr6vG0yEL1Frbl0mWNb2X2vqgL9AVX7/MSPpt62cqUqR9M0/dJXEh3UUc/d51hBt3 e57EtMwSJKitJHtINirfaVph+rzCKXIrJNrKaoRS+fjxhzKITNceXIz8KntKnUkSCqpW f32+dz1y8pr7P8C+jiQLdq1Gv20mKsjpsO8PxaKKWzyqASEPnTwYFzd3b8lk0Kpz4xPQ H5gV31Gsi0kt+QV4KUxGIQD1FLNwP/IVQsPYEDkfZKMntZNKjXZut+oXVwO/AWx4Aheo HEgdVa/qacqh2LHPQzO9XJvAMfWalx4+orwSSiWnVhHZWubO9E7pJ6UFQemcm/+P3mzr /w5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204502; x=1739809302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jGsIufIqKlssjun5TXHkqohjkAkuZtcXK/WYSEIHmcE=; b=opFmZTUjRuB+K3Ztv1QJ1l06TOvuTwqDiR4fkm3iHcUJ0mO632VrHwso2ZA0oXIojS PkewrTqwYuiCoRDHc8wq1AWgRp9hOOvYxNATev0Gei9cF+hhnICbHIdRZ1vl0/CcvTty gtFXc2S3jOV07WTyaTAF2500xMX0aLPum1tkyY9983Zfwo/KmH9lZ5aVeU2Ps9rrCxBo 8ZU4M5icYSpl7nEUcN1No1XamrxBqiXaKtohunq9h7YtNTN87iGQS+d7y/1IRRQqBdeK 72slzsIqRPTWRC96/Yb4M7B29lQ5nV6LlJ15y0GnlUAriITZhupTy1J0i+2HXi0pLWVA uw+A== X-Gm-Message-State: AOJu0YxedntLxy1ODavGtNpF+ta7LxjrkGs8I6Qb6M2/veGWf+nv+j1U l38wVLwdoP7Mpzr38C/BAHVsGOr1L8EOd8lllNg/oj7kHUJE1sxqZKS92rsg5Tn4tbEmki0yPaM auVM= X-Gm-Gg: ASbGncvs2EECIDmUJyCzcW8BS17VZXFJ5PPVWJARw45slKmYIY6o5hJrJEGWf4pkX8r MdV0wdJ9rmsJVRQQ0tcwZHvYcnyKuZYuxtAwraSxcmltKO1eENTcMJOgXZDtJfehp4azAUo0ho2 gcjwuuirV8MLkGUSiObhnWPOOICjWYKjxHfMuVsPTHvZWG+vNA6pMTr/HPUOYm/DMfF3Vq5utol qDFhrelHiIi+jpiyCCLtqTFDVOEitoFJtlHlzilIdBpuaeyk3sIawbcDdPIUhuZwfOTPJFJU0lr SyIgBladan1eun7vz0TUqukaFcglfMHAi+C2M+8a6bPQyCXmW/x1WLYP3q/Q5I1/Ow== X-Received: by 2002:a05:600c:4f05:b0:434:a802:e9a6 with SMTP id 5b1f17b1804b1-43924989da5mr135420505e9.7.1739204502137; Mon, 10 Feb 2025 08:21:42 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4394328fcb8sm40812425e9.32.2025.02.10.08.21.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:21:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/6] crypto/tlscredsx509: Rename 'creds' -> 'x509_creds' Date: Mon, 10 Feb 2025 17:21:30 +0100 Message-ID: <20250210162135.14123-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In preparation of naming the QCryptoTLSCreds 'creds' in the next commit, rename QCryptoTLSCredsX509 creds as 'x509_creds'. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + trace_qcrypto_tls_creds_x509_load(x509_creds, + x509_creds->parent_obj.dir ? x509_creds->parent_obj.dir : ""); - 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; } } From patchwork Mon Feb 10 16:21:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863811 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1680486wrt; Mon, 10 Feb 2025 08:26:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU20jzJfamVCzmdc2HlKzIWovanYt2xyzSZzrpJYHfMfR+O6fVEV2EAUpuFRNPoJihIztMi9w==@linaro.org X-Google-Smtp-Source: AGHT+IGYkfArn3ycVI2uL/VnSw2UHsASwFZEFKdSrWyU4o7QBRgsfYBX5iVX1x0kGnrJcQK9XUqO X-Received: by 2002:a5d:5987:0:b0:38d:d759:3dea with SMTP id ffacd0b85a97d-38dd7593ff6mr6753019f8f.26.1739204771560; Mon, 10 Feb 2025 08:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204771; cv=none; d=google.com; s=arc-20240605; b=WCBPZ5Y5Pb+h7ojxzZWqiQhVc6f8ayZjRCG9SH73VJTrJk2J8i+zA5Q2JqcKgxRuuS CZ3XIGqojd2HaHSuoDnmnPEyR0Nv3hUUyVK49cnRX7qF946GCG9JfXCJ2/7HaaEqkzSL nFZ8FBlvgKMaEHIeWwBJezH3HjipZ9E8sIkIBVPWTKuTtS6CHsXTUFwXhiZtaDUqTCMw PwYvrk7Dd83H5Z7Mt5WBIlU9gTnBeNcCtFYVdmMzIbewz4AlYUPTpOTiinE9QvOOAiZV iNXpM1oXkIAwQF3i5OK/RYakCQr1OVfnDtrjUTZd3aCCGAZCQBqN1GjS5gvnntb2CMmF k4Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qsTRNQTUfL2h+m/cpyp4nywBspQp5fByW/Zolmcu5/c=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=g02sJVFNyIG2F4REwqXV+8P5I+firWrEqTP3/aOXXE2+Po0lL0/7fEXVFAhbXvK5Q1 mObYDsCXumHCuLpXojh48RhKg2K7a+o7EDNSuG1TH9MkhhNnIabVqku6Wr08S9ycblw8 6cUobe/FmEotnwf2diRFZkQ+PtzLlFjTh4is0mvAaGLxBm7fecpEpMmOlx5vBQkhtGKq gICobfyJi093Rcu6IqrfHE9gOeH8x95kcIe08gpmvjVunFePE9nPAB+EfZBffGYky11Q GhKITF8UlHx4k7o1+rUX4Q73LoPnd1p5fyFoxVdaPOIkUtUzTt8whUlG8KkR5X2dSbxL FuKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RhrCs16t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-38dd8f79002si2737666f8f.859.2025.02.10.08.26.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:26:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RhrCs16t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWXs-0002mO-IG; Mon, 10 Feb 2025 11:22:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXe-0002Uv-OA for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:52 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXc-0002lk-Lr for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:50 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-38dcf8009f0so1505807f8f.2 for ; Mon, 10 Feb 2025 08:21:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204507; x=1739809307; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qsTRNQTUfL2h+m/cpyp4nywBspQp5fByW/Zolmcu5/c=; b=RhrCs16tns4F9azXDP5mH+5jDQAMZ3ZbFgwrhBDzO+rh+B0PZrFK50gSQozMi4JZbg cOtf/BP9rxxtDgnxfbOqCes412TFbo7L9ieR6N/hfgwC7G3GexWLn9ag3hGUFVhzyVQ8 xt313L6apj9hzOaCCz0AG93ACiieFCFgWp0BACqCAC11rLKEm+5uca4hZcUdT39Q51Iw sgAPRiEGNOv6Th1HyW5dHaPyVnMv/669THgCd5+HWIU4uQjES94jB0HNxtV8PlFjdRvR 2YSazkpKtrDJWYFl8pmwfehbZRNNbZAmF2FAC87LAG7ITi1kb9FFy28Bgjtk/plDEsC7 kYJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204507; x=1739809307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qsTRNQTUfL2h+m/cpyp4nywBspQp5fByW/Zolmcu5/c=; b=mIyqDkUEgMcdlhEc6CFOuu1IUSTDxdxmfbnLUWhCZsL4sB5OToSt33pnroO7be3E9p qMMvqa6tbJViEYvdKuHN9O5TfChtFyoore8F2l/KDZoeiRY+XHbPzz8O4ewnILlmSXkp UcT41Ik4nFeIxXWyJiTMIsdGq2t8vVnwpgyALjQY7MasihbAfPdV4gxAtCcEHxcSuC+N pzSx6n9w4fH2fZLg091KsHLcu4aFQm3NoubULdG4iMJnSvkIOA8eSh6lB0lWG4/2dmR7 g6dTtSSf6MTwu9IrweIf5U9gA43eSboBsIW5OI2+dxRJ5vaZ82yZZCtRHN/V41QTzF4q zd8A== X-Gm-Message-State: AOJu0Yz7qIjJ9OFBXFNBkinDVn+4m9IUp8H+gx0peVzM+KZ6Izcxgtmw e5HL35TTqd7uLMADBGEbRnATbrB30U+P1M5yww+Y4ukQza6jUh28MbiEOKhOPYfAL3R7zrpX5wG PpQ0= X-Gm-Gg: ASbGncvBxR/fI/OCLpL0AerTY6I2JbyhmxCZdS2hQ+CkFLcTmyv0f3rikv5/+UVCg1W eb1AP1TG8mSYna3WrNYnpZ3iJujDv9sRufEhQCCrTGl66/cjywWbLyPGC8UI6AJFznB3REpvlJq X/SzbYohlaxqJxj2H8VosKvwKH0Cv/vAEA1l06uuLyYStuop/b8s5MW3B/aw7jPug7uEoCwBDSt Z/G0UFr+xbOLQbaPSryMQNcq9tr2O8E4F8YFulEJ9rmTnFScKkw3dEepLl9ivIj2mQh746Cg2Bz LJC3bYVcv6lo+TTG9yeTlBqoGlI9A6Qq26W4Ch5XVfM61fmpxutrtu7Ylhlm1bQZbw== X-Received: by 2002:a05:6000:1f83:b0:38d:de92:adab with SMTP id ffacd0b85a97d-38dde92ae55mr4463016f8f.29.1739204506832; Mon, 10 Feb 2025 08:21:46 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc7711bbbsm10303526f8f.47.2025.02.10.08.21.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:21:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/6] crypto/tlscredsx509: Access QOM parent via QCRYPTO_TLS_CREDS() macro Date: Mon, 10 Feb 2025 17:21:31 +0100 Message-ID: <20250210162135.14123-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Prefer accessing QCryptoTLSCredsX509's QOM parent via the QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + creds->dir ? creds->dir : ""); - 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; } From patchwork Mon Feb 10 16:21:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863802 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1679214wrt; Mon, 10 Feb 2025 08:23:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVOzTeM2YqzH6LQpRWCvvwEFud3aBZhKb/fYz7ymHjpE5e72pilbECzamRijXVK/TcfnZr5dg==@linaro.org X-Google-Smtp-Source: AGHT+IGIQ2XCwxYc+mB+7D9zAD6IFGVFHK+DI7vWWUm8matBzuLiVeJZARkGcJHbjvoUSnoZRDZf X-Received: by 2002:a05:6000:1567:b0:38d:d166:d44 with SMTP id ffacd0b85a97d-38dd1661220mr9628647f8f.23.1739204614689; Mon, 10 Feb 2025 08:23:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204614; cv=none; d=google.com; s=arc-20240605; b=QuG9ET/DtHsDcEds/IMNdGyylr6JsHMYM4gtkb7kzgY/rKlpxw0yIdk6fKrBM1GsgO pgCJ8iqYX+ozkCI3s2F0AvGp3LKuzSSwpBsoesGzUmIatedsuBO3GCk+n1rYJx2wAMKV I7Xfv0sEH20pGNChMsx7p4ziJCXlHZkVHzJHZ0PSIa3EkAFYnmbj728E07qnJD8JPx+p zEsBE7+T89nLrdCYpPMEWRPFfM7SX0Jo1HbD7ZTQrRMrW76fNYgC2ZmZIhAfrcZcgike 1n2ytwi4UXMprBRLDl80cl31G1iVAWoIxCD5l2sgJpUeY76rEUZfioGOHywDAa+Q6w8h DjlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jPAQvpFRjPctQI6PmGKtxnrUvgxo4boPkJkljtp3rbA=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=BsHI/Tyx3LIcXti0LMb6g7KZIVAXo/GMc3zXSMjGnhePqquyEmnfS20RCH4NHnLrHX WE7MPp2rfisOgC4mtZn7X/i+h72R+4fapvVH5wETnMbmAnFv36NyB9g/zZa5TD3TnXBd rQFYAsJU9p+0MRPUXU7oG2i8CJ56BJOa8ySg8f1lyBDPQ5rQfKmkw4GjQSiHFy8zsnbS dbccH5R+lPZQRP5YXMW7+EKBYIzrffGbTLgWUynJRh3hZ0sTtHvPA7/cjteK+cDKvLj1 3RyAntMi89Zl2QdCpMUEoHU3ep+JSyVFkFOE8HVyjdtzC0XwnFXlbALPn9xQ1ryC+kt8 S64Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rFqmg6tY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-38dca646e40si5238255f8f.804.2025.02.10.08.23.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:23:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rFqmg6tY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWYe-0004c0-SJ; Mon, 10 Feb 2025 11:23:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXn-0002kl-9t for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:59 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXh-0002mW-OO for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:21:58 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4394829ef0fso5236055e9.0 for ; Mon, 10 Feb 2025 08:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204512; x=1739809312; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jPAQvpFRjPctQI6PmGKtxnrUvgxo4boPkJkljtp3rbA=; b=rFqmg6tYWSQO4SyTjSyVUZkts21QlOTAHYKyh2z/+tzQe/h//E4cqilVp12DIhEXr5 qejxvBtHKmthplJ2ZhBPMzn+GxdqFq/J8oPAuSbijTnPuBQVDLavv6djD5s8D5wh4D04 b5BrC91qEMHOlfLt+w65HYA5TYFMcJNFO1Y4U4jpPuUVOrAjLMxJr4gEwAG0w9cFsiL/ PoVnppORbdjQnnR/YBD/ocvJbVKeS10d657Sqa5LvVu+RCxGOt/dQ2QuxxYgyLOCSSin BX+WDL5r9A7Dm9igiNeAZyh4FVnvcHunw1I1dvGlrJV5lkvTjJKucQeQTaIaADwOmsLu U7IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204512; x=1739809312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jPAQvpFRjPctQI6PmGKtxnrUvgxo4boPkJkljtp3rbA=; b=o/nUW0VwQMBYdUhwtr6fbMhTNYIKQ6iOEYmM15WcN53O73Fi7NZjgqOtzUnGRzsO67 AyHr9hWEqwff2phDJyfRfp2Q7iTMTj2E8xroxq/mNbbMiv8y3O0y9JyyJGQI3C+NGG5g OKTGPIBpRE/L7MFFDHNwa36ZBhxNJvr/trnuBGvzAGK85XqGG0+7S53YLkv0lKgmpe8x DxEoqpHq1fyUqfhEJbbvl0XsN8xb0GmqT0LzmHktYtpPIs/jMoE2BehibBlDELgQow9M /X44uFYkawFoaEx6XWHYB8U8ofiXqoXLMGzpEQShus5xZXz3yOIwW2Nj0N0t0VLFwA+t PNqw== X-Gm-Message-State: AOJu0YwK2eA4A8z0QXTlU6K21tRoq1iRONT6s7M/iY8ALFwkmGhykgWk vlbgA1afGC0g5yOvQGAic0/ZKe55IGX5JEMAuZKSiW4CwVupWfBiqlloHITRFvEw0UHxAvzjAO6 USH8= X-Gm-Gg: ASbGncvYJayQXv010K+PhUa7mIDcNJG3zgCrXYAyzdNQC32dVmRoPCjxzH5yJBhos66 YHpRWZSdKUtxleVjpojKr3sSuLg64RvvrtzoL3F7IJs++uZy4SiYD+fHq0HxkZpB5dbl7gr4nH/ 6TZklmaJfE5tnCwYIwjKTLeoLPn6CXEX1Bkpl07uDJLnrJ4rduPju1AKkY4c6iPDvhkKBy2gRDS 7JtnLXwSmhgnp9IwDrg5URm64AFsspATVNtVrhblJ6JNHXleKv0O2v9DC4oV7Opkxw5BOMXN+sn eEcYPlIIYsJvzOD8OgLEUFR52pQkuXueG6KrNaysXk/VSwOdKsz5ih5PDHNkYuPz4A== X-Received: by 2002:a5d:598b:0:b0:38d:d026:5af8 with SMTP id ffacd0b85a97d-38dd0265e43mr8776674f8f.12.1739204511617; Mon, 10 Feb 2025 08:21:51 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc3a10fffsm11812283f8f.12.2025.02.10.08.21.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:21:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/6] crypto/tlscredspsk: Rename 'creds' -> 'psk_creds' Date: Mon, 10 Feb 2025 17:21:32 +0100 Message-ID: <20250210162135.14123-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In preparation of naming the QCryptoTLSCreds 'creds' in the next commit, rename QCryptoTLSCredsPSK creds as 'psk_creds'. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + trace_qcrypto_tls_creds_psk_load(psk_creds, + psk_creds->parent_obj.dir ? psk_creds->parent_obj.dir : ""); - 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; } } From patchwork Mon Feb 10 16:21:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863807 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1679504wrt; Mon, 10 Feb 2025 08:24:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWEJgOOSkMtNvAFSQq0rLqhEo031jmm58zL+fbmfeNi8WFfLQG4v7tk+lrWG6kgvM5Ji2+LAg==@linaro.org X-Google-Smtp-Source: AGHT+IHhJtNqm/YMbcTJxfcUk3cfgRRAEHg0wZeMumil/tF/uAeob5vSHHE2pBVpFSdEltTGKd4E X-Received: by 2002:a05:6000:2aa:b0:38d:daf3:be6a with SMTP id ffacd0b85a97d-38ddaf3c061mr7226980f8f.40.1739204649707; Mon, 10 Feb 2025 08:24:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204649; cv=none; d=google.com; s=arc-20240605; b=PzBuMYmcnve82hQZAWN9pcodabR2oYPJJ2c83apGKpaqbk3RVsVOYIsRaL5/fzWwSh UOk/mvBxcqTSJF8Ywy+wORbeSR312yI9OLJRdYfnxWcprA//opzFtV4CUrD7ynqu3DZ5 z9kXZAP9+JuwlZWZMZZhwct/GhawYEp27+fthkOG1CqOivAGL1Rn/r5heJkWLPwkmESr UUhioA28ZEgP++3cIKqEVN+W6ik+v3iU5iIe4HD303YXW9PeItZ5hkFBU+wWiZ5BIX4+ DIZTjw20RtgqCzMs0lRgDbuKVpHKOCk/In3+kuVBNyR8EzCJ1UpShLqxUxBn6B+JDy8f ExUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bjYHACE69TKRgftmtMmsnjmBnOemI4kgCBT6PrMcoww=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=h6chk1auh0Zo2Vxb6F8mrDM7g9kMEjEYhpKq/nP+KiPMGAFi4wYpf0ep7dwfxb3Dz5 oCXXt3hzvB1IvoqvF2l/Vh9kx1rs7LrcBjFQcpfBK2RvISEwOxAejvBRTaYFvAlvQePJ j4glvCKuWblsuKOAdAcP9MRIuwIoIjoug/ERlE+KnDDPHoeFBiPRqYtG8k0wB92f+YgG SEmNgu2Ro0RXvszS29zEi+sKE5cxPMa+alpR1HHVSRfXt6n1wd4PkH+s6DQP5Dcv8Hec S+x6jimlwbGO9Exgn95TQVYbE8J1G4wubqI3wknqNuME360KH9UkcMdhrqDr+mCLED8F LyoQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C+40x2ii; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-38dc3a0de26si5983018f8f.481.2025.02.10.08.24.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:24:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C+40x2ii; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWY9-0003DN-ED; Mon, 10 Feb 2025 11:22:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXo-0002pS-HK for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:01 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXm-0002n2-QR for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:00 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-436281c8a38so30300535e9.3 for ; Mon, 10 Feb 2025 08:21:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204516; x=1739809316; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bjYHACE69TKRgftmtMmsnjmBnOemI4kgCBT6PrMcoww=; b=C+40x2iiOb37CNZKwwWsuDMniTQd12omwLkkJQ1TQThiUSJZJL57zu5Iu+cMJrsOdt 6faTyWL6we52xqTQ1/EHTAYXQ6mzsaS5kgRvAEd3GdNIcif/bjcjnkf8NNYpxoyT7Jag AYWn+Y1YnjmffFo7GVKakzKlvVLprEzUiQ/Kx2r2nSPxvMveeJj4gYpUIp7Y937iKk9D tCAuNeD3WMId99N327QabgolYP77tZMgB0t6Gi1TIZPFfjBLcSJp1L3degbWAn4nYZr/ UR4uS+UbCkKff9uxCEw3TRKCTGMf8zCk0FvW3M/j+G+5PwuVkxkHspRvNyeXp3HWKB55 fd4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204516; x=1739809316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bjYHACE69TKRgftmtMmsnjmBnOemI4kgCBT6PrMcoww=; b=FESQJ9xQu9XMa1u9yHKZPtdRb18fXsOQVTPfVLuHWJKxe4NTlE5OQxOS81J1noDzYv jZTRm5wfTZ8n9zlt06ykzqsxc+YwxuRvyA9i+8i2N18pQFKqDBvkhzy/MFph+cUOL2xF DaxAg8jaGka+sw4QQjrTB3ivmuYAh13LJ8S/yd47SmiccWlYcDjc/LOtwg3pj4cabARb ryHK7N8jmtKJWt+BS1xzpfMC7kK9c3IVifQe6tTE3FInC0wjZyWn6i6Hi8putpLy8+3a FfM1nITIAAuKgwZ63A6Sw1Fea3n97F2rZpaIXWxn9qPpkKV7WEra9GlHr0RxZuVmZYDq gyLg== X-Gm-Message-State: AOJu0YwCApbUZEWDwCR9bls3vv64ntqHGn2iXbDOdXmyY0scUvmALZ6v VJc+vAFAyyJP1pV42pTIul+sGPEp7retjanB3JTV84Jc48Z0qUKC8iB5J5dRqnIeKMAeh4gAO7U Ccp4= X-Gm-Gg: ASbGnctn8TpnOj4cDUqtyKGnwSoGMC7TEnw9FNCH0PQRpNb3bj1yF0DsRX6gjkBeoGz mmqVfFltcpkQYaoCPh275cBMoQMIavHK9uwMsKx+74l31bLsQ4Sr6bnkfSOPG0yJF4xfF5OfZxO Ir+tY55RB7nUFonXj9xgNvBftuZwMxxLTHbAixQs8qRQVfILNZOgY9wiqgEjR1TzTTBYSXN1ScV n/bE2mAplBCgLhJv7pvm1Iiqyo+0VTB0Ih0rdJFt3xwjk00bLyS9POHElZPM5/ZQZmfs6+weWK6 mIhcqwC7CAbxFC5SOmsh8utXTBE3Iw6aDZA3zaNfKavx8Om8tlSEV/RLRMa7Sbv6BQ== X-Received: by 2002:a05:600c:4f89:b0:439:4bb0:aba0 with SMTP id 5b1f17b1804b1-4394bb0adb6mr12135845e9.8.1739204516360; Mon, 10 Feb 2025 08:21:56 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dcb781bdcsm9583869f8f.23.2025.02.10.08.21.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:21:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/6] crypto/tlscredspsk: Access QOM parent via QCRYPTO_TLS_CREDS() macro Date: Mon, 10 Feb 2025 17:21:33 +0100 Message-ID: <20250210162135.14123-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Prefer accessing QCryptoTLSCredsPSK's QOM parent via the QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + creds->dir ? creds->dir : ""); - 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; } } From patchwork Mon Feb 10 16:21:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863804 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1679239wrt; Mon, 10 Feb 2025 08:23:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXVL/LGssqP8WcmThMYj6Ic5gNyeI+oeqzxfKSQa1/+n/z/d5Y9P55RF2LKnW2D2LB+LfQgbw==@linaro.org X-Google-Smtp-Source: AGHT+IFdvz4p1BJ2brxF6hxlwa33Sx0hymllAvJEsv/vmHyWdOF+6jssGu4X7TRoa+e9ytcEhNqY X-Received: by 2002:a5d:5988:0:b0:38d:dcf1:d159 with SMTP id ffacd0b85a97d-38ddcf1d5afmr6343110f8f.21.1739204618777; Mon, 10 Feb 2025 08:23:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204618; cv=none; d=google.com; s=arc-20240605; b=ERfADsIM52Dw8vgzGvf3QANSB1Sz1ZE2hYG5wltxENswTq7wH53xa4Q1x8vQylAyWK ue9D9+JnryFMSkLNWc0tJC6vA59fMBt9BJesJMxHq1O7g6CcgrrZp/XAPdDq/Y2Y1GW6 BtKhXMa18lneCfqwjrOSG2Hu4fPGKfIziHVMAeE7A1oqmcwSlF+YsQXvnJdglNZmmsjZ xoHJFxbFDY+xAXlvvUkp2jdbk7NyJl0INW2DFy5XGuexZfBYzCG/NnC7R1U3+YCORQxA DGgdAJ7y9YDzLtuQIxL0PNG6tcPuYDGkCKotSOTpuqnkn2Q8RlpOCXC252f43AZDKsfL X5Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0yqG8v8WSQiv1ErGVoG3M0wvKSSpp25E6v1a1sbfsZk=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=RaaXAtIJeTCHRQ82idKrRE/sD5OqPY8XLPrav6Qh5EV8hWU8HmsjE8c8f+JF8ciXb0 wE1toPkNbSYas4+qhM5gq0Z2FDdzgJroSMgvpHXfRjPnXhhj8pet3twcuC+fKDoN+sRg MQ4H12fRVaPtUVsDnbXWy3oz39Zu2G7mP/2RHep9MqbSw3GidROhgb6gcJOtKHo0E7MQ aemk50ZZwLZ4vmyYMkPZJKsxMW2LM0u5nDSVpPuHNX8SxNT7n3GlPy8KvJaBbgtsJOuG /68Rv7/TD45GFXsHFj4umcNTQe81jnVMf64l3CsI9DuNpwA9/2HD2t6R/dvObMG9/qzA abCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JWKEMYmX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4394bcadecfsi4110735e9.155.2025.02.10.08.23.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:23:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JWKEMYmX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWYS-0003jw-FU; Mon, 10 Feb 2025 11:22:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXu-0002xd-Vw for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:08 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXr-0002nm-0i for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:04 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43946b5920cso6644695e9.1 for ; Mon, 10 Feb 2025 08:22:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204521; x=1739809321; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0yqG8v8WSQiv1ErGVoG3M0wvKSSpp25E6v1a1sbfsZk=; b=JWKEMYmXOzafoRyF0ayYsezYIZylxyhFeCp6AEUV4rVhuSyuAeIzPJkogE4gjbzwOx zF6PAj7/y3VUiM1nrzgcDfhViuG7nf4Jn1XFh+FbojBvxnbpvgEm4e02HqLYvbvPG/T0 sZz+ATWrYAzbGzIMWUoajfrrBasRWWlnaLsV4hVAsqRl6aTZZp8L8q/l2ddJ/0YP3q0P T9urcsRm+MBGo3a+lNHiPAU52T9k226dQJmt8bnk2rZvOMV6PHEw8ZqE9ut8pMBfiACQ +M8jRA/r/P7lxZb8Vbt0rzckAkGR9R7pwPnU8r6zZW8XDwqS1H3j8dUyS/wMiUwsYj/n OLtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204521; x=1739809321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0yqG8v8WSQiv1ErGVoG3M0wvKSSpp25E6v1a1sbfsZk=; b=iW07g/AhBpj5DZTafPR1JAKXGn3AZ+5IYqg+E6XN7SMGgYVt2kSUlb8OoHS81Gs+u9 eEe0ERLxAQZcXk+b8LxqVi1ue07i67YUiGbQHWEvRCVQZjVPLIrbhAJaunQvhmDoo8MH 2PQyHYkoj8NB/THKzRBZ9/QJAQ5Coicl14tKrQzylYem1oMuXTlpw3fS+bp2NQDNXro6 FFFpmxnfzV+tuAgCQ1bM/y/TpAHOf/PCbvjfTklUE7uwg+Yb/AX1klY8bI0GjqGD78TT GxWWD5Q/zzYnPhTkuOPxMtYoEgdiu+BuA3ZJXK6m0T/B6JJicTZR5TOmkGYiSpild1tG mA8g== X-Gm-Message-State: AOJu0YyDr6wkx5NhhE0x4gLYyvNU8MCaWVArPhJIKFbM/BPyYu1w1Dld DTBlP9tNwx4PhZw6t1GfrRvxEyPDUQPrB+3TypXjIGeTCj8p1mddbRU+lHiXXiFu3TkG79c8pW3 C5EA= X-Gm-Gg: ASbGncssVPk9a46Q2YsYN3GomhwDt5IryX7orAtGeMrudUAHWR0Z/+PtTPAFYcE8Scy hEGdYOlLnpdIDURP2/60uUgbuiD/DsBzCj5Z7vIMI6PgexmJeEGCS32dad8DyX0PkTUubWV74FC PDGmQZOGrCMz9tlSOo4MY5uA7+h6Yvi7XIVkuD5m/kVVvZw3gcY4XcvmMDEebgldl7i/kvVNZsC MoeHHrbxFsiiHZNTOErFBYMVOJiNhnXGNBp9xNLZXdIzX/W0hC/kA/Rt/wxvOy0u7KBCIxiprPY XB70/bGWvGz3tkUH/By/bzOKep2seWd70TvLHaKRS9bbZUBJf90HEuDjOPOIt7ZkIQ== X-Received: by 2002:a05:600c:458e:b0:434:9f81:76d5 with SMTP id 5b1f17b1804b1-439249abc43mr106424325e9.22.1739204521001; Mon, 10 Feb 2025 08:22:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc5c8c37esm10944371f8f.2.2025.02.10.08.22.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:22:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/6] crypto/tlscredsanon: Rename 'creds' -> 'anon_creds' Date: Mon, 10 Feb 2025 17:21:34 +0100 Message-ID: <20250210162135.14123-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In preparation of naming the QCryptoTLSCreds 'creds' in the next commit, rename QCryptoTLSCredsAnon creds as 'anon_creds'. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + trace_qcrypto_tls_creds_anon_load(anon_creds, + anon_creds->parent_obj.dir ? anon_creds->parent_obj.dir : ""); - 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; } } From patchwork Mon Feb 10 16:21:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863810 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1680086wrt; Mon, 10 Feb 2025 08:25:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVbDzab6ycbWt1NpAgap/m97QXVcceyPkL0T2JXl9iHnP/Prnbu284R5ooXHq9w8oWv9E+UVw==@linaro.org X-Google-Smtp-Source: AGHT+IH2NR7IdDxozN2pBzpGIyQIaBPP9EnxIojQ09Xa4gbrTJH+hTPf/p54bJhNjkB4223e64Oa X-Received: by 2002:a05:600c:3147:b0:439:45e2:897f with SMTP id 5b1f17b1804b1-4394c814388mr5803765e9.11.1739204718101; Mon, 10 Feb 2025 08:25:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739204718; cv=none; d=google.com; s=arc-20240605; b=QPYnyXDCmsVmGQEXuijXXxxCkW9ledhWJrRVHFCKyKOIB+PczdmXSfzL1QYA8HKU+q ILuu2XKLr7GXQfOxD5P9oN6ZMjpHqsPzIbSoPaYSaHpoZWyZKffIaelqxQZFgzzg82GN CvJens1j84eFVqYP50THfM68j+O1+LPqakdmQco2JfI74SCWHZ7+XuF5LzQZyAcNTFv7 pIxnW8CuctQ+mVctkPNSv/+Lr5jpLdiQrd2LF1OvMUEoaxfLyeSWhUUQ9aTIEeO2lGKG Jy+1hp9o7hoQSF+EUYin45EG3Lk+CAOi5ZCKbgXZplW2qzp7j4yfCkMG3VuxjdKJT4XK PWeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MgL4Fc/bavoIHIDwcU+jgf+XwNfl7HHKSxC0Pl5Yjqo=; fh=08jF0zE4HUQ4+Axc0Z5jGnhIKGT221BnwwWk3b2SwPw=; b=GQnvoA8r5m2tgj5gS8/ubhdr6HW0vviUp2/WxecWZLNTEs9skSsCaIbMBrrj0u2Qpq zNNaPlBIC4BgUyfwTF+SKn4kvRNUAQFswv0VzLEvPAJIvBdiymUfnMFF4W7h6Rav6Jg8 OF5fkf7bfwGt8X5y3FIbnO7Y8Lvthr8/CmviM8g42ayLLIzUOSj1peagYi57Dz6xs56a nzbd96zz4VWQ+b8D77TKYK/EdYpGnH2PGjfKWv0d61fm7AcBh6SOCdmp+kvaGIll38J5 N+KBy2+72noK6rtukgBcfbVEQRgIvb8U8h2fNjQFszbfoLGhXi0202Zu9pJ4sIlt9aDw x3Bg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wTQPjVC7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-38dcd41bb2csi4733473f8f.837.2025.02.10.08.25.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 08:25:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wTQPjVC7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thWYZ-0004Ga-Aq; Mon, 10 Feb 2025 11:22:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thWXy-0002yu-AB for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:13 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thWXv-0002oR-H9 for qemu-devel@nongnu.org; Mon, 10 Feb 2025 11:22:09 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-436345cc17bso31665525e9.0 for ; Mon, 10 Feb 2025 08:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739204525; x=1739809325; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MgL4Fc/bavoIHIDwcU+jgf+XwNfl7HHKSxC0Pl5Yjqo=; b=wTQPjVC7MZwkPbRCc0yj80oQ50P71/kow28aOq2v73a4GHTevzv3uCN+TlkgWWIhR1 Gd9eT2VhEAZDfSxNEfnKutqW0D6pxGUk83n0SBv8Q/SkbUrfYWY6R6Mmhdl47R+gdjjT VCHobpvDeqoDDmneaNkMShsFb0UvTmkUMZ1B9AzNHfU0iXbMUuUZHdn76cE3j9/VZyXb IL70ZaB22ipy10WL3uy8359bvUIerGSrR8NoWUQOYakwQAdI9kOXkyT3bkHHgy3ei5tn dMHA9iB4/VRE5sbK6BaPMhsFjIIViw8JN+Xscml35BMNknw6IwlMFz2haFhw7/8E47xy B60Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739204525; x=1739809325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MgL4Fc/bavoIHIDwcU+jgf+XwNfl7HHKSxC0Pl5Yjqo=; b=k7/LSBMLXAdQ+A6LKQafRVqaGpIbMk8hpnaLwx1Kkjv/4rUiz4a6Ug++26rgG6L1mf j/edFQ0yHkwXHG96mVvLn/Z6ZsgVzYvG/Cx51ZVTBb85fpf9ZDkhRk6ECIncQDCjbzhS Q2qnDmJRXFA64aKG9xvgg/DWQ1ZcWoohys8tFFfPv89+z+gobrygQEvqjkYMFyOrCsPk 3An+gHVQES+unLwxPrnEmLITfi5nYffTBliNGAhefmBWS01yMRXxkrWjUUtkBWF8azQ/ KBVSjqu1XjiOs98dUTJvDbKXN4ljjEhB8jdVMaqG0x8mvliloxFZQ1ibiW7Jd5Lpq1cU PZZw== X-Gm-Message-State: AOJu0Yxl6a391t0XcGotrtAl12Kvau0RLXzzOvyHuJ19fHyWKwfWDU31 BDDesWawpZB6etDT8UGeVSE0t0cKvuiL2r3XkkYJbyx8p9O7wByVvsPncNykAEVlpb3yb5M2OB6 +ZB8= X-Gm-Gg: ASbGncurOukurB89WZPwYgUvVNT/qw0cNSnnO+k6UBh4kBpTMbYurmwXMy/rWEKT+v6 7Fq6ea9yFZOAd6TyM0S12zE1lUZCykteQDarofgTZ/a/oW1JwOpTYFSkQ3N/JPLFIjktNwmDRsY +J28d4vtxzmOFHKmkOUvQXUi6FKw42KYwIdkxceUU7HskZkwqHV1ah4HJdsAgUOoiSoyrYpfsLX zVYIAfRbb4+Gzn4NsHJfYOzXnX4JaCLfs1z+MfrOCR0jmWSMzRIW89HPbx2KFD9uT3T57N0APe/ 71PSzQAWLSfG1O4xgpN41w+eY+Go1kFWJxh7svXrY+MMMPCTaNhrY9xg146bjquyvg== X-Received: by 2002:a05:600c:1ca8:b0:439:3d5c:a028 with SMTP id 5b1f17b1804b1-4394c81a33amr5066465e9.12.1739204525633; Mon, 10 Feb 2025 08:22:05 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dd1093bb2sm7978079f8f.40.2025.02.10.08.22.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 08:22:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 6/6] crypto/tlscredsanon: Access QOM parent via QCRYPTO_TLS_CREDS() macro Date: Mon, 10 Feb 2025 17:21:35 +0100 Message-ID: <20250210162135.14123-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210162135.14123-1-philmd@linaro.org> References: <20250210162135.14123-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Prefer accessing QCryptoTLSCredsAnon's QOM parent via the QCRYPTO_TLS_CREDS() cast macro, rather than parent_obj. Signed-off-by: Philippe Mathieu-Daudé --- 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 : ""); + creds->dir ? creds->dir : ""); - 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; } }