From nobody Sat Jul 5 15:23:39 2025 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 1624897020499582.2162596890743; Mon, 28 Jun 2021 09:17:00 -0700 (PDT) Received: from localhost ([::1]:34298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtwR-0005Vx-E3 for importer2@patchew.org; Mon, 28 Jun 2021 12:16:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtp9-0008MT-4k for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtp7-0001nI-Mf for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:26 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-t9xTsKvHPmuNTzuv45HDIQ-1; Mon, 28 Jun 2021 12:09:22 -0400 Received: by mail-wm1-f72.google.com with SMTP id j38-20020a05600c1c26b02901dbf7d18ff8so9178710wms.8 for ; Mon, 28 Jun 2021 09:09:22 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n29sm8884871wms.34.2021.06.28.09.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896564; 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=u0szslgGWkXREoQifXmaYK6z/LFg8qkIY67jvHG2HCU=; b=OS1oe0J19yhfZ7Hc9F3QbfQvbtR7Y2NMAUXxCEIvTQC7fQAg46e3i2H7xVCYJbPNQ+HLaA LB7GK7RJcvVG8Pf7h52+lAGHTum0oesth5k0cO4HT1ChFSUN7hY5xrW/1Vmt99EeXnP/nz bESBYaexAnpgGCP4ti9bZffzfC7baxg= X-MC-Unique: t9xTsKvHPmuNTzuv45HDIQ-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=u0szslgGWkXREoQifXmaYK6z/LFg8qkIY67jvHG2HCU=; b=KqSsmOduojx+i+EtOBpryivfEtJLEh6afrh3BTjPAaVKSK/Skw1ELAwP+2qSw/hnl0 HH1hzVZpMfAEYEZMutHExmMe154Uhfwkrt7FpxqhHZMvcG2rthlYadcaWmx++y3d02FA hqMXq/PvKD+B0mOOF14mKQr5E4EPvTE8DN1cnllpW2OL09BiQkopHryfRZvBjYOv02fB yJmAeZthqg9L3dnPcspXL4QvM/XJVEtnNoBb5vxXGMWyvZ34tBU5HiYLymEweBlsmJ4M lO2ojWDJLi1vOwk4cViUlvpaqhtRX4bJQHpu8TSyl/Ikw3MNkz9zFtsfpD1wG5G9Hk81 ii4A== X-Gm-Message-State: AOAM532eXuCPflb8+DO6DdkGs2PHy4pKKcIQ4Kmd78sGHWXL/Oa91KmF psG9Kpiatv8q1d9Fj/QR0/f//s4SfyeHzx6QjhaM3Y4CZR43lDxrXbl3/eP3h5+7eOOIF8DC4kh w6UMisB+SnE9K8sqOG3VmkfvqWUtAJ1IKOAiCBziQjX9ZEIFQan+6zGuY1dOulqOe X-Received: by 2002:a05:6000:114a:: with SMTP id d10mr27874527wrx.7.1624896560916; Mon, 28 Jun 2021 09:09:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxp7sBYNDZ+tIxlu3VM/Ofvbnmyo974+LJ+okDa00qUiU+KL3ROEa2ta0GL/MqyOym4OB/iw== X-Received: by 2002:a05:6000:114a:: with SMTP id d10mr27874488wrx.7.1624896560566; Mon, 28 Jun 2021 09:09:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Mon, 28 Jun 2021 18:09:08 +0200 Message-Id: <20210628160914.2461906-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/tlscreds.h | 14 ++++++++++++++ crypto/tlscreds.c | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index d0808e391e9..a14e44fac15 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -65,5 +65,19 @@ 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 + * @errp: pointer to a NULL-initialized error object + * + * 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 Sat Jul 5 15:23:39 2025 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 1624897143393621.3590880107727; Mon, 28 Jun 2021 09:19:03 -0700 (PDT) Received: from localhost ([::1]:38622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtyQ-0008PT-7V for importer2@patchew.org; Mon, 28 Jun 2021 12:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpJ-0000Iw-SL for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpF-0001sB-LM for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:37 -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-375-U_hn4fbXNmqW2-7hWP61Kw-1; Mon, 28 Jun 2021 12:09:26 -0400 Received: by mail-wr1-f69.google.com with SMTP id v9-20020a5d4a490000b029011a86baa40cso4787945wrs.7 for ; Mon, 28 Jun 2021 09:09:26 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n7sm19219759wmq.37.2021.06.28.09.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896572; 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=di8G8OpPyGBM2GZmS2rZ5uEzqieWECN7S7sUT+1jWLQ=; b=CIJbezAaZuTZnQdo4XCc2AtnWzWB0FoHWjwrX5iTFxQmqlTP+SCvDNTwNKrie/S0DVXLY0 SCFncSlFIrcNlSNM/x9cnopbg75VOeKEglzBylblzUtFqEyhbkeLdVq7UsY+KUQ6ACMjIl 1vMhvitGLmItxLtrNSdYDQD8XpNbL+E= X-MC-Unique: U_hn4fbXNmqW2-7hWP61Kw-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=di8G8OpPyGBM2GZmS2rZ5uEzqieWECN7S7sUT+1jWLQ=; b=Hi3UcsBJEsb69OoZzutDNw9j2V9ly2yRS1HECiCj+YSdR0/q6Y9mjJr1RZNpTFhNgw FFOCerhPWSC68Qa883lcK6zAxNKeyTxg45mROPMnp8GT8N5YVvCpDlI2DRdiOVXJc9+Q D+vx5YZMdMonyqTkWBk0Ixix9C+skSZ38wvoJLRmMs/kOtV6hTwr3ePrNQ6im5WZGoO8 yPTP8Nrx0CwtwykgkkwpdRo4qJxMW9Z4sx8/OXvlNWNSTmrAUND4DfpKLpMw6RuQfJP3 h2hNxFopoSg8AwVJ085nXNBBIEEXqCn4IMr05EYTOw13NmwRlIDjj4FBspGHbP+tgihq iPtQ== X-Gm-Message-State: AOAM533KrYin+mogIMOWmMD15dZnvXl3KHNDqvH1i0I8P3C4wv4Xr/LQ Qt4lTXw2gC18iuNdA+JrYKrFeMae5Qlw4BnY0vhMJ6GklM/vB7bGKcTSPCejx9j+901mfLWCo9w EJgwNqBsFP/0kZECKP06+bBVLB4VOHX5uOXuvDVLuuXYUSj3e14qEaTMTc9kITm7P X-Received: by 2002:adf:f482:: with SMTP id l2mr10079385wro.276.1624896565305; Mon, 28 Jun 2021 09:09:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFGicw1aHLPUm2i2suLI2SuHsTTGZnFGePNbqn9GKWEuGpv9I6lI85byuTgX1qirvfP/D+SQ== X-Received: by 2002:adf:f482:: with SMTP id l2mr10079364wro.276.1624896565104; Mon, 28 Jun 2021 09:09:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:09 +0200 Message-Id: <20210628160914.2461906-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 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 3cbee762de8..601fccc5bac 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1839,9 +1839,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 Sat Jul 5 15:23:39 2025 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 1624897035892933.7858972960554; Mon, 28 Jun 2021 09:17:15 -0700 (PDT) Received: from localhost ([::1]:35194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtwf-00066c-W0 for importer2@patchew.org; Mon, 28 Jun 2021 12:17:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpd-0001GS-Ad for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpb-00027N-OI for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:57 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-0pz79RqKOa6_dST-X8IkgA-1; Mon, 28 Jun 2021 12:09:30 -0400 Received: by mail-wm1-f72.google.com with SMTP id i7-20020a05600c3547b02901eaa4d778adso1368204wmq.7 for ; Mon, 28 Jun 2021 09:09:30 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n20sm13522750wmk.12.2021.06.28.09.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896595; 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=DfqYkwgTKKkxPbFVd5zilcJPjt9FG4DxuN+oPlFbvLM=; b=drZ7RlSzFBGcObz1OTl/zUocGWThom7U3GRVBsn2LqoNx7ESywULqaMxhYlVH6KT7VPjrj yExFbsqzG3b9JM1Mghfu5TTUcsm8pXKA4jHeWwt3MC+PBGRClwF1bp9feSvfpq+zzhK+Qe LWoU1CqOXDUs0PJyATZoOehjz4XRB58= X-MC-Unique: 0pz79RqKOa6_dST-X8IkgA-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=DfqYkwgTKKkxPbFVd5zilcJPjt9FG4DxuN+oPlFbvLM=; b=RFU8JofeYPCGSXWdwZSjHCZUYCcR0AsxVo7TgnH7Uq+qN8OBE4VZsMjqxY64P/6/XH 7HhNnlot0OM+qm7CsgsY4yxtSC6LaEFI5kcGf7Iv6HWN9fnYNd7Y4e/8NtYtgqx0QkAQ yy02En28nT45megREf9MbMugboUuCHAPeQ/AyQoX9NE294Ep9/cHnHckjDj5DzmvNKcx agebMVdJE7L30TTuQ9jPUgmilep4thOLzUGJDFemabQIVwPP2HoOKeuW/lxv3G7N2jJW X9LL2VCYBpeNvufW/9TAD2i4C+8Lh3PlcFaQ5jAWRhNOy76EHnWFXJKRvY9v+IhwN7CS KcAA== X-Gm-Message-State: AOAM533HY5IbNKmOqTljhs0EwLiSykyZoO5Jygh/mn8Oiwpy2h0ZRdGa IZPP9yAvOZXib8l+pyTSxdyp8nE4Cs5W7tF/HbNGJcPEaN5ii7/sB9A9cQRlzffVwpk1dVFVkZ4 ATrskS0Eup+I3xrYW+KQGDamf9/YV2IcmOXCIKh+td6sPMBFMbsoebcFOhovXuFPv X-Received: by 2002:a05:600c:4f15:: with SMTP id l21mr15918452wmq.72.1624896569381; Mon, 28 Jun 2021 09:09:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmwQff2AK0G9javFMNtow6PiB0Ulm5gL+u2Ag/NUUmes3l7f8/fAZf7Ml0Oi1KUlHk8DMRXA== X-Received: by 2002:a05:600c:4f15:: with SMTP id l21mr15918433wmq.72.1624896569235; Mon, 28 Jun 2021 09:09:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 3/7] qemu-nbd: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:10 +0200 Message-Id: <20210628160914.2461906-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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 Reviewed-by: Eric Blake Tested-by: Akihiko Odaki --- qemu-nbd.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 93ef4e288fd..26ffbf15af0 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -43,6 +43,7 @@ #include "io/channel-socket.h" #include "io/net-listener.h" #include "crypto/init.h" +#include "crypto/tlscreds.h" #include "trace/control.h" #include "qemu-version.h" =20 @@ -422,18 +423,12 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char = *id, bool list, return NULL; } =20 - if (list) { - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { - error_setg(errp, - "Expecting TLS credentials with a client endpoint"); - return NULL; - } - } else { - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); - return NULL; - } + if (!qcrypto_tls_creds_check_endpoint(creds, + list + ? QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT + : QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER, + errp)) { + return NULL; } object_ref(obj); return creds; --=20 2.31.1 From nobody Sat Jul 5 15:23:39 2025 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 1624896701877823.3239080098102; Mon, 28 Jun 2021 09:11:41 -0700 (PDT) Received: from localhost ([::1]:47188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtrI-0003XF-LT for importer2@patchew.org; Mon, 28 Jun 2021 12:11:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpL-0000MG-41 for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpJ-0001uf-4l for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:38 -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-311-GT9ytfxlOq2KC_ItpYCB2A-1; Mon, 28 Jun 2021 12:09:35 -0400 Received: by mail-wr1-f69.google.com with SMTP id k1-20020adfe8c10000b0290124c5f1d4dbso1937618wrn.0 for ; Mon, 28 Jun 2021 09:09:35 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id b15sm17739862wrr.27.2021.06.28.09.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896576; 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=VkLBHkfXJxaMXYLk4+jG0GG7cEqqzru53ecaYrh3wFE=; b=LGiVfcyDhXrdF7RHGyXf0OsZqFL/CrerNk6wFYr1ZB8AD/puT7qbXOVPddB2DxlPmJtZdw R/9pkYKlkBD7J0bEeYxnSvPh9bCQXvkZpZ8qN+Ol4PsegiSqCa4ux1g5UmOM0ZOD+2UN3A 3aUr2zt4WwNGb6dZEK9JJ7L9YDhSkHE= X-MC-Unique: GT9ytfxlOq2KC_ItpYCB2A-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=VkLBHkfXJxaMXYLk4+jG0GG7cEqqzru53ecaYrh3wFE=; b=n47ShaqirfexeTBH2lf6sDNpVpzl/H1qSi18AeqRslnNIeMUaPDTpEYNQc9jegGBV+ hmQfiDJkvdbgOd5NIhHR8Yd+91nvZeUKnmdsdRIW31CvsnLt5RZbzC7h2BxyBapU87hD YV81zwOn+jBJUdQGaaBd3qaHSBsnd+BPVQ+cnIOZqwBec5pvkbX2Q6JNksvQeacKwJDj SMNPQ6bB83ZdzBkJO8A1epPC2Ugp5t641764mowZb6JiZ2cbGOCa1J+ukeQn8Tg32YjB HDirodf/Y4wbVG5IT/FYh5c44N0MT0jfQnaY1/iJbkeo2pxLOhpFhHypOeYuWQEvgq38 W2rw== X-Gm-Message-State: AOAM532LAoS/Sgvkmt/tLVsOdi7jEQZxCk3dmyiTDIinSvVM9ONcGNDn doAC21tVm5MXWNQtJMX40BHg5YEmYn7lbCmQvP0IJH2Y6SWyTRuaDw2d7HR8XY51oDPRPPMLQOw 4FglTQ7qB8t88YXz7wh2SIQ4g03bw4kEz9MZmYmx7CCT8qdXxGvPkZf43etsak5oJ X-Received: by 2002:adf:ea45:: with SMTP id j5mr9030487wrn.230.1624896573733; Mon, 28 Jun 2021 09:09:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJze9c+nkYgCiUOvyNIiKvjttKE1+g7r/It7diSrKxB+4+qpY/jW6MRfRnzHmGzEqQbxNUU/YA== X-Received: by 2002:adf:ea45:: with SMTP id j5mr9030467wrn.230.1624896573601; Mon, 28 Jun 2021 09:09:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 4/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:11 +0200 Message-Id: <20210628160914.2461906-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 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 Sat Jul 5 15:23:39 2025 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 1624896814146509.57791086992495; Mon, 28 Jun 2021 09:13:34 -0700 (PDT) Received: from localhost ([::1]:52562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtt6-0007Cj-GS for importer2@patchew.org; Mon, 28 Jun 2021 12:13:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpP-0000YM-2c for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpN-0001y2-6j for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:42 -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-45-UdrsGseiObiE-fxZYHZDZg-1; Mon, 28 Jun 2021 12:09:39 -0400 Received: by mail-wr1-f71.google.com with SMTP id l6-20020a0560000226b029011a80413b4fso4779631wrz.23 for ; Mon, 28 Jun 2021 09:09:39 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id c16sm6794852wmr.2.2021.06.28.09.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896580; 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=TD8DXvgsYWHHJcVzYutELY0M+7fBmJca4T5Y2PtlOCw=; b=hXDIMTW+wlqsoj77EveTEc1v10GeR2Zgx3jYFLYbEL6HE4YE2quPJY4OTh5tM2Amjof5KG tG0Q0T2y6ZMwEOMMUI5i0TBTzH1J8PN+kPxgE92c0namcZts7tsjD9Ls4ltDjgrhJ8oV5v yOHMoyDUmncizcvJK2+v53UXTlTLD1M= X-MC-Unique: UdrsGseiObiE-fxZYHZDZg-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=TD8DXvgsYWHHJcVzYutELY0M+7fBmJca4T5Y2PtlOCw=; b=r+KEI8Q0FBwsNgRkqrlL+UwmI8+w9q4s9ZzhP3m0gr/iPI0p/pvlydqkFBGIEsMT3E Xc0NPCgkSZLD1NQHpqCib7/RfQBibKJWnqBS4vEzcGNzKX8iPxf0owIEI9AFf9NiuFU4 QKjt7vN12T0O5H1alB2gO5xcK5cOP51GGDgSK8Ci8GSj+CC+4eY2GpCV5An+WmoFD+y9 3GPxtoHs2/wLO+D2Ka2Xcr8Tc9UQA8UNNACXOvtFKvOCE+QDIyrQ0oQ9YJWA0VyWdFZL gjr7QMMtmBKurGhSZuo2LFoqKqqlZ8P9EL3AuFy10v6h/1UalPdsU9yOmMtU6b5pD1gP OKHw== X-Gm-Message-State: AOAM532XEhdFqifPnSj4sbGZvx2Udtea9a/mVDIY7otWXIQS6wnIiCdr NSjTyPDVBcgjaG0N+/ODbFr20eFnXlwdcSR8TwI/T+CDc+V5dOev7VGGVf4ztO65L6XnBxt4Jtp tGsvM8cGODUyvtDXUa/lfE4ccLKT4A0RXzUSOKEjHE+ywLH8y3TGPDKO+NhbnDN3A X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr5556214wmi.18.1624896577967; Mon, 28 Jun 2021 09:09:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypc3fmtal7SMGzFkjDJxNHml8cOxCAVRvW7WysYppdS4UPTDdJlhkl0TQtARgOisEjwJqzYg== X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr5556196wmi.18.1624896577840; Mon, 28 Jun 2021 09:09:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 5/7] migration/tls: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:12 +0200 Message-Id: <20210628160914.2461906-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 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 Sat Jul 5 15:23:39 2025 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 16248967124541004.862844729593; Mon, 28 Jun 2021 09:11:52 -0700 (PDT) Received: from localhost ([::1]:48166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtrT-0004GD-FC for importer2@patchew.org; Mon, 28 Jun 2021 12:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpT-0000nt-Dj for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpR-00020b-Sv for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:47 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-H-FtnMc5NdGRAoPFs79MWQ-1; Mon, 28 Jun 2021 12:09:44 -0400 Received: by mail-wm1-f70.google.com with SMTP id h14-20020a05600c350eb02901dfc071c176so188875wmq.3 for ; Mon, 28 Jun 2021 09:09:43 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id a9sm14896918wrv.37.2021.06.28.09.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896585; 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=sBGvZXp052kEjTXJ7kkHWmWt6IWVNfRolcBLTV9KMRg=; b=JOUxtdnF1tRzdi7pfQZ95lxqCPSDRn6jOaA48XU9/M0wYeYAMnpCSJxNdJaPRJEl57+ZWL izT1ZA2DBQ55D+VUNx4zQQ64bJaau7siMy2o9W1ggqVShhulkvxpjGdyHidO909HNqHWxf SM9iCW60i70fHv+hE5nPwrf2IVV/7Ts= X-MC-Unique: H-FtnMc5NdGRAoPFs79MWQ-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=sBGvZXp052kEjTXJ7kkHWmWt6IWVNfRolcBLTV9KMRg=; b=Sp1kTm0gpOiRp/NjJrxo1up3rysLBnE7aRX7ajHG8sm4DeUO/0etVeyCGI+rwdzmqQ CMJlOzifapFHXyL3vQKSa+8yGrTyxUY/PE51D4NXNL976/NJCWOnI6l3upnecbNa6qK7 rbfLjaTn+AomG4glNVMeJ+gd2BxKaus5llXNkuv7nUwFY6qv5Oy9JjdCAh+ymnR6cHzB gor1LHuMk1+A6lW4rD1rrLVSTtoBjL2LI2GDDRckTR0M6UqczHwYCEhTyhEuekFenkXG XwFxYUk7gqC1Rd5Jbton3/HF47v/PQEALsdQ8LfxruoIA0SkqmIiRl9BRimhWgA+nxGh Oa4Q== X-Gm-Message-State: AOAM532qGqU7NbfJbM+2HRgY9NjCMjvk/H5zwoxfW1N14FtSzuab2pHP H5HSkz79zM5Mp9joaPD2vDsfq+kTjDLVXHuxLWS/ibux44fv9mImmaA1cuRlCdHHMPBLFOInhEr udOzY+Nqy1k0cLAyJJHJ9GD11YXjsH7Hy0CWRO5t4n7xRuVL5eGq/EG+vCDCz4/ND X-Received: by 2002:a7b:cc09:: with SMTP id f9mr26961709wmh.104.1624896582660; Mon, 28 Jun 2021 09:09:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQ0YzFBUpwScrcSCK4j1u6w+wXm3cwdvfKYcec0UUGgSDVRRMl0kkrUZTyRyo9bZ5NXA0g8A== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr26961681wmh.104.1624896582479; Mon, 28 Jun 2021 09:09:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 6/7] ui/vnc: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:13 +0200 Message-Id: <20210628160914.2461906-7-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org 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 --- ui/vnc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index f0a1550d58c..0e5fcb278f3 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -46,6 +46,7 @@ #include "qapi/qapi-commands-ui.h" #include "ui/input.h" #include "crypto/hash.h" +#include "crypto/tlscreds.h" #include "crypto/tlscredsanon.h" #include "crypto/tlscredsx509.h" #include "crypto/random.h" @@ -4080,9 +4081,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_creds_check_endpoint(vd->tlscreds, + QCRYPTO_TLS_CREDS_ENDPOINT_S= ERVER, + errp)) { goto fail; } } --=20 2.31.1 From nobody Sat Jul 5 15:23:39 2025 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 1624896876475123.94696959008695; Mon, 28 Jun 2021 09:14:36 -0700 (PDT) Received: from localhost ([::1]:56444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxtu7-0001L5-BO for importer2@patchew.org; Mon, 28 Jun 2021 12:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpZ-0001C4-Kx for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtpX-00024I-3z for qemu-devel@nongnu.org; Mon, 28 Jun 2021 12:09:53 -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-603-IwIeQd-9N-yysSChuN07WA-1; Mon, 28 Jun 2021 12:09:48 -0400 Received: by mail-wm1-f71.google.com with SMTP id z127-20020a1c7e850000b02901e46e4d52c0so5319215wmc.6 for ; Mon, 28 Jun 2021 09:09:48 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id t128sm21408325wma.41.2021.06.28.09.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896590; 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=FqLFsVIs5eoXi/VP70H1Pdkb5jHJv3kkDE9nCJoqgbk=; b=IsphPJhcccuagRK2DeyfeqK95UYSBaMyfDwRAczd43Z50yyBrb0RiiW8bUcVHL9IWxJMWM ka7BssuNwE1nO1CfPH2qzNJC/8RgyVqILcLJXow4c5sT3Y3unF82FY+GfhN0MHgT8mH+Sw 6ytnofW7Z4Ei2KrueTegqRaKHKhNK2A= X-MC-Unique: IwIeQd-9N-yysSChuN07WA-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=FqLFsVIs5eoXi/VP70H1Pdkb5jHJv3kkDE9nCJoqgbk=; b=B5evoW/DVi4FB0v9FfE3CWHCrzuzfyXoyn9iwoz9Vg4yg5uW8N08inm5uf/7CGEpVA 0DGrGPGnvHAfZjIdmjI+y8XP7DK6WuTsPdSsyMtOF5nWKwRNfV8G4Ao5gvzAK8MimHOY YgbkqXx5MIPYcKX7lLqQZzgp+KZ8yabch+as8gxPvIvdE6z6EUmagV04w54hGTHHXPzs 5/LBH3X64YhsnuE2CGf1vVBMpcRylkc9IoZgCMBx64PLxTxgrwFZBowkH39DKqZj/3p4 OFLLoesTVQOrwrh1As3taQzGf2C2G38E4P8u+qg9faB0EbJM7hiZPu3dsbz6KSnkwlTe XekA== X-Gm-Message-State: AOAM531doWPVaHlKRxVSKFsOylUXquQyDmy94Iah40Sj7WQc/8BcHnbW Mhz7HJTN6sEX23Zh84rnaSEz62Z5rb07pCev/nUEg4JrmQZ/Hd07jsoqtQc6+LRsO+hkChk3ui5 cDw9XFku4xF5wiQgF1o21G4zMU5paqdeVrpsaRYUHQoG5XpattntZmZ3aYcKKoiN7 X-Received: by 2002:a5d:5012:: with SMTP id e18mr28878248wrt.286.1624896587066; Mon, 28 Jun 2021 09:09:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTZ9Zvd1U0fKPp4BwZ2XFg2kIoxTE0aigFS+GRxIfAHkvzFtaBFaXNaLK0MyJjuxTy8DE/fQ== X-Received: by 2002:a5d:5012:: with SMTP id e18mr28878206wrt.286.1624896586758; Mon, 28 Jun 2021 09:09:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 7/7] crypto: Make QCryptoTLSCreds* structures private Date: Mon, 28 Jun 2021 18:09:14 +0200 Message-Id: <20210628160914.2461906-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.375, 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?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Akihiko Odaki , qemu-block@nongnu.org, Stefan Weil 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. Note, tlscreds.c and 3 of the 5 modified source files already include "tlscredspriv.h", so only add it to tls-cipher-suites.c and tlssession.c. Removing the internals from the public header solves a bug introduced by commit 7de2e856533 ("yank: Unregister function when using TLS migration") which made migration/qemu-file-channel.c include "io/channel-tls.h", itself sometime depends on GNUTLS, leading to a 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 | 2 ++ crypto/tlscredspsk.c | 2 ++ crypto/tlscredsx509.c | 1 + crypto/tlssession.c | 1 + 11 files changed, 58 insertions(+), 56 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 a14e44fac15..2a8a8570109 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..6fb83639ecd 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -29,6 +29,8 @@ =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..752f2d92bee 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -29,6 +29,8 @@ =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..32948a6bdc4 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -30,6 +30,7 @@ =20 #ifdef CONFIG_GNUTLS =20 +#include #include =20 =20 diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 33203e8ca71..a8db8c76d13 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