From nobody Fri May 3 06:01:42 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 1623860795798167.66288708512184; Wed, 16 Jun 2021 09:26:35 -0700 (PDT) Received: from localhost ([::1]:54710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYN8-0007Xt-QE for importer2@patchew.org; Wed, 16 Jun 2021 12:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJM-0000Qf-Cz for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJG-00024b-Pe for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:40 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-STPk8HgtPnuRHEhfKvTeMQ-1; Wed, 16 Jun 2021 12:22:32 -0400 Received: by mail-wr1-f72.google.com with SMTP id x9-20020a5d49090000b0290118d8746e06so1502684wrq.10 for ; Wed, 16 Jun 2021 09:22:32 -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 o20sm5470293wms.3.2021.06.16.09.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860553; 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=RMxZr8Rcry5WDgOL8lQycwuNpe1OS06Iy/sfLZSVq0s=; b=jUm/IaBclHwBfARz1VsIbJhmFGhrZR+HdvbNtjzcIUe5KvHWqqsGjvIWZlYer/kWezCfvr NDXHxuUzRmsfMOyw23cK++aLGP5YjIkGM6DmVkbHfc04t1OWrjQzv0KSbB8AFvzqAFLr9T N7z71rOZNsHdJkZBXiIl4JUxSH2bQgg= X-MC-Unique: STPk8HgtPnuRHEhfKvTeMQ-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=RMxZr8Rcry5WDgOL8lQycwuNpe1OS06Iy/sfLZSVq0s=; b=PCIUP/nHoJxf/QWR2VdNeuXoYiYAYMoMUKCp5Oaqoz7gNbQrxWKPokENjon3nz7VzS KmjL3OvzRJA0FpMoa5mPTHwQ6caRCLLLmt0pi+WDRoQaE8mp+z1ZrQj1BES4ZYnzGWI4 ylrrIrsGbSvbyBBVrAHB/mFHYwfr35R+5fCl5RaGAwqzROw63jXqKmKVrJjSyYk1Uxbe YlxSqQzAsi/Ug+Pm/Oetq5fklgzCDrdJLyo65Ym2dfes2O7ZiCBPsRVy7UUxV9VpvAWu fGKOgaAYbskKmF2KszowXiZVfPV4z/qFUx7aUYch6E7mpuT4dSizAAo6aMhP1N9fABDB cVlQ== X-Gm-Message-State: AOAM533ZC15ECez1vifMaOy3jfoT0ER+7Sqbgzopxs1RZDZGUwesOj4N ki8onBYaZtEVZEMZ3tKhugBveJis1PxTD1wWT2/hNkVpMOSRFoJUmkxp43aqPunGf4eczjCzLCq iV8fo5gK9cGJcZqvuV3nOTKLxxmyaPjbkOGojArPQz46NfLAWKJ6rCfD7GpTFtRM/ X-Received: by 2002:a1c:bad6:: with SMTP id k205mr12496228wmf.171.1623860551252; Wed, 16 Jun 2021 09:22:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzObt1DCt9M9foiHycfxkymJzjcVhLdybGnUd5eUqWk7jNa+LtDTCRtn49RA2kofMmJfp87kQ== X-Received: by 2002:a1c:bad6:: with SMTP id k205mr12496205wmf.171.1623860551015; Wed, 16 Jun 2021 09:22:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Wed, 16 Jun 2021 18:22:19 +0200 Message-Id: <20210616162225.2517463-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- 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 Fri May 3 06:01:42 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 1623861200079484.8653453177027; Wed, 16 Jun 2021 09:33:20 -0700 (PDT) Received: from localhost ([::1]:48792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYTf-0005hd-2k for importer2@patchew.org; Wed, 16 Jun 2021 12:33:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJS-0000qn-T1 for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJP-0002BK-V5 for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:46 -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-21-alCKvH-DMSKkO4aV832LYA-1; Wed, 16 Jun 2021 12:22:36 -0400 Received: by mail-wr1-f70.google.com with SMTP id j2-20020a5d61820000b029011a6a8149b5so1064383wru.14 for ; Wed, 16 Jun 2021 09:22:36 -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 p11sm2597966wrx.85.2021.06.16.09.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860562; 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=RmsGY+/pBsau6FlogKjoYzJxKLQ5T6w4s4XkXhstsVQMDJEjrLApLx1GVrYhKapZ+3ECCT eour5VWLHCgbL8PYShbmy3OuEYO26nwYqYJzhOovuJLfE8LjpBXjcgzGDBposvLOi/OC3c 10HpSRr7gjWWEZKSGtpYxO8/fV0yD0c= X-MC-Unique: alCKvH-DMSKkO4aV832LYA-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=T021SwoA064eHrIzelfPyjkslfv1sS51yOEQaigm2pSgMd2Ftuibc0nTNCaxTrlmQ2 bppn6uA0UBFOsqMbxAP7qJf0s0GQrzAaZ0LdIZ02J22c8J1xvzmEO/xe38LXQef9rKdD 5cwy70bpRfJb5FGTv4biOdWks8WRSz6qXU6QtCjArADStQ1oDPZZ8JP9KDXK2F1qfocQ NDcWQ2eVYq5rYbmPlPZ8WKFsq7V1wybe/gfriLGGEb6M4vTvvLrzFgAaWV8ENJLWouMe RQpKkazPRXv9CBg3jme2o5RYNC+R4KQKbkXCGtF1nLRaeOnDrpqhw0+RGcxldtPtHHOC 38gg== X-Gm-Message-State: AOAM533fyGeP0f1jrAbBoiBuAkxVZFqjCUrKty6zBn6sxh/5WNEd8rR5 in2EpOwfc66KdQdTh9kDXDOxHLWWJO+RWslDFB85p7fJTZ/YwCHCOEYg8s3g0LNvC4cbft3abTi YFdi/P1GArOKwc7ifFmrEJFwy/Wn6nnaYkz8FKfRNMilWfw4LQi9NmoVBWLJ/6JfF X-Received: by 2002:adf:a284:: with SMTP id s4mr225641wra.397.1623860555433; Wed, 16 Jun 2021 09:22:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzerqdDFU+hrqhimAnDSgDiDsfgbQps0VofL3pbs+7SiCYB6M5sh6Z0xAMETkiwiKp9ceV3bA== X-Received: by 2002:adf:a284:: with SMTP id s4mr225615wra.397.1623860555199; Wed, 16 Jun 2021 09:22:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Date: Wed, 16 Jun 2021 18:22:20 +0200 Message-Id: <20210616162225.2517463-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- 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 Fri May 3 06:01:42 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 1623860853764428.897918569528; Wed, 16 Jun 2021 09:27:33 -0700 (PDT) Received: from localhost ([::1]:60296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYO4-0002oe-PL for importer2@patchew.org; Wed, 16 Jun 2021 12:27:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJV-00010e-CL for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJT-0002Ey-Oy for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:49 -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-330-rfoSBVX1O3a10_5G3ih_Yw-1; Wed, 16 Jun 2021 12:22:41 -0400 Received: by mail-wm1-f72.google.com with SMTP id v25-20020a1cf7190000b0290197a4be97b7so1434600wmh.9 for ; Wed, 16 Jun 2021 09:22:40 -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 v17sm3275382wrp.36.2021.06.16.09.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860567; 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=akprm1w7gFAEqPUiGIH8UOiE6TY8OqnuB37vkpJeGQ28Olc3VcBa/I9iyckHtIcQZmVHL1 xHt4e9sR/YjGV1yg1TbjijfTzqE1du3ps9T4eiWLCo6gReV9c+ipFyLnZ5yzJ+OpTHx+K8 VzXkAvXWh7VvyM5rnmiUi4Ce8K42PoM= X-MC-Unique: rfoSBVX1O3a10_5G3ih_Yw-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=mX+uWW90jr0v9JxpUsxcu10ovsX0FYfon3iwm2Ct0PIt9D59jLBPWNVlzeqskE1D/n BCgDTW92Ib532AGpzfQQqIyiB4QUP5Ftv0yKzcttHdaufcpbiRW3PU8GhkAx9QgmVeij yoKfw6CD0HcfzH4/2jZMuJkGAlrYX81ZsqQGNrXRx1hfF4HUfPIXfCSEkTQYAcqKDE2n kz2mcWZjZuhc96wUtaOPCMrPHbbxj/eVprJhTSaWOjduGm+2zTM/1jJ4nbaYqmqeuSjy H+wa6SUmYYNGc9QpCLA/r500S3z1eOEGHoheK5yYIQ2Ln7MTDF6z0RRithz2bJHhWutF wF8w== X-Gm-Message-State: AOAM53059sBbB4en5r1lWy/+wKnlp/OpOIglvYl1jIR6qM05z09Z7kFV /A6QKL2Bh9NzKkNo+1H8oJ7x1BT/yvQO4jCow4s2Wve2w1FuS2ZuUaj19wehqbLQ2AFxPBenw1P kZHLajbg6gQ7mqRoBgNsGtHqYWI1Up4Uc/KwuYl7adpPmzzYsizek4WbYGWvSXgCd X-Received: by 2002:a1c:a785:: with SMTP id q127mr779525wme.152.1623860559613; Wed, 16 Jun 2021 09:22:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2q0FNzByA2T8pqjfp3wFtkJ7fe8iaB43Gzj9lUVtPORVbvITlbcidS0lIJEAAHx9Mi1HBxA== X-Received: by 2002:a1c:a785:: with SMTP id q127mr779514wme.152.1623860559436; Wed, 16 Jun 2021 09:22:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Wed, 16 Jun 2021 18:22:21 +0200 Message-Id: <20210616162225.2517463-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- 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 Fri May 3 06:01:42 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 1623860989223355.5904074087771; Wed, 16 Jun 2021 09:29:49 -0700 (PDT) Received: from localhost ([::1]:40516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYQG-0008RI-80 for importer2@patchew.org; Wed, 16 Jun 2021 12:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJU-0000wm-Bp for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJS-0002ES-LO for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:48 -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-103-oq8mZmUEOvW7RUDRZvON1w-1; Wed, 16 Jun 2021 12:22:45 -0400 Received: by mail-wr1-f70.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so1498168wrc.16 for ; Wed, 16 Jun 2021 09:22:44 -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 z17sm2645973wrt.60.2021.06.16.09.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860566; 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=P/gA7FaS+IDhv4AbbgRrkceU0efra7cMYOCMa530OP2DUW0BY47jzqpgzi9Ub+0abwE194 t3YMH4GqPauRTgLFO1J5IFIt7UMmOe74cED1oq3P8lCuiqackSMuWdprNgYRKE0z34KMoX QT+/THkF5UwFXliFbCchi6Kw5CL6Av8= X-MC-Unique: oq8mZmUEOvW7RUDRZvON1w-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=NZiX/LaPDqPaW5T9eQH4tuQXJBt/QFE/2MozA/MixfIFuUQ29uiheX9jOAYa8QLjkV oQ0AdtZBpEY94GsXFcv8vLG0QHxgFGA+oS03q0gs9EpKmUzZapP8dK0ngNtIKfBrBmVr BZZxbdZDFu47i71dinDN4KJ5KvDMtwWUQA/cThkVsBLN7vkolURSLsm1KgiN+v+1NCNd NRjjDqfYdexHEjrPgKdNmEoLt++6E5XC9+sG3KXizywMEDwFJHJYlwIJGoSE9JggF79y J7XbmqApB4fuybfQ4WHcznvvQXB8HrUyCyNCUGeAC1IUh89Vkh5gjccO+uGmrHuwZxBK /8Dg== X-Gm-Message-State: AOAM530RJLH1aZp7KHmbToWxKTMNdoo6ASmxbKGb2vCRgTr186Btb03Z ULzOTpY4GteFDd35DBHpAk4J8tGt9CO0TqTDqPqlLql4qifzKfh9Jr79x19k0Tz6otEXnHJcRG9 aC+TDTVKtLtKOPR7xIuxrLgANiWIHWsJ2LRJFMdAEJI0EEfpFZ7GKrxa4Ch/2JYvW X-Received: by 2002:adf:9084:: with SMTP id i4mr264049wri.23.1623860563724; Wed, 16 Jun 2021 09:22:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4FWPI4rSW/7Fl3ABL8A5d3xEHe8JRbTVo85W7RW+Y/dZfWooCgU7n+1cEjvpIFpBs33cQ2Q== X-Received: by 2002:adf:9084:: with SMTP id i4mr264029wri.23.1623860563529; Wed, 16 Jun 2021 09:22:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint() Date: Wed, 16 Jun 2021 18:22:22 +0200 Message-Id: <20210616162225.2517463-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- 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 Fri May 3 06:01:42 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 1623860903729504.99233088914013; Wed, 16 Jun 2021 09:28:23 -0700 (PDT) Received: from localhost ([::1]:35106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYOs-0004oK-KZ for importer2@patchew.org; Wed, 16 Jun 2021 12:28:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJc-0001EE-MA for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJa-0002I9-MK for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:22: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-513-ofVKBjj6PLWVPxcCWlCc9Q-1; Wed, 16 Jun 2021 12:22:49 -0400 Received: by mail-wm1-f71.google.com with SMTP id v25-20020a1cf7190000b0290197a4be97b7so1434654wmh.9 for ; Wed, 16 Jun 2021 09:22:49 -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 w8sm2829292wre.70.2021.06.16.09.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860570; 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=IQ+2M3Z1Th/Ec7i/HdYyIDKbmYICi5tPJM7BdnimDks=; b=Xbh8ypVzRM+IGY40VC8PDvbQ7CFwJYGHdHyXVog/ycKpWzS18xUK27KCfb0Vwjb2KH/I// fMZGQnI70L9gydLWETbbsJkR0Elx6bLN6YV6pCFvsYBmsweO2ZaF46/Jtku7zrii8NxFpO fwYzlETcp91dCNONwSL/RwpIRZ8Y80o= X-MC-Unique: ofVKBjj6PLWVPxcCWlCc9Q-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=IQ+2M3Z1Th/Ec7i/HdYyIDKbmYICi5tPJM7BdnimDks=; b=IIupdnZFCrlMKI36ngiDAZ7RDSjyMLBi+b1cqYbC92eW7bTUig2OJg568R0hDG33OZ YeCBVQoT+t79sIX9EYpZbDVejrYRH+xUow4EW/CmfX85E3I4dlwpU2B1z9st2mah5Mzo adGi5kS8WVroNBYkyzekzQtaIYrDCsApl1tStucYNderXincqIlUNzKvjwz+IPeXc459 SPQ9IxHh6TgqurHV/5rIJNw0wRGM8+ucPbWJw2rGLqMs9uyUciUMXa+GJcpwebvF4Ff6 MdHawN+qmGw0hl4aVdyVm0A0/09kfK4ohqdM8ZiUvCWrCJA7DSD7Pplve383OeZ5l6vK mztw== X-Gm-Message-State: AOAM5317InxO9wYtec+fQnRCrfLfDn6zi3H0xT+5MAIyf5whJx9v05gb mUtcND3LkVzTpHupiBk/6fOLngj3hblpeAQKi/XgHkB6YKMF3DS5wbf6EcNujuJqsC/+mweAVgh aFz5gklD+kc1u7EAzxbUujjMO/IYFtMdCrS/thw7wzofYykRGGHaE3e87CWbtl6VF X-Received: by 2002:a1c:7210:: with SMTP id n16mr11912088wmc.75.1623860568052; Wed, 16 Jun 2021 09:22:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMaZiq/ObnBOCKWpuK/AJV8Y1V+dp7UYZKVzWUM5D9TQdZXCVM/nmylcAX4JIhWohomBRgtA== X-Received: by 2002:a1c:7210:: with SMTP id n16mr11912068wmc.75.1623860567839; Wed, 16 Jun 2021 09:22:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Wed, 16 Jun 2021 18:22:23 +0200 Message-Id: <20210616162225.2517463-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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 | 15 +++++++++++++++ crypto/tlssession.c | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index 15b9cef086c..2fb0bb02d9f 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -162,6 +162,21 @@ 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 + * @errp: pointer to a NULL-initialized error object + * + * 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 Fri May 3 06:01:42 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 1623861420856669.3783404962885; Wed, 16 Jun 2021 09:37:00 -0700 (PDT) Received: from localhost ([::1]:58488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYXD-0003vu-Qy for importer2@patchew.org; Wed, 16 Jun 2021 12:36:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYK8-00024p-KR for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:23:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYK6-0002gw-7J for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:23:28 -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-143-BlT3Ez_cNoeUvgN4Nzp8Qw-1; Wed, 16 Jun 2021 12:22:53 -0400 Received: by mail-wm1-f72.google.com with SMTP id w186-20020a1cdfc30000b02901ced88b501dso1498548wmg.2 for ; Wed, 16 Jun 2021 09:22: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 s7sm2487468wru.67.2021.06.16.09.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860605; 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=F22BaJortXzpapze8NoX9kZ/x3h9fExXipAbTfsR2GqElS0HFIPuS9TuYrTIO7PEQX0TMi OVCJDxRtu6syLHgSvkGwgGTHbz/8Zhx4VI92KBD94b06CcFoGIuL0rbLPr2t5hL3xDjRY4 aUdUaBlq8KC1twIvVOuNkQl/LedvhlU= X-MC-Unique: BlT3Ez_cNoeUvgN4Nzp8Qw-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=BBMdCeQTAXzNMORSTo9sMQ90H0F0/OZMJ559Zx8o5oMGQvwPaQsV0UjduIA+C5C4bT /GhFtkbOPiD3zJylQQEbuzYYcdU1GVFI7tZ0pyfF2upm/G2BHDn+dog45xlp1Ynb2kPN 9ch/mMoFyIOuZ7KKWfG8WgwcJ3ratKwG4TMRB9aDLO9aWa2SjWc3yvbWMpLaL0s6vRj6 ZvCq8AQZF8PThooWnnXDPRPXd9ZBoHAg32UvNvQKlYsRqxzaHUedySq+MXpcHe4ddAs6 GLUtTwqAwpQBHkMyKfS77gtK84iw7sIV4LXwHL78Z6O+Na3ycs/MCA6E9yBpEqrCVjX5 /IUA== X-Gm-Message-State: AOAM533Y3Ppx13LWxnuA7ZO0Tai16ltxUzvcsmvNG7YUhivltbqPdMix 4KvXfAc6HoLGnqgXO7pc+5gR7LaVcb2oYd8UE9JW/UE8hcR/cxcXtdk8Y4LcXnoZRvwVa3FnAGH tKPRd05HXeTZRf0EU00RV0mp757ZHwcVKBhGbAcrgrX7ulW/Txps8bAZNmmnVLu6c X-Received: by 2002:a5d:4291:: with SMTP id k17mr318617wrq.40.1623860572401; Wed, 16 Jun 2021 09:22:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAamDTN9kWttapdnDQOX34c8MVdT1YlKYD3s8JWP5qlCI7qF1YLTNBTzWLSCps8TQNrMir4A== X-Received: by 2002:a5d:4291:: with SMTP id k17mr318596wrq.40.1623860572254; Wed, 16 Jun 2021 09:22:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Date: Wed, 16 Jun 2021 18:22:24 +0200 Message-Id: <20210616162225.2517463-7-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= 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 Fri May 3 06:01:42 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 1623861314811928.5016120146055; Wed, 16 Jun 2021 09:35:14 -0700 (PDT) Received: from localhost ([::1]:54100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltYVV-0000sS-QT for importer2@patchew.org; Wed, 16 Jun 2021 12:35:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJj-0001eX-Cd for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:23:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltYJg-0002Qx-Ti for qemu-devel@nongnu.org; Wed, 16 Jun 2021 12:23:03 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-Aboujr4FPBOl8Ge6KeoKpg-1; Wed, 16 Jun 2021 12:22:58 -0400 Received: by mail-wm1-f69.google.com with SMTP id h9-20020a05600c3509b02901b985251fdcso1550885wmq.9 for ; Wed, 16 Jun 2021 09:22: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 o11sm2239478wmq.1.2021.06.16.09.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860580; 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=+TBFCsRHnPy3QekBc4UhWQQnO0xBynFqdBEjcvlX/yM=; b=a5v0H3ujlIBPlSeXgCR9JVjoeJncY00ITbrQ9xKRXeR6F2TWRcbEBd79Jwelm1u1UTdybD K0l9UZuLR/54OHS3Xmp4i2TKIsEKRQnqiApK8lNVhmfXnlTr0b/SjgQ2PH8JDrUIW2s5CU lp/Tr80N6I7aeImlen5cJUmMfBFmp10= X-MC-Unique: Aboujr4FPBOl8Ge6KeoKpg-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=+TBFCsRHnPy3QekBc4UhWQQnO0xBynFqdBEjcvlX/yM=; b=r1o1t6ol7YRNxKr8Y2Xb1bSBQvL8jBEDbgczg/ACGReBySBJlw4OcPV8IlExhNb+dI ouJv60fokxP8FnrMAUQBusA/G7g8lXqeoachK5YBj7Qfvk2gR2KPxw9l9VyTOQLGdKXa JmDCHivHxr1r9b8SFU9PyI4K0DzlSRJ9Vg+WOErC1f0N7AhMDixxCd3LF2ttDuJ4Belg Zdi+bgOgMHBbnhvM+iQBFUW89trBMnOYsLKTsbrVr+QpOp20Y5iu5r8qPVl41YDyfKk2 k2YSLQtb9c/Yay7eFxO0ZsB53d8OGeSAM5A20xE1uhOa02H4Wazr1gzl/JIijOYez2n/ E1yQ== X-Gm-Message-State: AOAM533xuffKYM68Uh2of04jEFikgLEle2LQdX8iTnKqpVz7wlBXZ2Lp H6GC/UpXGgKRYEEBz0vHgqxxV7al+tPlki/5phbu2EDjYb9YoIk0kRCpt4zWhKltuaRR/uTCp8Z wBlyM1OOM+7U/bVHGVA0rp+V7XrlU/KQ21UuxC6QRonbSG6knW6G3t0B3TRpaSD6c X-Received: by 2002:adf:8b4d:: with SMTP id v13mr240858wra.223.1623860576774; Wed, 16 Jun 2021 09:22:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9F7yzGebPj8gjU+MprhpXP98Yri6oymt5PmQrvnuhyDM7bq5olXLPVthCCReFyTtk6TvhDw== X-Received: by 2002:adf:8b4d:: with SMTP id v13mr240834wra.223.1623860576544; Wed, 16 Jun 2021 09:22:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 7/7] crypto: Make QCryptoTLSCreds* structures private Date: Wed, 16 Jun 2021 18:22:25 +0200 Message-Id: <20210616162225.2517463-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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.199, 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=20=2E=20Berrang=C3=A9?= , 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. 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 | 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 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