From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778076; cv=none; d=zohomail.com; s=zohoarc; b=Hl4MhXU/8X8P46T7OHYIxEa4SG6Cfyt04TOxbBLL1jD190cI4ZaGwFwvPK/WNwz8CBYArFszB2Mk0t5AHn+eqi2wMqiPdR1KNWMh03ggBZ4vIAMrUsfCmejpUw2Dkif8jjIkVBh3xWJ/jXh0D7wAUjtkwFEEbSHOQDHAV0vy9LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0YUxkcREe+oRV0WuFPVPw6I/e1CnZd/+DTRnaH5xN54=; b=iw3G+fxKhQDNTqCpswTZb70thi8Lw85f3qEE7Qna+PUlbex8C9DShbLp3KBOylpBSG1baMfc4ypoZZz9z0s+m31UWjzmxBJ+Pw3x9lPgwlukLVpxglzLgGM1TXkTGw3z+tCBeqkHsboygnoQfR2tD09avoLhgMuqqDmgytFWII8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623778076446839.9476796911855; Tue, 15 Jun 2021 10:27:56 -0700 (PDT) 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-443-RiavpSH2OOespRQMzfBvVg-1; Tue, 15 Jun 2021 13:27:53 -0400 Received: by mail-wr1-f69.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so8944611wrc.16 for ; Tue, 15 Jun 2021 10:27:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id u15sm2441212wmq.1.2021.06.15.10.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0YUxkcREe+oRV0WuFPVPw6I/e1CnZd/+DTRnaH5xN54=; b=Met9IxB6Y6WTUNyB1GmfVq+9QPq9ob+4+IwuG1mAovDViuzonftRtCkJH9NaiOqdvVTN3/ pqPJXds82lqQgizDOKLmOVTchNRUzMSV9YkCvEcCXiJSGFnmc3SaMm/OZXST4TGf3Q/cks okqoVGFl4G45j5LZVqc/vQqmX/eUTLM= X-MC-Unique: RiavpSH2OOespRQMzfBvVg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0YUxkcREe+oRV0WuFPVPw6I/e1CnZd/+DTRnaH5xN54=; b=TJdljGCTuPfYlgtMt1bLrELsaNM8oCW8NsGcq5U39uZ97IpLEoIPK0QoiMtr3Lf8U4 e9OQ2TR67ysVQgW+6asncmClCA1Hz3cMCk1IgKuXKz9XhwqkUmIsONpokL9PG1oQSMC3 rx0zwToxjy/ZwVNtHOHk/cIPwHDwEt+8Vgso/uPsyO5Y1TauCYEVt5kyOPg5wJNlHXE4 l70xpFOnP+nJ1YKXQCqA5wjpVAC0ho0f5pANuqrX4XYL1/FwA5oeS9yVs4riZi6Fx7VS nCS5j2orWMwFfvPgnh7l5SJ1M7C8wzcyrp8J+WIB8SoWJ2HgtwJDxyaXSeAsyOvCmIS7 v79Q== X-Gm-Message-State: AOAM530hWh6X7vkBb3CdQY0JIimTboKPX4if9CSiPg59HMLU0+ObFq6v cJrdTpTuvuyOHffi2SstwNomGZVs5qqVlCFWniTNk/jgUuMhj9oAZbQ8Hv68Ayrv5veFuiSejK3 cBROncKK2H95QLw== X-Received: by 2002:adf:ed03:: with SMTP id a3mr243854wro.166.1623778072176; Tue, 15 Jun 2021 10:27:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQ1Q2Lt5OY9Jn4cIx8McjG9WIL61GGHQhflZ2Je/+HXtpFNCs94cA/kM0qWs5Em5flhqjNlA== X-Received: by 2002:adf:ed03:: with SMTP id a3mr243836wro.166.1623778071994; Tue, 15 Jun 2021 10:27:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 19:27:40 +0200 Message-Id: <20210615172746.2212998-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Introduce the qcrypto_tls_creds_check_endpoint() helper to access QCryptoTLSCreds internal 'endpoint' field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/tlscreds.h | 13 +++++++++++++ crypto/tlscreds.c | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index d0808e391e9..e45f1e34853 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -65,5 +65,18 @@ struct QCryptoTLSCredsClass { CryptoTLSCredsReload reload; }; =20 +/** + * qcrypto_tls_creds_check_endpoint: + * @creds: pointer to a TLS credentials object + * @endpoint: type of network endpoint that will be using the credentials + * + * Check whether the credentials is setup according to + * the type of @endpoint argument. + * + * Returns true if the credentials is setup for the endpoint, false otherw= ise + */ +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp); =20 #endif /* QCRYPTO_TLSCREDS_H */ diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index b68735f06fe..084ce0d51ae 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -20,6 +20,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi-types-crypto.h" #include "qemu/module.h" #include "tlscredspriv.h" #include "trace.h" @@ -259,6 +260,17 @@ qcrypto_tls_creds_finalize(Object *obj) g_free(creds->priority); } =20 +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp) +{ + if (creds->endpoint !=3D endpoint) { + error_setg(errp, "Expected TLS credentials for a %s endpoint", + QCryptoTLSCredsEndpoint_str(endpoint)); + return false; + } + return true; +} =20 static const TypeInfo qcrypto_tls_creds_info =3D { .parent =3D TYPE_OBJECT, --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778079; cv=none; d=zohomail.com; s=zohoarc; b=QvAJAnlsEA6V5Wbwz0fouD8QcjSPKNUS4ZhvmUOwdu/Hai2DCoF/M+4QcZaHrNfqEQ6b+qeCGSxavbXaVknIMATV16x05yizkv18DIO9L8EWcFU1f7Y1tZ3agVJ+mffL1Acv+/DjaMRzqd9UK3Ar59uVv/6UIDrPXJCcWmP7w5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=WUQdFiF4I9usEoqcWuw9jovz2j6QkV4ypfDpy+yQNBk=; b=F0X1WT52EQ54xdtNZE+PFGIsbwhxnOBfFooYk3ChHDil6kFd+90sPUBMiGDgZkPrNQKUlnvnm/tEcIQVrDD/cNAonR7/95mGRqv4J9hiNSfcvMegjJUHM+Vo6cq0xC3Mh87jd9P+S1kuue0uEqwTfEuMG+Y8lpUdP697IvdJP24= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623778079890670.7882755904644; Tue, 15 Jun 2021 10:27:59 -0700 (PDT) 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-492-RTHr13LfMJOMqP9mnnIIqA-1; Tue, 15 Jun 2021 13:27:57 -0400 Received: by mail-wr1-f70.google.com with SMTP id x9-20020a5d49090000b0290118d8746e06so8956876wrq.10 for ; Tue, 15 Jun 2021 10:27:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q11sm19148396wrx.80.2021.06.15.10.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778078; 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=SJ7+4vBVYBrMqHL5UW3tMcZSk6iq+AywxgTGA0Z9zjeEE3pDTFWIThTbw0q8yZ7QYiHXeo ydaqmkmAuhaHQ1RYOb5UG1c3xscA01nClcZ8Jeo8NEbZwMTdnJPg7jRUFkfuvtE1lOv0kB +NtVqQdG22+w8+xfMGs85Vd2213G05Q= X-MC-Unique: RTHr13LfMJOMqP9mnnIIqA-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=XMpsbPySKQgQGQE2EF6QcjAseBq3UKyXx0VtGaqSS1coQF5PYo+gc3geL2U9wXT130 l65tnni3deED8cCvoMvNMvxLg+4g1EGNoVBxn+7IalZXBRIHDrSGkUGbySI9z/ISOpLr hSKAf5d96jcjj3Gad1tSJVv5bp0ROytvp1s7dgcM8SjZUzxLbzSX1KSsbv0X0Obn4us7 4HhybEEy0/yUKj5ARwt0aO7QEvjcQGTui+RwRdm+ssXwIbkbHLY1wIKXgMt15NQ+mmfN XoZy7M1hMafwR9Xk1vHyXbybmv4hGFMJYFCbn7P+6XYbLM8LM7bgUegx9vN///gzXdC/ Qosg== X-Gm-Message-State: AOAM530toOT6//TClXeijXLNnFFtOfXw0i/xG7GZijisqgtzhJeCi1Bc hkh3QqVyy0y8+2Vhfmi+dnqRjp7k583m9hBJuc64ZuODhcBJuE9yQCnClZi6iduOVWGnE1dOk1D B1yMsX1oO0tShTQ== X-Received: by 2002:adf:f98a:: with SMTP id f10mr206636wrr.143.1623778076479; Tue, 15 Jun 2021 10:27:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD25luI6BaUq5O8xs92TydzlNAefUIpxoQMfdTIII8D2KVHpx/IPA8Cua+hFqqcyFwCS6wWA== X-Received: by 2002:adf:f98a:: with SMTP id f10mr206622wrr.143.1623778076323; Tue, 15 Jun 2021 10:27:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:41 +0200 Message-Id: <20210615172746.2212998-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nbd.c | 6 +++--- blockdev-nbd.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 616f9ae6c4d..b13a33c3d21 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2159,9 +2159,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char = *id, Error **errp) return NULL; } =20 - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { - error_setg(errp, - "Expecting TLS credentials with a client endpoint"); + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_CLIEN= T, + errp)) { return NULL; } object_ref(obj); diff --git a/blockdev-nbd.c b/blockdev-nbd.c index b264620b98d..bdfa7ed3a5a 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -108,9 +108,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *i= d, Error **errp) return NULL; } =20 - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVE= R, + errp)) { return NULL; } object_ref(obj); --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778084; cv=none; d=zohomail.com; s=zohoarc; b=TnvvTdes/Mzo3jc6BV8CTogV8NHaAE8ZCXRIl2Bjfm6qZ5fG9HJz2fq2tSJtqoOEyN6EQN+1du3fxEi+Bn1rfugm1CRyIhsToKlc+8Ytj0tuLuR47JmB23TzZg3bmFKI22myQB675cgXQ2n14Eit9LwmkXm5IqEcrKh0c75vJcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=J6t6NGRe+5wR8qFLbBQvYPci7ZyPNht8Gdv/dlzDcyHUuRvDnsuQzehyO443MqSPQ8J2E7J24vzD9X7OjQ5gqrAK9k95raRdHUpiZc8XBfQaH5sNT5eewXEVhmCl7qDjsjDdLsdguhqzTQfzx+YM2nwJCDnvITjy2+5Bb3LJMUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623778084313424.594304965585; Tue, 15 Jun 2021 10:28:04 -0700 (PDT) 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-53-j2Q0PZHwNde70pgBi_l5bw-1; Tue, 15 Jun 2021 13:28:01 -0400 Received: by mail-wr1-f70.google.com with SMTP id h10-20020a5d688a0000b0290119c2ce2499so8830695wru.19 for ; Tue, 15 Jun 2021 10:28:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m37sm14967725wms.46.2021.06.15.10.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778083; 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=eln/i67BxuJnXjY8IujvAdqPxW16X7WUNxQYgc3w2oeRfo1lbY7srWZxiOzLdEWXPTfyKS eJuv5YeLKwxRXcG1rIUPkv1PCVqF3MJy0tzpKy8KZXFhVp7xIUdKjIMyVFgnC2sdKBOvXA AluC8gHdsJcMVwGAQzn9+ZdRot9PpbY= X-MC-Unique: j2Q0PZHwNde70pgBi_l5bw-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=bwo/wQWjCk1CgbqrPkJvBDKXw94NZ3PgvvxgAMUwibMoAuY4gozt4vovaglabRfzRS 6E/ZIE1ddvDKg76696XkE+aOyRTPSup3026AGnCrlwNomvsJ7YJ7LItaE6RCoOfdtNKC hPfdUJWRy+OTjx0Dbe85PYf8OcnryyyMxP3Eu62CLT2DIbmLc24c7g8YkHOc9jSShQ+O WifqOVYM/ZYu1Ukuoi++IbNzUhMjneWzGtpeXSknrCWG/hXgYzcO+IjY9gsfw9xdUqxN MZQozUjalTOTn787P5/OmBeij4XJL+Sc8e+iac0PZICK5o8xhT9fr8hGnX6yYZRJNJv8 1K4A== X-Gm-Message-State: AOAM530b/eKxLyAY3kursbJbIV3wHgeM18ZASYP0duLnojolQXjGzyQd VoOnKqNHvUEh0Njl783+m4Xs7rVsIKbi16WJcxpFGkNDWskm7BfPPxDkpcfcRLaPgtr5bgu+mjW ATrBxY0OmJ1iRvA== X-Received: by 2002:a5d:47a3:: with SMTP id 3mr197790wrb.255.1623778080664; Tue, 15 Jun 2021 10:28:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZWQpD2c4Cjvl4abx8Z2UJvFh/aEs2JH5oZD/NBzXEh45zCkOPf5rYgZ65z24h/MhU43rUpA== X-Received: by 2002:a5d:47a3:: with SMTP id 3mr197775wrb.255.1623778080553; Tue, 15 Jun 2021 10:28:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:42 +0200 Message-Id: <20210615172746.2212998-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- chardev/char-socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index daa89fe5d1d..d0fb5459638 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1402,18 +1402,12 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } object_ref(OBJECT(s->tls_creds)); - if (is_listen) { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER) { - error_setg(errp, "%s", - "Expected TLS credentials for server endpoint"); - return; - } - } else { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT) { - error_setg(errp, "%s", - "Expected TLS credentials for client endpoint"); - return; - } + if (!qcrypto_tls_creds_check_endpoint(s->tls_creds, + is_listen + ? QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER + : QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT, + errp)) { + return; } } s->tls_authz =3D g_strdup(sock->tls_authz); --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778091; cv=none; d=zohomail.com; s=zohoarc; b=PtmSjPfeqAYVeZTOtjVN24b7lB671dC3dJlpaVpnsLBXVvGj+Wekfn0M8SJXXqdAaA69RxylV88kZy2wmQTdGc1oKLDJRDnReWNteUMi2eZmpVqjkJtW/ArRTCskdXp5iflhS+UFaUVdQ08wcuna/ZZ+dibQ6aX4DEzSm+XZVUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=xExdDe4N+GemsTc4t2mEkAP+Zb7Tj4gyC4bIiLrVVZE=; b=gJCFB/AWclFPL+JT01CeQUTgNRuP/TmKfoZIuPWkXGPAM53PGCKzIyx4gKs0kPQzLg1oM0XgNqAZVhcAKKOQZoi2gPiyHEmOltfROlKH14/YISRIildeTR5tJtVgb6rv7hJxZWQNgGcXm4BSv6GOSW0Ud8JFzVl5qGV+GBgB3NE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623778091253386.8779262518966; Tue, 15 Jun 2021 10:28:11 -0700 (PDT) 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-37-k9zlElplMViJjnnRABJZLQ-1; Tue, 15 Jun 2021 13:28:06 -0400 Received: by mail-wr1-f71.google.com with SMTP id m27-20020a056000025bb0290114d19822edso8929414wrz.21 for ; Tue, 15 Jun 2021 10:28:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id u16sm20706326wru.56.2021.06.15.10.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xExdDe4N+GemsTc4t2mEkAP+Zb7Tj4gyC4bIiLrVVZE=; b=hg4TkYzp2JS3gi3FiM4W1RHazjVQjo7nRjRsHTdqTY4zIj7zvujAk4A1JIyU4cwf/myW3L E7lBmDPEkJRbUUnIDV7THCHE821rSA1djKMHtrLLK5Vf2RCK+Hs6lO6UYu/4tMoRCWMelZ wB5ZWphjNI0tnSTWysy8THbHBvbZY5k= X-MC-Unique: k9zlElplMViJjnnRABJZLQ-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=ropzhJdHbVmvsoj5HbuktMg3Yj4tzJNQOI1h0zRk9RcrXDrVQOo3FnlHg0smj3AoOs PIr3ahiZI6HOkaIfzHn3VQxz16lo8DcvtJEQkxUJy6LWs9+H1xB+gI9gtHYZ2nAHqtbt d5Yw17uh8SBzrha+lz+kw8I2F5aLqkxvxr5cnGnS6zifgp3FIbDdnsjVRd4l3pa0uNjF LSHD3HsN5V4BGxgZH7aDFQdhPLzyoXiSxM6kk4NnIEKo6Igt57+9gTrIAc/+TDaRjwQL lzVGGBCZMg8uGcHFukXRCThxvZZPscP3qkTThqVPyXjdc2vSokZUUycFuw/U7fG6gYDu 8c+w== X-Gm-Message-State: AOAM5313XrBJrtCViiIMe6GjfoHy0cWQ6pa3eGsuoTtAn8TUVl9+vfYW w+gDbYEbGoySWD/ejSkqLGXLwrxF20gOiz+Pz5jd21CthpQ9acizYs8N73hrdUoz5XFMMV/G3hp j9mlakBJn2FfpEg== X-Received: by 2002:a7b:cd0f:: with SMTP id f15mr4969521wmj.177.1623778084855; Tue, 15 Jun 2021 10:28:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnJRJjJQbQOJLvD7kJ7YHhj7k+uyYgO74TNSkMeSILLIblRZBmFHpk6fdZXHKz8lUbeVjQ6g== X-Received: by 2002:a7b:cd0f:: with SMTP id f15mr4969506wmj.177.1623778084738; Tue, 15 Jun 2021 10:28:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 19:27:43 +0200 Message-Id: <20210615172746.2212998-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- migration/tls.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index abb149d8325..ca1ea3bbdd4 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -49,11 +49,7 @@ migration_tls_get_creds(MigrationState *s, s->parameters.tls_creds); return NULL; } - if (ret->endpoint !=3D endpoint) { - error_setg(errp, - "Expected TLS credentials for a %s endpoint", - endpoint =3D=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT ? - "client" : "server"); + if (!qcrypto_tls_creds_check_endpoint(ret, endpoint, errp)) { return NULL; } =20 --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778092; cv=none; d=zohomail.com; s=zohoarc; b=eWD9rBNw13kNThYuNoK5cPyVxOJCBQi1EdgV1RvQIJeoAzUdDMkCmxGZMCmNzI9G9LwCAFVdJTWvyO8ROAe7OwNc9b4Cza/I+JYpzaLELOFhnrHbeHg1netEUr1b66xyGYWQ5Imzh+HLhIR3AJCMdZH5xgYT1NNi2wSYsZ6t7uY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778092; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=SpfvMmDtEHWIbtTtqU5cvD2dvenPniYScyqJywSH4gE=; b=VxiRYTfybT4kxfrlCyfhKxVxbOkqgvU2A/dQxowTjBC4qh23AbnfByWsusFSVO7f1lFQrYo0v1NVeTbVAjDq6sSYJoTfxvDdKso+bIuIZ3H0tyYmXw2oxx8cNZ7UM2A1xbtYi9qGnqmhPIMkF3Rh33k1JanxDRiupbcecuXzQXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623778092757726.4165055062052; Tue, 15 Jun 2021 10:28:12 -0700 (PDT) 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-497-DjBIaDHRPSK7Wxqr4qVKaA-1; Tue, 15 Jun 2021 13:28:10 -0400 Received: by mail-wr1-f71.google.com with SMTP id l2-20020adfe5820000b029011a64161d6aso1014700wrm.6 for ; Tue, 15 Jun 2021 10:28:10 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id z12sm19081845wrw.97.2021.06.15.10.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SpfvMmDtEHWIbtTtqU5cvD2dvenPniYScyqJywSH4gE=; b=HZZB16EfnP1H79b5drh+nE1qmHD+/3pHMod/dXel/LC3V/MvsLg2MC+yo725ja+lz/EjpX cMztllEKryDTiMRYrsyPZv21gHZVyVSRnqkSt0ETy9YIIXYtCLbXd840CWr045+uOV2VxU d8CvtF5QrifH9eaqAiStnPiN4cO15ZA= X-MC-Unique: DjBIaDHRPSK7Wxqr4qVKaA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SpfvMmDtEHWIbtTtqU5cvD2dvenPniYScyqJywSH4gE=; b=dh/d33wYm6ovgBK8Gx05S4DteZxmKkYpAG1D1Ln22cLrf8VvNxqARhxfLqwQknlMWp 5EybwThrWAXqElE6w2GRLwafPzSuEFhqvGKAZiR1jEVv3U91F5IrqoCRwTp9VUybWM2z XHPfixyiAtgy9LB8E841mKrT4ZTUgoWc0P4cNaevRjC8Z1iZkZb1XJupzJFrQZb44Atk /Ug89rtM8O9B5urxQNg4PM2J95ODwL9d/8IJy39mB//sff6C2AoPKdBBrNDWT8n6KqHB LU5Gx429S3w7y7hmszrMK0RhBKMkSb4cl4J4txsSmmDqhoReRCBsrzYVYtbGPiHAG5cc 819A== X-Gm-Message-State: AOAM530Pm6ce2AkQdvBcAzVhDMOEsF7XZ+CGq0VHeU3zsoM3l5oRFZ0v ZMbGaC/ZTRPmzUFodNP+LK6siCSWlv5D0B62X3WfLVJfux2n96kfnE0ZuCsuH4mP4biH2An2ARv W6xMO0wg8soSaWw== X-Received: by 2002:a5d:6409:: with SMTP id z9mr188880wru.279.1623778089278; Tue, 15 Jun 2021 10:28:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVHLV4e8LzitTWeWbAjkMiFGlzn+QBETA5uOOz97EpAsQJRIlzupnkliTcAUMFMd2iLw0+Qg== X-Received: by 2002:a5d:6409:: with SMTP id z9mr188868wru.279.1623778089110; Tue, 15 Jun 2021 10:28:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 19:27:44 +0200 Message-Id: <20210615172746.2212998-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Introduce the qcrypto_tls_creds_check_endpoint() helper to avoid accessing QCryptoTLSCreds internal 'endpoint' field directly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/tlssession.h | 14 ++++++++++++++ crypto/tlssession.c | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index 15b9cef086c..657a2c05521 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -162,6 +162,20 @@ void qcrypto_tls_session_free(QCryptoTLSSession *sess); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoTLSSession, qcrypto_tls_session_free) =20 +/** + * qcrypto_tls_session_check_role: + * @creds: pointer to a TLS credentials object + * @endpoint: role of the TLS session, client or server + * + * Check whether the session object operates according to + * the role of the @endpoint argument. + * + * Returns true if the session is setup for the endpoint role, false other= wise + */ +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp); + /** * qcrypto_tls_session_check_credentials: * @sess: the TLS session object diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 33203e8ca71..4e614b73a28 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -640,3 +640,10 @@ qcrypto_tls_session_get_peer_name(QCryptoTLSSession *s= ess) } =20 #endif + +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint, + Error **errp) +{ + return qcrypto_tls_creds_check_endpoint(creds, endpoint, errp); +} --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778098; cv=none; d=zohomail.com; s=zohoarc; b=hRGhjPbK7+DwugGCnrUJiaIjLHCQynKX8ZhjuMqFRqazVG0QbcD3kHKgUaGy7WR1M5/DCCPzaAh4rZOUAQ1d3RtqZCKZviqlLqfUUeOLp5j6JFmKe+B6c6kbaf22fw+XbRaLNsnTkjT5jLu0oI+QB6beZXZ0kO6NTd+t5yQg8Jo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778098; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=4C/sIPJIJ9x04mkRkFeW0rAiiCZBP7NEySvc0zgDkpg=; b=aj/JpxStATc694//tl9d+Dl3w0N7/Jo9tur5kXOWthSe2aDqZoUP3drGjRaRQ/dyIPShkqG55BIjRUFfLrmdpsB6r/yfFS84CwtFrmEnDmrR+66BRDuq99omulW3lEa6qo7xfkuEg4p4Ucf4YAQWM7EQJq/CrwLjBqzHhQiNa/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16237780988711016.8584036513433; Tue, 15 Jun 2021 10:28:18 -0700 (PDT) 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-86-vEK4BLU5NSyDwNdrBuMI0g-1; Tue, 15 Jun 2021 13:28:14 -0400 Received: by mail-wr1-f71.google.com with SMTP id e9-20020a5d6d090000b0290119e91be97dso8944881wrq.1 for ; Tue, 15 Jun 2021 10:28:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q5sm16204726wmc.0.2021.06.15.10.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778097; 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=SsZRNXpuswMlRY16kJXClBjmNzw/Qst207sdRZFeK3Y8vlPDLmRpaBmnXjzRj/5nSlW0QX Vo+FQmPso+B6/ZMCt6IMeHIf9nS7Laxjqqj1FpkTKxKGbu3O45SvaPa4Gx76WXH2TLk6Sm jX5fg6Q491HNYYldJB32RJIKG+TC04A= X-MC-Unique: vEK4BLU5NSyDwNdrBuMI0g-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=aZN4HbCBE40XfRQPK4qASAPF4ISd55K0ws+B+O1fA5i6vm/SUdXpJKOcIM5GBZzzjr F/Xfrapo1qqfJnacom/68VIhDs5oDUCoIdGt7Ji+GD8vgkDQl+kSYufwSirGamJ7dFJR s66hBUH3OjF89U/oLAjFjCsmYU5+Kp4hNAY6TwJCH9cu7C4dOHS+wdo1Ndn5zUrt/c4R 4EJFZVU1Fp019FQqd17rSWjsmNakKy92cNgj1pGCH0zc7lHkExUGbtr9prHR7lzt8Ra+ SnP3WR89/CLFXGVv77lquFTBEWbMc+u+wpulsqC1vC70KSO3GzigQNGK9hUNpJAr/l9v wxow== X-Gm-Message-State: AOAM530/iKPt2t/12tqvWRRO3mGNxHIniQ0kWudI2wLf02RTgOtidd+7 35VGIw/vXquJgV5zrN8PK0zqrj84dRUFP93QUN0D4Rq5NL3o5fLcBC43tr/oXI19XPobr1r07xc NKs/KPZsV0X0CtA== X-Received: by 2002:a7b:c206:: with SMTP id x6mr6480309wmi.26.1623778093489; Tue, 15 Jun 2021 10:28:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVhE4snd4Wo8U1+kBEFMYEhRwTltYtN0lJS/a+i6yHGkCF7q/HmdMzhy+UaDLJg+8hYMIWkw== X-Received: by 2002:a7b:c206:: with SMTP id x6mr6480292wmi.26.1623778093378; Tue, 15 Jun 2021 10:28:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Date: Tue, 15 Jun 2021 19:27:45 +0200 Message-Id: <20210615172746.2212998-7-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_session_check_role() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/vnc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index b3d4d7b9a5f..c7c8454b873 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -4080,9 +4080,9 @@ void vnc_display_open(const char *id, Error **errp) } object_ref(OBJECT(vd->tlscreds)); =20 - if (vd->tlscreds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)= { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); + if (!qcrypto_tls_session_check_role(vd->tlscreds, + QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER, + errp)) { goto fail; } } --=20 2.31.1 From nobody Wed May 22 00:48:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623778119; cv=none; d=zohomail.com; s=zohoarc; b=czxRRN9L61UIx7SklzNnSjj54JxWnYYhp/hgajrH8oTcNpI5V4a6CloClq01s/JAZUs8+THU40LFTczUQkERPCOAUbKSCKhJQuoCAr9WpODkPDPsC5pHstZKDkary0FSL1KW8+6zT81e468eybev+jf0xXX0VTJuVm/SAznwBLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623778119; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=aAuZPOlW6VzVKtRyjoHamnrfWoPuwFjMMys3nVGUYlU=; b=KquGgqpo5/Wzpf+2Fn5qe7sVhVxgaNbfljCxgSzL9yVeq3VG38jpVs+bz/1lFVpoFCWWPlE7z0yPTalYkLRuahuwrN/CImQrZR0t3vZTJEWEsx4Xo4bMkmX4rM5i6nVYtcI3Yx732bfWSgsmlvAANGxp2nVGf3xdli833bM/pWM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623778119921614.2869825448856; Tue, 15 Jun 2021 10:28:39 -0700 (PDT) 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-236-wlpLTdd0OQGJ7S3nNGyOtg-1; Tue, 15 Jun 2021 13:28:19 -0400 Received: by mail-wr1-f69.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so8945077wrc.16 for ; Tue, 15 Jun 2021 10:28:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q19sm2640573wmc.44.2021.06.15.10.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 10:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623778118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAuZPOlW6VzVKtRyjoHamnrfWoPuwFjMMys3nVGUYlU=; b=aS76VO+etFB7Z6NOcHRfnWXrTL8fyJc1lrZPemkgFBsuH45sk0E/nK7GqqwN0OrxNgceuK ljjw+gV9j20Nae5jcU7QwIgdEkRXqCKJMM/Hmvi1Dzz6Fe9CToOd2YcQszcVGGOoeDTWwK 56d31T/xpQxSmnj+OzEBKFkIuY6rJ8k= X-MC-Unique: wlpLTdd0OQGJ7S3nNGyOtg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aAuZPOlW6VzVKtRyjoHamnrfWoPuwFjMMys3nVGUYlU=; b=PRuQOD56WGl06ryJ51NZG4jtP4WbGBZ+GxFqzd4hNKnvkk1cgkT1VsDDc5VfuOV3lx D2AZmU4MMqhY4B/vmNcIa9EGFU5dDz32h5EuPhmGcFCXNphUzC0av5KES9LFRrPcDyUg 32bXdeoYobi1eHgpL83xAxxuwpTwppyCuUoWN12n5PzKT+ByxfroexuVSqvu77GAAoEd XewZVMITL7DbYkwFUeLnuBs6w0vxwTJFjk3ePNH43TG+N7X7CJBOcI7XCi+g2IJP9VtT krkyXKcxGW9ZkaCA3xoy1L7COJi4zv6Tu47jT5AqqgKwcFskCgUJXi5RoQM3JAzUVw86 Eovw== X-Gm-Message-State: AOAM533GCX/mKxmofYzIro5ub38k7Xf7cx1lGvyukr6GMwaWdS17VnaK 3OFfDlEoGy+0UqAZ7hKuHAuCCLTDeGP/oOygDB/8aaUeOhQx8j8oy3jQE6ZM0BLEnPX8tIes3Ie 4MIGRUn7Gcm66Ew== X-Received: by 2002:a1c:e354:: with SMTP id a81mr436844wmh.98.1623778097832; Tue, 15 Jun 2021 10:28:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7lLXo76/KRB/SYLiJjr54W8dkZ+CtwIsL7UmW7SHun+dHlloLxIed3oAw0gFzKszkMsiRpQ== X-Received: by 2002:a1c:e354:: with SMTP id a81mr436825wmh.98.1623778097654; Tue, 15 Jun 2021 10:28:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Subject: [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Date: Tue, 15 Jun 2021 19:27:46 +0200 Message-Id: <20210615172746.2212998-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com> References: <20210615172746.2212998-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Code consuming the "crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the "tlscredspriv.h" private header (only accessible by implementations). The public headers (in include/) still forward-declare the structures typedef. This solves a bug introduced by commit 7de2e856533 which made migration/qemu-file-channel.c include "io/channel-tls.h", itself sometime depends on GNUTLS, leading to build failure on OSX: [2/35] Compiling C object libmigration.fa.p/migration_qemu-file-channel.c= .o FAILED: libmigration.fa.p/migration_qemu-file-channel.c.o cc -Ilibmigration.fa.p -I. -I.. -Iqapi [ ... ] -o libmigration.fa.p/migra= tion_qemu-file-channel.c.o -c ../migration/qemu-file-channel.c In file included from ../migration/qemu-file-channel.c:29: In file included from include/io/channel-tls.h:26: In file included from include/crypto/tlssession.h:24: include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not = found #include ^~~~~~~~~~~~~~~~~ 1 error generated. Reported-by: Stefan Weil Suggested-by: Daniel P. Berrang=C3=A9 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407 Fixes: 7de2e856533 ("yank: Unregister function when using TLS migration") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- crypto/tlscredspriv.h | 45 ++++++++++++++++++++++++++++++ include/crypto/tls-cipher-suites.h | 6 ---- include/crypto/tlscreds.h | 16 ----------- include/crypto/tlscredsanon.h | 12 -------- include/crypto/tlscredspsk.h | 12 -------- include/crypto/tlscredsx509.h | 10 ------- crypto/tls-cipher-suites.c | 7 +++++ crypto/tlscredsanon.c | 3 +- crypto/tlscredspsk.c | 3 +- crypto/tlscredsx509.c | 4 +-- crypto/tlssession.c | 1 + 11 files changed, 58 insertions(+), 61 deletions(-) diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h index 39f1a91c413..df9815a2863 100644 --- a/crypto/tlscredspriv.h +++ b/crypto/tlscredspriv.h @@ -23,6 +23,51 @@ =20 #include "crypto/tlscreds.h" =20 +#ifdef CONFIG_GNUTLS +#include +#endif + +struct QCryptoTLSCreds { + Object parent_obj; + char *dir; + QCryptoTLSCredsEndpoint endpoint; +#ifdef CONFIG_GNUTLS + gnutls_dh_params_t dh_params; +#endif + bool verifyPeer; + char *priority; +}; + +struct QCryptoTLSCredsAnon { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + union { + gnutls_anon_server_credentials_t server; + gnutls_anon_client_credentials_t client; + } data; +#endif +}; + +struct QCryptoTLSCredsPSK { + QCryptoTLSCreds parent_obj; + char *username; +#ifdef CONFIG_GNUTLS + union { + gnutls_psk_server_credentials_t server; + gnutls_psk_client_credentials_t client; + } data; +#endif +}; + +struct QCryptoTLSCredsX509 { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + gnutls_certificate_credentials_t data; +#endif + bool sanityCheck; + char *passwordid; +}; + #ifdef CONFIG_GNUTLS =20 int qcrypto_tls_creds_get_path(QCryptoTLSCreds *creds, diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher= -suites.h index bb9ee53e03a..7eb1b76122d 100644 --- a/include/crypto/tls-cipher-suites.h +++ b/include/crypto/tls-cipher-suites.h @@ -19,12 +19,6 @@ typedef struct QCryptoTLSCipherSuites QCryptoTLSCipherSu= ites; DECLARE_INSTANCE_CHECKER(QCryptoTLSCipherSuites, QCRYPTO_TLS_CIPHER_SUITES, TYPE_QCRYPTO_TLS_CIPHER_SUITES) =20 -struct QCryptoTLSCipherSuites { - /* */ - QCryptoTLSCreds parent_obj; - /* */ -}; - /** * qcrypto_tls_cipher_suites_get_data: * @obj: pointer to a TLS cipher suites object diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index e45f1e34853..41b8939d417 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -24,10 +24,6 @@ #include "qapi/qapi-types-crypto.h" #include "qom/object.h" =20 -#ifdef CONFIG_GNUTLS -#include -#endif - #define TYPE_QCRYPTO_TLS_CREDS "tls-creds" typedef struct QCryptoTLSCreds QCryptoTLSCreds; typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass; @@ -48,18 +44,6 @@ typedef bool (*CryptoTLSCredsReload)(QCryptoTLSCreds *, = Error **); * certificate credentials. */ =20 -struct QCryptoTLSCreds { - Object parent_obj; - char *dir; - QCryptoTLSCredsEndpoint endpoint; -#ifdef CONFIG_GNUTLS - gnutls_dh_params_t dh_params; -#endif - bool verifyPeer; - char *priority; -}; - - struct QCryptoTLSCredsClass { ObjectClass parent_class; CryptoTLSCredsReload reload; diff --git a/include/crypto/tlscredsanon.h b/include/crypto/tlscredsanon.h index 3f464a38095..bd3023f9ea7 100644 --- a/include/crypto/tlscredsanon.h +++ b/include/crypto/tlscredsanon.h @@ -92,18 +92,6 @@ typedef struct QCryptoTLSCredsAnonClass QCryptoTLSCredsA= nonClass; * */ =20 - -struct QCryptoTLSCredsAnon { - QCryptoTLSCreds parent_obj; -#ifdef CONFIG_GNUTLS - union { - gnutls_anon_server_credentials_t server; - gnutls_anon_client_credentials_t client; - } data; -#endif -}; - - struct QCryptoTLSCredsAnonClass { QCryptoTLSCredsClass parent_class; }; diff --git a/include/crypto/tlscredspsk.h b/include/crypto/tlscredspsk.h index d7e6bdb5edf..bcd07dc4f62 100644 --- a/include/crypto/tlscredspsk.h +++ b/include/crypto/tlscredspsk.h @@ -87,18 +87,6 @@ typedef struct QCryptoTLSCredsPSKClass QCryptoTLSCredsPS= KClass; * The PSK file can be created and managed using psktool. */ =20 -struct QCryptoTLSCredsPSK { - QCryptoTLSCreds parent_obj; - char *username; -#ifdef CONFIG_GNUTLS - union { - gnutls_psk_server_credentials_t server; - gnutls_psk_client_credentials_t client; - } data; -#endif -}; - - struct QCryptoTLSCredsPSKClass { QCryptoTLSCredsClass parent_class; }; diff --git a/include/crypto/tlscredsx509.h b/include/crypto/tlscredsx509.h index c6d89b78819..c4daba21a6b 100644 --- a/include/crypto/tlscredsx509.h +++ b/include/crypto/tlscredsx509.h @@ -96,16 +96,6 @@ typedef struct QCryptoTLSCredsX509Class QCryptoTLSCredsX= 509Class; * */ =20 -struct QCryptoTLSCredsX509 { - QCryptoTLSCreds parent_obj; -#ifdef CONFIG_GNUTLS - gnutls_certificate_credentials_t data; -#endif - bool sanityCheck; - char *passwordid; -}; - - struct QCryptoTLSCredsX509Class { QCryptoTLSCredsClass parent_class; }; diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index 55fb5f7c19d..5e4f5974645 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -14,8 +14,15 @@ #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" #include "hw/nvram/fw_cfg.h" +#include "tlscredspriv.h" #include "trace.h" =20 +struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + /* */ +}; + /* * IANA registered TLS ciphers: * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tl= s-parameters-4 diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index bea5f76c55d..2675b1af8f8 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -26,9 +26,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS =20 +#include + =20 static int qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds, diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index f5a31108d15..820719c5e84 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -26,9 +26,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS =20 +#include + static int lookup_key(const char *pskfile, const char *username, gnutls_datum_t *key, Error **errp) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index d9d6f4421e5..44dbe0dc819 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -27,12 +27,10 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 - #ifdef CONFIG_GNUTLS - +#include #include =20 - static int qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert, const char *certFile, diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 4e614b73a28..e5d5675ef30 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -25,6 +25,7 @@ #include "crypto/tlscredsx509.h" #include "qapi/error.h" #include "authz/base.h" +#include "tlscredspriv.h" #include "trace.h" =20 #ifdef CONFIG_GNUTLS --=20 2.31.1