From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778285873973.9211917634259; Tue, 15 Jun 2021 10:31:25 -0700 (PDT) Received: from localhost ([::1]:44834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCuI-0004MA-U8 for importer2@patchew.org; Tue, 15 Jun 2021 13:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCqz-000466-7Y for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:27:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCqx-0003hI-JM for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:27:56 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-e_6A-ojZMDi_9t7gZRYKyA-1; Tue, 15 Jun 2021 13:27:53 -0400 Received: by mail-wm1-f71.google.com with SMTP id n21-20020a7bcbd50000b02901a2ee0826aeso782136wmi.7 for ; Tue, 15 Jun 2021 10:27:53 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id u15sm2441212wmq.1.2021.06.15.10.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0YUxkcREe+oRV0WuFPVPw6I/e1CnZd/+DTRnaH5xN54=; b=cIws1rA+gSBJC7tHFk0sy7CGzscQARS7O127Wg8iVy/9n1SOxOai4cxCw76irdtHdIrPMS H6/J9GTjsw4MoBrz6VRedJA+i0/TEYLhj4PD79g089LpeAKxXLlgUdRimClEpFrG7423sK GXhPjM8FZlxEo3Waq1JZg2Afp1RBis4= X-MC-Unique: e_6A-ojZMDi_9t7gZRYKyA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0YUxkcREe+oRV0WuFPVPw6I/e1CnZd/+DTRnaH5xN54=; b=lIYqSJPe1cqFWh+oy+dgPirdOn322ZQYyo7+4EjcytwF38z/15DxmVt80QFyieDDha L9EXA/ruMsW82WPOlip+LUxmtLhYn6SHTm8vDTAHP5DmUuUuropUW0fi8x3r7K9Q2y30 PpFABVCYMtdIb0K7Hd/vOozz5SVIkAWsR0pM9fS7m/6FjIOWTkMgQi3D7e1lr5tLna3v y0jDm/V9JYH86gNJatc7UAN23kyL/FV19X6xYG3FlXNvZrKVryJp5Tnmkboa95SwxG/e 5dj7DejpewsiGWE71QRuWykNMHs+dZT7ODIAdVd+Z7JO91fyRLSTxHE2BFtjq6/yoMnd Y1ZQ== X-Gm-Message-State: AOAM531z+fCc/da+L9gfsNQu9TpDkCiuolu457CS45vGwLY8B99WV216 bttvsi6RKGSI5POqgeBqBNigBh1AmeUuP5i+V0Nv21AakaHCf3sMjL8HOcbYuA2wcMCvUsaD3qt 774VYsp7WEYwoHz/tEzb4DUuUn5AN9ZDl0HQhEfqrEdsy+G/J+MPVAmO0RvNenYGR X-Received: by 2002:adf:ed03:: with SMTP id a3mr243866wro.166.1623778072289; Tue, 15 Jun 2021 10:27:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQ1Q2Lt5OY9Jn4cIx8McjG9WIL61GGHQhflZ2Je/+HXtpFNCs94cA/kM0qWs5Em5flhqjNlA== X-Received: by 2002:adf:ed03:: with SMTP id a3mr243836wro.166.1623778071994; Tue, 15 Jun 2021 10:27:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 19:27:40 +0200 Message-Id: <20210615172746.2212998-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Introduce the qcrypto_tls_creds_check_endpoint() helper to access QCryptoTLSCreds internal 'endpoint' field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/tlscreds.h | 13 +++++++++++++ crypto/tlscreds.c | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index d0808e391e9..e45f1e34853 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -65,5 +65,18 @@ struct QCryptoTLSCredsClass { CryptoTLSCredsReload reload; }; =20 +/** + * qcrypto_tls_creds_check_endpoint: + * @creds: pointer to a TLS credentials object + * @endpoint: type of network endpoint that will be using the credentials + * + * Check whether the credentials is setup according to + * the type of @endpoint argument. + * + * Returns true if the credentials is setup for the endpoint, false otherw= ise + */ +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp); =20 #endif /* QCRYPTO_TLSCREDS_H */ diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index b68735f06fe..084ce0d51ae 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -20,6 +20,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi-types-crypto.h" #include "qemu/module.h" #include "tlscredspriv.h" #include "trace.h" @@ -259,6 +260,17 @@ qcrypto_tls_creds_finalize(Object *obj) g_free(creds->priority); } =20 +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp) +{ + if (creds->endpoint !=3D endpoint) { + error_setg(errp, "Expected TLS credentials for a %s endpoint", + QCryptoTLSCredsEndpoint_str(endpoint)); + return false; + } + return true; +} =20 static const TypeInfo qcrypto_tls_creds_info =3D { .parent =3D TYPE_OBJECT, --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778156049856.6373901308109; Tue, 15 Jun 2021 10:29:16 -0700 (PDT) Received: from localhost ([::1]:36240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCsF-0006yz-09 for importer2@patchew.org; Tue, 15 Jun 2021 13:29:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCr4-0004MJ-91 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCr1-0003lM-Ni for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:02 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-114-Ack1We8-NNmzJtlPRgFPNA-1; Tue, 15 Jun 2021 13:27:57 -0400 Received: by mail-wr1-f70.google.com with SMTP id m27-20020a056000025bb0290114d19822edso8929281wrz.21 for ; Tue, 15 Jun 2021 10:27:57 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q11sm19148396wrx.80.2021.06.15.10.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WUQdFiF4I9usEoqcWuw9jovz2j6QkV4ypfDpy+yQNBk=; b=iqG6hE6k6aIbnT+xB1knx/5imPu3RyRDX/34GPgzQsqKOmpp+dgQJgEzJVwNvyjGPWzzr8 ZVCAQKb+TT2QClIxoWnblo0AefX5YGKGOEtPQsraCp/bmaTjvjqP8p6hpk+o1QDd5kycEP rM7wYktURh+1l/AM3zQgMODsDOcWku0= X-MC-Unique: Ack1We8-NNmzJtlPRgFPNA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUQdFiF4I9usEoqcWuw9jovz2j6QkV4ypfDpy+yQNBk=; b=hzgD0x3b/i+9Jvm8qcGqYwaxi6R8GprOZawkydb+tZPdGyqphP522sRd9r+rX8eFlH Rd/FVibIM1GpWlPG04YL6S96yRXAEhPWiajAR9kXihJ1H829S+1EgcwyRMebs/aYC6pk JSIjcqfABu94IXnrQLPLAFNh5qDJcgh99VdE5tM3akAvza/raqLtkdBlg3vxySH0hcCE 1f8UIVVtouPqUYegFV9G0g5jyqbk9GrE0R4JJVT8WG7lE0rJT+QNUCexaZoJ8qb+X9lV bOChI0CVdp24ooPTA90n+YBzkFCAJwvTEufYweCAAqd/+MZ+/gQbZSw3f3GYbZYn9UMJ FXuw== X-Gm-Message-State: AOAM530UryWhGZBGl5ll9OSGDYY0gCkc+e9ldbd+p+RjFuelChrvqFHC MHvi3WYrfe4+rfA/X4HuIWGvtRqt2H1z8TX7B3YE9mrDFQjBsic3/EXDpKGCS7HEnViwVzKJlGs F9Qg8d8fkLzL8Cv5CtW7tnOzByFfP/TGxKOX8AEiJE5bgPCgouZsPjueBH79CY1uv X-Received: by 2002:adf:f98a:: with SMTP id f10mr206645wrr.143.1623778076519; Tue, 15 Jun 2021 10:27:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD25luI6BaUq5O8xs92TydzlNAefUIpxoQMfdTIII8D2KVHpx/IPA8Cua+hFqqcyFwCS6wWA== X-Received: by 2002:adf:f98a:: with SMTP id f10mr206622wrr.143.1623778076323; Tue, 15 Jun 2021 10:27:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:41 +0200 Message-Id: <20210615172746.2212998-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nbd.c | 6 +++--- blockdev-nbd.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 616f9ae6c4d..b13a33c3d21 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2159,9 +2159,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char = *id, Error **errp) return NULL; } =20 - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { - error_setg(errp, - "Expecting TLS credentials with a client endpoint"); + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_CLIEN= T, + errp)) { return NULL; } object_ref(obj); diff --git a/blockdev-nbd.c b/blockdev-nbd.c index b264620b98d..bdfa7ed3a5a 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -108,9 +108,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *i= d, Error **errp) return NULL; } =20 - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVE= R, + errp)) { return NULL; } object_ref(obj); --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778271859406.7452328811278; Tue, 15 Jun 2021 10:31:11 -0700 (PDT) Received: from localhost ([::1]:43734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCu6-0003cx-Kn for importer2@patchew.org; Tue, 15 Jun 2021 13:31:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrY-00064z-Ea for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21694) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrW-00043q-Ji for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:32 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-0YbPlAS1N1SYiZKJ1CzGww-1; Tue, 15 Jun 2021 13:28:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id z4-20020adfe5440000b0290114f89c9931so8890660wrm.17 for ; Tue, 15 Jun 2021 10:28:01 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m37sm14967725wms.46.2021.06.15.10.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=flWaRXcN0RQYCN0Uwj6itVyqDqpXZ0YB44xwaJnMADnU+TA7xN+SjCWXAMJbRBp/zCcZNZ cIQdba23/1UMopRup3cpS50nFIpjUOrP1BM950eheD65CtelG2xXGeYSLBh5w/ctkZmaxz a9LaM4Wo2W3UxV4dBLNv6TqK/TX9a5Y= X-MC-Unique: 0YbPlAS1N1SYiZKJ1CzGww-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=U8S09hTB+VN+h5qw+7vfClKHr/Jp2KarWQlRUEyiWcqquYjp6bMYAai+Jw6mXBrsDh ZsnfOuWQnK3PVfyQ4xDype8rJp4celuX+ircMvrqF9WAD5nbqsoq8Q///hU955c+mR58 0h2/lRJJhOzMiJEJwqvJ4bWzTDu9eyWQ+mhkQWnFA2sHbPfstcsam6LCE7KM5DkA5v32 I7bygvRv4eZhi2U40xKnld5c079Ugwn0FxrDLkbROwV0T3NiFaPpfuhrMGSAuSYgCWwW n+8Z+fW5NS2pDCaU1xo2LA7c1/WbA4SYbYV2/87T4yP/P4zVa/a/YIOyJQIwvoua7eAS HZAA== X-Gm-Message-State: AOAM532m6IL5blsoLlRwMPSOrUf9AthSnloUFWgf5MlNrn8PLRPJyRDm XVOavHAdmnFXsjQH8XdycqR8/HLWkAbPs2cHmkgDpbnYhUbOMq3OeqDVngy9LJvOPGKOabydAJB l3mqrHRQccv5Q+GHTRwN1DBRLNr86aEB++FD0gbiYJGep5nsMGeV0qWZCA+oZZ8um X-Received: by 2002:a5d:47a3:: with SMTP id 3mr197796wrb.255.1623778080700; Tue, 15 Jun 2021 10:28:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZWQpD2c4Cjvl4abx8Z2UJvFh/aEs2JH5oZD/NBzXEh45zCkOPf5rYgZ65z24h/MhU43rUpA== X-Received: by 2002:a5d:47a3:: with SMTP id 3mr197775wrb.255.1623778080553; Tue, 15 Jun 2021 10:28:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:42 +0200 Message-Id: <20210615172746.2212998-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- chardev/char-socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index daa89fe5d1d..d0fb5459638 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1402,18 +1402,12 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } object_ref(OBJECT(s->tls_creds)); - if (is_listen) { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER) { - error_setg(errp, "%s", - "Expected TLS credentials for server endpoint"); - return; - } - } else { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT) { - error_setg(errp, "%s", - "Expected TLS credentials for client endpoint"); - return; - } + if (!qcrypto_tls_creds_check_endpoint(s->tls_creds, + is_listen + ? QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER + : QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT, + errp)) { + return; } } s->tls_authz =3D g_strdup(sock->tls_authz); --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778165291455.1881826755948; Tue, 15 Jun 2021 10:29:25 -0700 (PDT) Received: from localhost ([::1]:37122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCsO-0007Yi-8b for importer2@patchew.org; Tue, 15 Jun 2021 13:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrE-0004rZ-Jm for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrC-0003rv-TQ for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:12 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-ZlBlq2esPjaWnT34uFZ4mQ-1; Tue, 15 Jun 2021 13:28:06 -0400 Received: by mail-wr1-f71.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so8944848wrc.16 for ; Tue, 15 Jun 2021 10:28:06 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id u16sm20706326wru.56.2021.06.15.10.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xExdDe4N+GemsTc4t2mEkAP+Zb7Tj4gyC4bIiLrVVZE=; b=hg4TkYzp2JS3gi3FiM4W1RHazjVQjo7nRjRsHTdqTY4zIj7zvujAk4A1JIyU4cwf/myW3L E7lBmDPEkJRbUUnIDV7THCHE821rSA1djKMHtrLLK5Vf2RCK+Hs6lO6UYu/4tMoRCWMelZ wB5ZWphjNI0tnSTWysy8THbHBvbZY5k= X-MC-Unique: ZlBlq2esPjaWnT34uFZ4mQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xExdDe4N+GemsTc4t2mEkAP+Zb7Tj4gyC4bIiLrVVZE=; b=D93XvYGQ6Y+kUGbezr/s5EQ82fNA3m8SloWyxlK21ZUo+bcUS4SyeXmP6YFT8ynub8 WbGQ0lcCyRfEYeeNOK825fpP3m1Cpp78q+iGwbW3bQ+Z8mcsUZW+AmmjZwPU94WzJgh5 db8cvHLEbQdHTxhRtx7O6oI4otCSMWw9bvPBzK9XYslyuDs2G0BnIlQD4cYEPWSZLhGg aFWX5jWSSL74kuzLQfG/X3F/WyPSdxarc9v6ouy8o+L65JCZ7dOSrCvMPlnVhhhwyGWA juSV+f30NyxmSTGWgCGc6Vopwwp6024RmygUbQ+2CFpaqrQ6syAzYZMYOoa40UwhGvG4 ynFA== X-Gm-Message-State: AOAM531AlIt0huhwJzxA0SX6fWG6ynjJdxqxpwxpj/W0z0/p64Ho+DfM mLfhx0NsdoHWavkvXXT/zz6ZedtduVht5hemcqz609uwk/rf932ItIGULvgYFYQ5A0tPCwkQy4U Yg0pO+LuvOzf4GdPsdwrkglzv9jgUkbdprAkir/Ldr0aJlKweJw5co8LQ4UJ9nEc/ X-Received: by 2002:a7b:cd0f:: with SMTP id f15mr4969533wmj.177.1623778084988; Tue, 15 Jun 2021 10:28:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnJRJjJQbQOJLvD7kJ7YHhj7k+uyYgO74TNSkMeSILLIblRZBmFHpk6fdZXHKz8lUbeVjQ6g== X-Received: by 2002:a7b:cd0f:: with SMTP id f15mr4969506wmj.177.1623778084738; Tue, 15 Jun 2021 10:28:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:43 +0200 Message-Id: <20210615172746.2212998-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- migration/tls.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index abb149d8325..ca1ea3bbdd4 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -49,11 +49,7 @@ migration_tls_get_creds(MigrationState *s, s->parameters.tls_creds); return NULL; } - if (ret->endpoint !=3D endpoint) { - error_setg(errp, - "Expected TLS credentials for a %s endpoint", - endpoint =3D=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT ? - "client" : "server"); + if (!qcrypto_tls_creds_check_endpoint(ret, endpoint, errp)) { return NULL; } =20 --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162377847480513.081268008887037; Tue, 15 Jun 2021 10:34:34 -0700 (PDT) Received: from localhost ([::1]:54192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCxN-0002OK-Gi for importer2@patchew.org; Tue, 15 Jun 2021 13:34:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrL-0005Gy-OA for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26453) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrJ-0003vz-E7 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:19 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-co3UofFKO9CMMeHte0aGmw-1; Tue, 15 Jun 2021 13:28:11 -0400 Received: by mail-wr1-f71.google.com with SMTP id s8-20020adff8080000b0290114e1eeb8c6so8898500wrp.23 for ; Tue, 15 Jun 2021 10:28:11 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id z12sm19081845wrw.97.2021.06.15.10.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SpfvMmDtEHWIbtTtqU5cvD2dvenPniYScyqJywSH4gE=; b=AS41D/XwcoopfTmGaTsg5b6kAyZQiBYlka+CrRlU8JVIPKZi4PQywJq8gUmnFxsgYcBARz P+N7C/J1bhRXGi3t/80Alwtrp8fx+E7nmnQLaw58yPyMxtvjCj2eDiiWf7CBoXCkYL0ACu adUF33+HnbGzE/ZkWTGSV5etquTW0ZI= X-MC-Unique: co3UofFKO9CMMeHte0aGmw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SpfvMmDtEHWIbtTtqU5cvD2dvenPniYScyqJywSH4gE=; b=WszIznzprENb/piL77G3cdwrA0fosEXSyudJaGl0Dg3dYU2mcgrmUgG7047fKYtotb L9HyY2y0/bnufW5NazEq55l0qgDXiFZsm+gleIkA/JjLu+hyoYgnWVepHS57eC86+3gl ZpSc5kUPLvSIpljdwe1Qo/lRFmQSsidkFxUVikzeOdRw/yygyZNRnKMdxFSSJTIZhpoW 8qf2bHQG0Du5D5gNcSkTN67NvW4SNPjEtW/Jy/kH2iOn/MB/Suj8QE4KM8XkoVjPqxAJ ZwllQ0TgDdLWR1pFCyQU3xwvPdLXclmrmr2d0Oxa9aNQmb10qKgk+m5xsFadfPG85meA AgLw== X-Gm-Message-State: AOAM530cNz+D5LOSeozLDfT4bUMNpMLZn4a/eUZweRDe68RAMMcDONwy GyBct6M26QoBb2aFFOo+ovbGst+IdTr8F89Ux2/RkXENNPXHEyqXRGKbxMMWufc9ZZZi3qMGlic YeLypxWxD3s1ILH31E27WZfhXT8TccnjLE+JZLFjUaho5JJuVB4i9dlFh1UcVoJFE X-Received: by 2002:a5d:6409:: with SMTP id z9mr188888wru.279.1623778089297; Tue, 15 Jun 2021 10:28:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVHLV4e8LzitTWeWbAjkMiFGlzn+QBETA5uOOz97EpAsQJRIlzupnkliTcAUMFMd2iLw0+Qg== X-Received: by 2002:a5d:6409:: with SMTP id z9mr188868wru.279.1623778089110; Tue, 15 Jun 2021 10:28:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 19:27:44 +0200 Message-Id: <20210615172746.2212998-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Introduce the qcrypto_tls_creds_check_endpoint() helper to avoid accessing QCryptoTLSCreds internal 'endpoint' field directly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/tlssession.h | 14 ++++++++++++++ crypto/tlssession.c | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index 15b9cef086c..657a2c05521 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -162,6 +162,20 @@ void qcrypto_tls_session_free(QCryptoTLSSession *sess); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoTLSSession, qcrypto_tls_session_free) =20 +/** + * qcrypto_tls_session_check_role: + * @creds: pointer to a TLS credentials object + * @endpoint: role of the TLS session, client or server + * + * Check whether the session object operates according to + * the role of the @endpoint argument. + * + * Returns true if the session is setup for the endpoint role, false other= wise + */ +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp); + /** * qcrypto_tls_session_check_credentials: * @sess: the TLS session object diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 33203e8ca71..4e614b73a28 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -640,3 +640,10 @@ qcrypto_tls_session_get_peer_name(QCryptoTLSSession *s= ess) } =20 #endif + +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp) +{ + return qcrypto_tls_creds_check_endpoint(creds, endpoint, errp); +} --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778288931119.04865927843957; Tue, 15 Jun 2021 10:31:28 -0700 (PDT) Received: from localhost ([::1]:44990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCuM-0004SE-Lv for importer2@patchew.org; Tue, 15 Jun 2021 13:31:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrK-0005Br-CC for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrI-0003uv-Ff for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:17 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-507-_nGM_abuPquqHc-qCDPN3Q-1; Tue, 15 Jun 2021 13:28:14 -0400 Received: by mail-wm1-f71.google.com with SMTP id z25-20020a1c4c190000b029019f15b0657dso33179wmf.8 for ; Tue, 15 Jun 2021 10:28:14 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q5sm16204726wmc.0.2021.06.15.10.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4C/sIPJIJ9x04mkRkFeW0rAiiCZBP7NEySvc0zgDkpg=; b=VEUTcdaQmI6r9grvP2vv0PIHlgDMLZ5/5t5MzEodpiiX7RwWfSuzhTH6UE7v2Go+gdKIMs D/H2CNKA2P10KZPZX1F+ze7KFOPvhcO+QwRK/mfvi224pNbbC5HiDIV2DwrBR1afKDtEIB ruLHa1SfA+9kOGzrM4NaknaDog2cqTI= X-MC-Unique: _nGM_abuPquqHc-qCDPN3Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4C/sIPJIJ9x04mkRkFeW0rAiiCZBP7NEySvc0zgDkpg=; b=rR2fJUHBq/5CJrZU7BUlCXQIhVcXY9YeA66fW8BLTwuhrsiDOqtFsnPNVrIa5te6/m t9fe8/XermYjf8M9ivDU9APbvzLiul+aDZaQIsDMGiIrpqGueRwjy581YGMB1WIc8yFK mZsLrlQr5e42IY00U3dhXev5OxkVthqXrT72+uKnsEWiG57XG0VG0rEP+KHYl6THkXXZ IwVgm+eGIheQTA2r3d/cFdvk50TcbwivBMsidW/7a6UAZSpxHlt8ZXY6RUrdCLb2+Vo2 32jHPLKvXNzLiiPp2LrDFvUb6AFi4yNj7srIpUG5fIAmXM6SqTR+f/R3x4xJVLNwK/VR 9X8w== X-Gm-Message-State: AOAM532VSAD4vqyKsTXm49m0AZdcp7iM8V+rftEAHVviQoUDnCi0Wr6j 7zCD81XRJrzb5WEmh8uKzOfU6XDMfpI9WxPSf0MlzyjMULZPf6mfvlIvVszqXywPnlifNT1yDsU TqRu6Qm0dwQFEiA5drLfUXfERazjJsv0hDuSokA6w6hkPApTLH0FMgvgg8OP6uqcX X-Received: by 2002:a7b:c206:: with SMTP id x6mr6480321wmi.26.1623778093574; Tue, 15 Jun 2021 10:28:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVhE4snd4Wo8U1+kBEFMYEhRwTltYtN0lJS/a+i6yHGkCF7q/HmdMzhy+UaDLJg+8hYMIWkw== X-Received: by 2002:a7b:c206:: with SMTP id x6mr6480292wmi.26.1623778093378; Tue, 15 Jun 2021 10:28:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Date: Tue, 15 Jun 2021 19:27:45 +0200 Message-Id: <20210615172746.2212998-7-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Leonardo Bras Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_session_check_role() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/vnc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index b3d4d7b9a5f..c7c8454b873 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -4080,9 +4080,9 @@ void vnc_display_open(const char *id, Error **errp) } object_ref(OBJECT(vd->tlscreds)); =20 - if (vd->tlscreds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)= { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); + if (!qcrypto_tls_session_check_role(vd->tlscreds, + QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER, + errp)) { goto fail; } } --=20 2.31.1 From nobody Wed May 8 00:34:44 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623778560971375.14210835273127; Tue, 15 Jun 2021 10:36:00 -0700 (PDT) Received: from localhost ([::1]:58318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCyl-0005FG-Sg for importer2@patchew.org; Tue, 15 Jun 2021 13:35:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrQ-0005ZQ-Ef for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCrN-0003yz-S9 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 13:28:24 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-jIfA7xq2OMOL5jMTmVKHdw-1; Tue, 15 Jun 2021 13:28:19 -0400 Received: by mail-wr1-f69.google.com with SMTP id h10-20020a5d688a0000b0290119c2ce2499so8831093wru.19 for ; Tue, 15 Jun 2021 10:28:19 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q19sm2640573wmc.44.2021.06.15.10.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAuZPOlW6VzVKtRyjoHamnrfWoPuwFjMMys3nVGUYlU=; b=h9tir6G3/1jD02hDJk994v6zE+6hzE+fxnjdJr1lYxfDOJV/EkCkdR+emP7z2ix2cGsAZm KTsTdzntWT6n/1n4PeZR+wTl5jOMZC7Pb/nMIF5ozbCN6MouPblhwI20LosjdDKmRs/2X+ Vh838BhCqKMc176YylbLw0n8DZp1cyg= X-MC-Unique: jIfA7xq2OMOL5jMTmVKHdw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aAuZPOlW6VzVKtRyjoHamnrfWoPuwFjMMys3nVGUYlU=; b=rcVJDoVasu+kRshd7TKbFMAMHz7HYqcNd83mOgzNgaCdNFAt+8EDtJ8v3nmFN5k+6d XcegFpqzKm5rwq459JizjDVVl7rmDhYsFyEXQlg0Eew72bkqR1qP98NicK+nlgg6Fcga uQIjAH6QVMVQKtYHIEYDQKovO5LkBsPh6Qb0gB91eBO+W6kkEB3efDohfLQLimPRxkem 9VYShbBOqNXZp2kTd9TdrIkZzIB0f/WuULY7p7vh15u2/oG6U3TgA2cW3tqI8VSoDjRU 8tPkhCCyh74lABCPTB3iLSoEKF47Od+w331u5lzjabGrXN05UIrn2NAvSPncsthRPlBx C1AA== X-Gm-Message-State: AOAM531/TsFK9bwpws49RU/ZhXy3dihcBblxlJYeJeRk3Qd1aj/50UQs n3fl3N8OXZQ1JOGZDtjyucuSYvSktqZNzNsLMgtb7WJR0QP2ltWTzktv1YIGAapFEmB1a0pq1lM cNgjSod8U4rpkX0XwVjU+X2ZanfPMqCL6nXW623tFsuQG01RxCHsWPbMKwRSUOff1 X-Received: by 2002:a1c:e354:: with SMTP id a81mr436853wmh.98.1623778097915; Tue, 15 Jun 2021 10:28:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7lLXo76/KRB/SYLiJjr54W8dkZ+CtwIsL7UmW7SHun+dHlloLxIed3oAw0gFzKszkMsiRpQ== X-Received: by 2002:a1c:e354:: with SMTP id a81mr436825wmh.98.1623778097654; Tue, 15 Jun 2021 10:28:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Date: Tue, 15 Jun 2021 19:27:46 +0200 Message-Id: <20210615172746.2212998-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Stefan Weil , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code consuming the "crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the "tlscredspriv.h" private header (only accessible by implementations). The public headers (in include/) still forward-declare the structures typedef. This solves a bug introduced by commit 7de2e856533 which made migration/qemu-file-channel.c include "io/channel-tls.h", itself sometime depends on GNUTLS, leading to build failure on OSX: [2/35] Compiling C object libmigration.fa.p/migration_qemu-file-channel.c= .o FAILED: libmigration.fa.p/migration_qemu-file-channel.c.o cc -Ilibmigration.fa.p -I. -I.. -Iqapi [ ... ] -o libmigration.fa.p/migra= tion_qemu-file-channel.c.o -c ../migration/qemu-file-channel.c In file included from ../migration/qemu-file-channel.c:29: In file included from include/io/channel-tls.h:26: In file included from include/crypto/tlssession.h:24: include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not = found #include ^~~~~~~~~~~~~~~~~ 1 error generated. Reported-by: Stefan Weil Suggested-by: Daniel P. Berrang=C3=A9 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407 Fixes: 7de2e856533 ("yank: Unregister function when using TLS migration") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- crypto/tlscredspriv.h | 45 ++++++++++++++++++++++++++++++ include/crypto/tls-cipher-suites.h | 6 ---- include/crypto/tlscreds.h | 16 ----------- include/crypto/tlscredsanon.h | 12 -------- include/crypto/tlscredspsk.h | 12 -------- include/crypto/tlscredsx509.h | 10 ------- crypto/tls-cipher-suites.c | 7 +++++ crypto/tlscredsanon.c | 3 +- crypto/tlscredspsk.c | 3 +- crypto/tlscredsx509.c | 4 +-- crypto/tlssession.c | 1 + 11 files changed, 58 insertions(+), 61 deletions(-) diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h index 39f1a91c413..df9815a2863 100644 --- a/crypto/tlscredspriv.h +++ b/crypto/tlscredspriv.h @@ -23,6 +23,51 @@ =20 #include "crypto/tlscreds.h" =20 +#ifdef CONFIG_GNUTLS +#include +#endif + +struct QCryptoTLSCreds { + Object parent_obj; + char *dir; + QCryptoTLSCredsEndpoint endpoint; +#ifdef CONFIG_GNUTLS + gnutls_dh_params_t dh_params; +#endif + bool verifyPeer; + char *priority; +}; + +struct QCryptoTLSCredsAnon { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + union { + gnutls_anon_server_credentials_t server; + gnutls_anon_client_credentials_t client; + } data; +#endif +}; + +struct QCryptoTLSCredsPSK { + QCryptoTLSCreds parent_obj; + char *username; +#ifdef CONFIG_GNUTLS + union { + gnutls_psk_server_credentials_t server; + gnutls_psk_client_credentials_t client; + } data; +#endif +}; + +struct QCryptoTLSCredsX509 { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + gnutls_certificate_credentials_t data; +#endif + bool sanityCheck; + char *passwordid; +}; + #ifdef CONFIG_GNUTLS =20 int qcrypto_tls_creds_get_path(QCryptoTLSCreds *creds, diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher= -suites.h index bb9ee53e03a..7eb1b76122d 100644 --- a/include/crypto/tls-cipher-suites.h +++ b/include/crypto/tls-cipher-suites.h @@ -19,12 +19,6 @@ typedef struct QCryptoTLSCipherSuites QCryptoTLSCipherSu= ites; DECLARE_INSTANCE_CHECKER(QCryptoTLSCipherSuites, QCRYPTO_TLS_CIPHER_SUITES, TYPE_QCRYPTO_TLS_CIPHER_SUITES) =20 -struct QCryptoTLSCipherSuites { - /* */ - QCryptoTLSCreds parent_obj; - /* */ -}; - /** * qcrypto_tls_cipher_suites_get_data: * @obj: pointer to a TLS cipher suites object diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index e45f1e34853..41b8939d417 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -24,10 +24,6 @@ #include "qapi/qapi-types-crypto.h" #include "qom/object.h" =20 -#ifdef CONFIG_GNUTLS -#include -#endif - #define TYPE_QCRYPTO_TLS_CREDS "tls-creds" typedef struct QCryptoTLSCreds QCryptoTLSCreds; typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass; @@ -48,18 +44,6 @@ typedef bool (*CryptoTLSCredsReload)(QCryptoTLSCreds *, = Error **); * certificate credentials. */ =20 -struct QCryptoTLSCreds { - Object parent_obj; - char *dir; - QCryptoTLSCredsEndpoint endpoint; -#ifdef CONFIG_GNUTLS - gnutls_dh_params_t dh_params; -#endif - bool verifyPeer; - char *priority; -}; - - struct QCryptoTLSCredsClass { ObjectClass parent_class; CryptoTLSCredsReload reload; diff --git a/include/crypto/tlscredsanon.h b/include/crypto/tlscredsanon.h index 3f464a38095..bd3023f9ea7 100644 --- a/include/crypto/tlscredsanon.h +++ b/include/crypto/tlscredsanon.h @@ -92,18 +92,6 @@ typedef struct QCryptoTLSCredsAnonClass QCryptoTLSCredsA= nonClass; * */ =20 - -struct QCryptoTLSCredsAnon { - QCryptoTLSCreds parent_obj; -#ifdef CONFIG_GNUTLS - union { - gnutls_anon_server_credentials_t server; - gnutls_anon_client_credentials_t client; - } data; -#endif -}; - - struct QCryptoTLSCredsAnonClass { QCryptoTLSCredsClass parent_class; }; diff --git a/include/crypto/tlscredspsk.h b/include/crypto/tlscredspsk.h index d7e6bdb5edf..bcd07dc4f62 100644 --- a/include/crypto/tlscredspsk.h +++ b/include/crypto/tlscredspsk.h @@ -87,18 +87,6 @@ typedef struct QCryptoTLSCredsPSKClass QCryptoTLSCredsPS= KClass; * The PSK file can be created and managed using psktool. */ =20 -struct QCryptoTLSCredsPSK { - QCryptoTLSCreds parent_obj; - char *username; -#ifdef CONFIG_GNUTLS - union { - gnutls_psk_server_credentials_t server; - gnutls_psk_client_credentials_t client; - } data; -#endif -}; - - struct QCryptoTLSCredsPSKClass { QCryptoTLSCredsClass parent_class; }; diff --git a/include/crypto/tlscredsx509.h b/include/crypto/tlscredsx509.h index c6d89b78819..c4daba21a6b 100644 --- a/include/crypto/tlscredsx509.h +++ b/include/crypto/tlscredsx509.h @@ -96,16 +96,6 @@ typedef struct QCryptoTLSCredsX509Class QCryptoTLSCredsX= 509Class; * */ =20 -struct QCryptoTLSCredsX509 { - QCryptoTLSCreds parent_obj; -#ifdef CONFIG_GNUTLS - gnutls_certificate_credentials_t data; -#endif - bool sanityCheck; - char *passwordid; -}; - - struct QCryptoTLSCredsX509Class { QCryptoTLSCredsClass parent_class; }; diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index 55fb5f7c19d..5e4f5974645 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -14,8 +14,15 @@ #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" #include "hw/nvram/fw_cfg.h" +#include "tlscredspriv.h" #include "trace.h" =20 +struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + /* */ +}; + /* * IANA registered TLS ciphers: * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tl= s-parameters-4 diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index bea5f76c55d..2675b1af8f8 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -26,9 +26,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS =20 +#include + =20 static int qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds, diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index f5a31108d15..820719c5e84 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -26,9 +26,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS =20 +#include + static int lookup_key(const char *pskfile, const char *username, gnutls_datum_t *key, Error **errp) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index d9d6f4421e5..44dbe0dc819 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -27,12 +27,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS - +#include #include =20 - static int qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert, const char *certFile, diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 4e614b73a28..e5d5675ef30 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -25,6 +25,7 @@ #include "crypto/tlscredsx509.h" #include "qapi/error.h" #include "authz/base.h" +#include "tlscredspriv.h" #include "trace.h" =20 #ifdef CONFIG_GNUTLS --=20 2.31.1