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