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