From patchwork Tue Jun 15 16:47:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09633C48BDF for ; Tue, 15 Jun 2021 16:51:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF4146128C for ; Tue, 15 Jun 2021 16:51:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF4146128C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCI8-0003k3-Tp for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEM-0003s3-Bd for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEK-0003Ju-Qo for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775680; 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=sZSreQAzlorV+BiqdTF8qV7SiteVC4PUhE4rRujGY74=; b=GQF+5eCI24ujWFhuc0h4w2CBl13RHT2vVVAzN1bmLwOvqM/OrkKZ6pIrLPpE5JnWuMyi60 X4UXnZ5ASSsZl+w4oaRYcnvtAmz+gwZLVGkJ7YtBQKjRLkZkTwZ2pKpslvKArWZXHfVdXu JjGrznfDGi8KmracZ/o8waMSHaI6Yns= 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-218-k21D8YSSNYOnaQz2VDUJEA-1; Tue, 15 Jun 2021 12:47:58 -0400 X-MC-Unique: k21D8YSSNYOnaQz2VDUJEA-1 Received: by mail-wr1-f69.google.com with SMTP id y12-20020adffa4c0000b0290119c11bd29eso6229169wrr.2 for ; Tue, 15 Jun 2021 09:47:58 -0700 (PDT) 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=sZSreQAzlorV+BiqdTF8qV7SiteVC4PUhE4rRujGY74=; b=e01UcLf863ac0v0CckPsJsYOSUXthZZ1b0oHEJE1ntHbEqfdw9WGAcBJn12y7mLnXo 1KP/sGiHgCOD2RiS5p+lxhKA/ELIVNTZB0iVsgGx6Nl5h1F0tB5RPY4c6hckzeifx6zE oyDLGvoQ3COA8SJch4JfIw4EDqQQQUmJ6zdeOo6CbBHG2PAMEEcmBwox6icM77ieAqfH 3J7l3aH9vDXRfqo6CGfIB4U7fPh0jDHZmvVE4E7fxvD6dEeApfEGgxZy6klI2glZve1h 5LhZSE08qOy8eBCHSK+NRZLLFLQYMSR6tkfhpZiT2fWUHs3VSKGl+teaASolgGU+7fPc xJDQ== X-Gm-Message-State: AOAM533OlJavHhYEf2fZxUa0HwU0Yk8b5HaYUR5VYppmz65BNi2SBjjE s9f1Du9gOdIgfsIcrwXaTddALYILIYrVbJS9+uUeP2zzV0pg0+mvjbTWaZJ64Vmtn9aB00cnYyz H/ICy3Jw6iblD/KNNdvOkwQqmzMYKnhcGPmW5bXqj11jC6Cl5Ef5UGGkolGzUTLTk X-Received: by 2002:a1c:b306:: with SMTP id c6mr6302521wmf.37.1623775677064; Tue, 15 Jun 2021 09:47:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeCwSkAa0ZyxyT73LtF8vv5+938GqB+bjxN87rCVJTPRDHZC/VhFkGzh8Zq2AsDeqmwbQGQA== X-Received: by 2002:a1c:b306:: with SMTP id c6mr6302504wmf.37.1623775676920; Tue, 15 Jun 2021 09:47:56 -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 x7sm2044746wrn.3.2021.06.15.09.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:47:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 18:47:45 +0200 Message-Id: <20210615164751.2192807-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce the qcrypto_tls_creds_check_endpoint() helper to access QCryptoTLSCreds internal 'endpoint' field. Signed-off-by: Philippe Mathieu-Daudé --- include/crypto/tlscreds.h | 12 ++++++++++++ crypto/tlscreds.c | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index d0808e391e9..eb9d5e75a84 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -65,5 +65,17 @@ struct QCryptoTLSCredsClass { CryptoTLSCredsReload reload; }; +/** + * 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 otherwise + */ +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint); #endif /* QCRYPTO_TLSCREDS_H */ diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index b68735f06fe..f9f45e12db1 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -259,6 +259,11 @@ qcrypto_tls_creds_finalize(Object *obj) g_free(creds->priority); } +bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint) +{ + return creds->endpoint == endpoint; +} static const TypeInfo qcrypto_tls_creds_info = { .parent = TYPE_OBJECT, From patchwork Tue Jun 15 16:47:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDA67C48BE5 for ; Tue, 15 Jun 2021 16:49:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7703C6191C for ; Tue, 15 Jun 2021 16:49:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7703C6191C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCFb-0007Dn-Kq for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCET-00049Y-0C for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEQ-0003Nf-IS for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775685; 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=9Fw1kotC1lVH/taEQixoRs/erwkjLN4mt+GwVN07Ops=; b=KjEkXdXS4k0DoL29izYrr7dhMvC/N2Vum5P2eTimpjPHFvIPVVf3u9cQGvXHwAFmUxpGR0 Ht5uk20PPUgc8emcqhhcz2fNSxy2xrwQ32rtYt3S6Ca6oeA8O0yXZuQPWmF+iE1Sd7mM/k 3IWficAn/eSE9Nxthv6bDXAIiaT1T3Q= 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-181-0rpE6DdGP9O3zg_keUTPPw-1; Tue, 15 Jun 2021 12:48:02 -0400 X-MC-Unique: 0rpE6DdGP9O3zg_keUTPPw-1 Received: by mail-wr1-f71.google.com with SMTP id f22-20020a5d58f60000b029011634e39889so8847397wrd.7 for ; Tue, 15 Jun 2021 09:48:02 -0700 (PDT) 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=9Fw1kotC1lVH/taEQixoRs/erwkjLN4mt+GwVN07Ops=; b=CASkx0vfq4GkpsKepkcKK6oGN4q1yYS853fZy4NT7u/Dm7keBzgE8svRFOc+YKzYiI oPI5HgTw5ecrCZtNpQeuilpdarIFulTgdjGzSl+GNc7gbxGhirXZ0/xKgsALB1EXe0Jn QfXRP8ChfTDUpuHjdZS6ixjqj7UCM78z/rfHmutFqDJ1WtJBk/HeTm7uZyJ/Y1Md3Fx/ Lkp64BmEXQ73l6aJh6mpglnSm7pzOR2RRmNu1r1o3M4Y59bhISTXdo0Gg1md1DDjDdee JaOxO06lQpqlxUuYzg0r4CpOmrvX527LqdDwyNXdeG2Tdg0PIftPq7HKKq9nhnt/hX0o wY/A== X-Gm-Message-State: AOAM532acCfTTxjOWl723DbCa9TRABVfkCfJfG/swkZNBaneIStrg/JK srNMk2GadSmIDjuvB1JLnxNDxzowW3y/SbQxKrsa4ivL4X4Dln7tGHJgQoft/9aPbOMLxoX4CeP dxKPr1kJqIu/0SRc0g+n1rgvZrRAbHYjJhLhAWnMmN5FOzGd31A8YhxKADzNuUXAL X-Received: by 2002:a05:600c:4106:: with SMTP id j6mr251029wmi.76.1623775681387; Tue, 15 Jun 2021 09:48:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUdxFiBydGXgexDzux/ZY5de2M9nyzL02rD7TQ+EjluHtFmKVL3qJUuuiGC6v/XIK1WMGarA== X-Received: by 2002:a05:600c:4106:: with SMTP id j6mr251010wmi.76.1623775681231; Tue, 15 Jun 2021 09:48:01 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g17sm19651154wrp.61.2021.06.15.09.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 18:47:46 +0200 Message-Id: <20210615164751.2192807-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daudé --- block/nbd.c | 3 ++- blockdev-nbd.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 616f9ae6c4d..c3523ebf785 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2159,7 +2159,8 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) return NULL; } - if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT)) { error_setg(errp, "Expecting TLS credentials with a client endpoint"); return NULL; diff --git a/blockdev-nbd.c b/blockdev-nbd.c index b264620b98d..b6023052ac7 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -108,7 +108,8 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) return NULL; } - if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { + if (!qcrypto_tls_creds_check_endpoint(creds, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)) { error_setg(errp, "Expecting TLS credentials with a server endpoint"); return NULL; From patchwork Tue Jun 15 16:47:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC1AFC48BE8 for ; Tue, 15 Jun 2021 16:54:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5994461919 for ; Tue, 15 Jun 2021 16:54:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5994461919 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCKc-0001pV-Ei for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:54:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEV-0004H8-5Q for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55228) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCES-0003PF-Pl for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775688; 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=0mRh7tvlatkuMCVBMr+kWyLCBcff/Kp/cdfu0ZIMjj4=; b=a1UVpKd2J9ew3lmpiQwOYDMUxObRruCwWCqEuOyTg0gfsOzmz9Y++hgPtF2mzVZ0c2fhHD fm08cB7wXwzcDMU+MyQ6qfA0V9cbrJhlAOl3nK4dhN20N4k8dzu/cdawfPzQbQzRXl/Mem d5R8x61cooV+BPjsEbJ9UD6hp5WBr+Y= 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-129-vi3umdB9NhuzVoPgd-wwfw-1; Tue, 15 Jun 2021 12:48:06 -0400 X-MC-Unique: vi3umdB9NhuzVoPgd-wwfw-1 Received: by mail-wr1-f72.google.com with SMTP id t10-20020a5d49ca0000b029011a61d5c96bso1221883wrs.11 for ; Tue, 15 Jun 2021 09:48:06 -0700 (PDT) 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=0mRh7tvlatkuMCVBMr+kWyLCBcff/Kp/cdfu0ZIMjj4=; b=jpXE1cJvp1mNZH9ZGejyde5Bz8SAycKibY6N/FyhLALhiASFDsTo+8hAxDFemCKBWW gmg0O3Uz/hjta0XyWI9haTvY5QLBSGPbI7GccRvXo5gdHOS7z9sTs1tQy/v9xW02paUt 4BteoYWuajtnCF5DxguedWIN1sUfeRBKjK9s5A5ic6eC2uyYZ5SQMifwIUVgFTT2C1O/ h8c9h1WUuI9vWlylUDKlJccb3On2NtCMb3QbtDb1jDPAev40ngtp+X7b8bcl4cW1JvOl jVFCpmEsYUkTkKDn9KwN7v511sovge7CmB6K7oUd/hxSN8gdcPAbc9R16k2JtrLX4hks EbGA== X-Gm-Message-State: AOAM533tQwj+kA2sV2+NTk9eUbr8B8Kkddh6FBZJ2ujW+IWuThj2xJHF BzP6emBC0PS/X4F+0szW6XFVjU1aliqainE9h3y6LrxIeTOoXnfQMTueQ+iQvWEqoGK4xDWO7AP rP4z6dpmhDW9pcsQgIUwVwd/e+2WioqSQ3GhuszgeRtwANgsleakoWZLhmRLqziwH X-Received: by 2002:a5d:6d8c:: with SMTP id l12mr5847wrs.189.1623775685681; Tue, 15 Jun 2021 09:48:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUaqQvrvO6xkBnzLpZrDbpy/Ce/yfzmll5b3Wc17Qe9fv8icSjn7D4TWXDtcYK59AtzNKiEA== X-Received: by 2002:a5d:6d8c:: with SMTP id l12mr5817wrs.189.1623775685454; Tue, 15 Jun 2021 09:48:05 -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 m3sm20139429wrr.32.2021.06.15.09.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 18:47:47 +0200 Message-Id: <20210615164751.2192807-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daudé --- chardev/char-socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index daa89fe5d1d..fe6b1fe2110 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1403,13 +1403,15 @@ static void qmp_chardev_open_socket(Chardev *chr, } object_ref(OBJECT(s->tls_creds)); if (is_listen) { - if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { + if (!qcrypto_tls_creds_check_endpoint(s->tls_creds, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)) { error_setg(errp, "%s", "Expected TLS credentials for server endpoint"); return; } } else { - if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { + if (!qcrypto_tls_creds_check_endpoint(s->tls_creds, + QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT)) { error_setg(errp, "%s", "Expected TLS credentials for client endpoint"); return; From patchwork Tue Jun 15 16:47:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51A5BC48BDF for ; Tue, 15 Jun 2021 16:49:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E63966191C for ; Tue, 15 Jun 2021 16:49:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E63966191C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCFb-0007E2-WA for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEb-0004WK-6L for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEY-0003SN-Je for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775692; 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=7BqsQDz0Sfnly4OiZgv7jL0lDpFa+oyKa2e4dBvkrA4=; b=DpJZO7EhyNGE3yCz56clD5NXI4bJ+V7NLL095EDbuwUZ2baCxVO9pOfr4BKFkTA4+TGYFX 5QuEWLKgj7t60esrCFa80MZ+3YhZCrmj7dsdVrIkBdwRqyFuymnWmC9Fe4WOoq0VlLooTO 6ElIYc6e1ZYY4MYuN/nM7eF2xgaTbRg= 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-397-5DPgoFuAMPCNyhglD3ogIg-1; Tue, 15 Jun 2021 12:48:11 -0400 X-MC-Unique: 5DPgoFuAMPCNyhglD3ogIg-1 Received: by mail-wm1-f71.google.com with SMTP id z19-20020a7bc1530000b02901ab5fafdcb4so3297264wmi.0 for ; Tue, 15 Jun 2021 09:48:11 -0700 (PDT) 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=7BqsQDz0Sfnly4OiZgv7jL0lDpFa+oyKa2e4dBvkrA4=; b=L+tS1aLJMYruwMjw2oqCvBDFJaQjhs+CuiwlNToiGKC6Ci7OUPlTwx8MGwMbt9FRa+ qv8aYH8SF7h465FP7fslv0bfs8iSJ0Cr+u1qVhPtw5H9JQNNgwdBvRWy7hy048yqR+dh arOsXEljbl3GiE5srisVwlJ4XhAPdePFBuuNgp1uwnizCdqaG2rb3BAkIWeZMtC8VuUc iDq9gD5CoTjM0Oq4K+OmfeTy2tEkVGGHxa36bD3iDFtc7oUI/c2QkXBPyDKUQDt+Ng4o anCfnWOXg/q8LjIBb9sVDhjR349R/4d7ih70vlxNRj5nImxPUA9Fmb00aB6F1QICZLyG sBVA== X-Gm-Message-State: AOAM531n49eAORiEHyXK3zv/XBXpeiJJzPr0GhgkI5gSa4YpQ/O8xXvi QYIwnNq7fOWxEddhjj4Qlitr7pSuLu4VbkmUopK0ZWuAOQ7izsrVGbivcwuMiX4WJyj6JK3zyuV sma+Libul7hmb1ShXrNyU/mBOxKvJF89urA0rbbQSa/RaZoXzS9OXWWnYSUz4Feyq X-Received: by 2002:a1c:9dcd:: with SMTP id g196mr6338958wme.135.1623775689856; Tue, 15 Jun 2021 09:48:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJys79T78NUEFB1tqsmG2GoczJQb0FsKxtCJ4pxWC3AkhosUPN2HkNHIJfNiuXQ7WoSb2qQ12Q== X-Received: by 2002:a1c:9dcd:: with SMTP id g196mr6338931wme.135.1623775689682; Tue, 15 Jun 2021 09:48:09 -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 g17sm24459430wrh.72.2021.06.15.09.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint() Date: Tue, 15 Jun 2021 18:47:48 +0200 Message-Id: <20210615164751.2192807-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daudé --- migration/tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/tls.c b/migration/tls.c index abb149d8325..ee49ecba484 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -49,7 +49,7 @@ migration_tls_get_creds(MigrationState *s, s->parameters.tls_creds); return NULL; } - if (ret->endpoint != endpoint) { + if (!qcrypto_tls_creds_check_endpoint(ret, endpoint)) { error_setg(errp, "Expected TLS credentials for a %s endpoint", endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT ? From patchwork Tue Jun 15 16:47:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCABEC48BDF for ; Tue, 15 Jun 2021 16:50:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BC4961921 for ; Tue, 15 Jun 2021 16:50:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BC4961921 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCGw-0001sJ-JL for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:50:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEd-0004bX-1w for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEb-0003UD-24 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775696; 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=H2lT3CjVv1bZEYZLmYC8EbTX4byvBsRg1m9eoqp1Vsg=; b=H/7FSJGQcCRf3hoJG0tldK3xfPdKoRx5zMWTpNAt57yxlx+WfYSYvRQDDCDNjJEr9xbEcP YQFYjWzWZYZJ4Vm2SgCmzewqqs/0s26lwIoV/wIMpF8YJrLOwJSgSOr97tZZ/fPZUTohPQ aFAOiaMUR3o2ACr4ZScLDILJateYipE= 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-581-6SGLh2rhPem4S4fIu699cA-1; Tue, 15 Jun 2021 12:48:15 -0400 X-MC-Unique: 6SGLh2rhPem4S4fIu699cA-1 Received: by mail-wr1-f72.google.com with SMTP id z13-20020adfec8d0000b0290114cc6b21c4so8839183wrn.22 for ; Tue, 15 Jun 2021 09:48:15 -0700 (PDT) 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=H2lT3CjVv1bZEYZLmYC8EbTX4byvBsRg1m9eoqp1Vsg=; b=SQoXpKCytTKc8HfpPYUVHxL18b+RAA6ZjWPa8h7p7ie84uKFVzXdrCWUROWGgwqbeX Kc7OnW7Ev7UTeK6L2FkIUjHnDXYeu4s0i/O4g+c2v1ZJATdk/dfBsCwg0DncF9KBtqMs k5Li/48ZM78sHEAui/sa6OKZ9H9t16RxPHLhrT9Vx3cmST8y1M8Yzo+BciB3t8o/UzV+ lfnlFZ6wkPnu7B2avW6R9VTYuo5/nhbWIAJGQ/dj/6nH7sm6uC3lvh4LK6U9PukgXjX5 KMiUcgCyUBghipwXQ3QM4XPNAwOVcSz1e9sGh4gVkyW/Q2y/PIC0f9mhaahplNTFefJE 8d5Q== X-Gm-Message-State: AOAM53245tOQmAGMBKO3/3+KprovJkClggIGbdE8CNqQEo8Rtxo/PXcl at+vxUcAFESzYYEmbg4s3fZ9U+nfacD2cQHC0je/LLoqfhGBi7FM98m4vLXLhrgEzqItY4dorWj ycLQPV9OppuwWFy0ArFMg6ciPWHLKuGeNpVZoDpfy4rCPOJuTI45U5gECMt3xLolW X-Received: by 2002:a7b:c2e8:: with SMTP id e8mr216583wmk.41.1623775694188; Tue, 15 Jun 2021 09:48:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEwKCYqY64oLIugwpvHf3zoOZHS/DX/LPpAuBYUHphZIRhj4cICWSu6bOS6PfxVPZoREgGDQ== X-Received: by 2002:a7b:c2e8:: with SMTP id e8mr216553wmk.41.1623775693979; Tue, 15 Jun 2021 09:48:13 -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 b11sm4630620wrf.43.2021.06.15.09.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Date: Tue, 15 Jun 2021 18:47:49 +0200 Message-Id: <20210615164751.2192807-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce the qcrypto_tls_creds_check_endpoint() helper to avoid accessing QCryptoTLSCreds internal 'endpoint' field directly. Signed-off-by: Philippe Mathieu-Daudé --- include/crypto/tlssession.h | 13 +++++++++++++ crypto/tlssession.c | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index 15b9cef086c..fdf7578609c 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -162,6 +162,19 @@ void qcrypto_tls_session_free(QCryptoTLSSession *sess); G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoTLSSession, qcrypto_tls_session_free) +/** + * 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 otherwise + */ +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint); + /** * qcrypto_tls_session_check_credentials: * @sess: the TLS session object diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 33203e8ca71..cf2781363fe 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -640,3 +640,9 @@ qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess) } #endif + +bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds, + QCryptoTLSCredsEndpoint endpoint) +{ + return qcrypto_tls_creds_check_endpoint(creds, endpoint); +} From patchwork Tue Jun 15 16:47:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0A85C48BDF for ; Tue, 15 Jun 2021 16:52:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7813B6157E for ; Tue, 15 Jun 2021 16:52:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7813B6157E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCIf-0004oA-Ij for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEk-00053k-9i for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEi-0003ZA-RR for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775704; 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=rBGmlWWdNqhJONAA1i8jAn+bT/MVszHhvaHYRQx6bnU=; b=HA2Cd3PLZm1jUnZtLz20cGToJv4YQkiNfRCm2OVWZ5HlAXbSlezAeTY0NTtHz2tGkRB2XX 49B+sweqpHC05gkZQZ1uh+Bo0umaJme8H+aY9oEiWT/rd0mx+1MO9//dJClDXhRPWeROLI 4NqIDdq0zB+ad2QDULczIZ2nJG3mfaw= 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-250-C-1esjMAOa-kmG_MNkp7hg-1; Tue, 15 Jun 2021 12:48:19 -0400 X-MC-Unique: C-1esjMAOa-kmG_MNkp7hg-1 Received: by mail-wm1-f69.google.com with SMTP id k5-20020a05600c1c85b02901ac8b854c50so1753529wms.5 for ; Tue, 15 Jun 2021 09:48:19 -0700 (PDT) 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=rBGmlWWdNqhJONAA1i8jAn+bT/MVszHhvaHYRQx6bnU=; b=PDBEcAHxMFwwXIEqh3n+O4aHlZf4pp75q5akViPrUdcqxQ6HNsvmCK5l9jTNG568QS ZJ7rb2XKEnSz/dkdT2s2Brx4RFdAcdn8PDfQGmWpiMup/MszUkVfAT3hPpfwDDbkF+ts +DTRPHhuyNnf7yZZnwklCykaOeQSpBEetEXZpaU8XFUkvmudSHsftV/glhx/mOycy/qW BXEUOky/w1227zR80vTVfooPsA/3J3A8Zv/H2sHvpkAKNySEFETjUelIDCtUdwMwWuVS qtrreMghEjAXJhtv1sQxWqNH5Dv7hb7u/GzI000SkNASbHqBC4HyS4HM2zz3DMh2scN5 CaVg== X-Gm-Message-State: AOAM533rCZC4FXyVcbpjfVCX5Ohi0jY+kVjwXTXFraUjLNcIBlJUPOLh RmP8znfGdEVAHbiv/poFlx+u19I9c1WxnXvdz/zIWPWsJDXj/X1Tevea9VHeB7zr0MCOwYVt5ly c2KnDUkMKFnK1xf3Q2RWKaftIsjLnjlSEI/srZDuQX+VOEsXjsJuxFyPKJF4F66Xh X-Received: by 2002:a5d:538c:: with SMTP id d12mr49279wrv.116.1623775698591; Tue, 15 Jun 2021 09:48:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3fYDqB5MDpICipwQfOhKPhpClDR68jW5F0WKbZk10AQuFIng7zwCpSskVFgW//sQ+U1ov3g== X-Received: by 2002:a5d:538c:: with SMTP id d12mr49253wrv.116.1623775698451; Tue, 15 Jun 2021 09:48:18 -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 o3sm2880918wrj.94.2021.06.15.09.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Date: Tue, 15 Jun 2021 18:47:50 +0200 Message-Id: <20210615164751.2192807-7-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_session_check_role() helper. Signed-off-by: Philippe Mathieu-Daudé --- ui/vnc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index b3d4d7b9a5f..ad68f9b639f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -4080,7 +4080,8 @@ void vnc_display_open(const char *id, Error **errp) } object_ref(OBJECT(vd->tlscreds)); - if (vd->tlscreds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { + if (!qcrypto_tls_session_check_role(vd->tlscreds, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)) { error_setg(errp, "Expecting TLS credentials with a server endpoint"); goto fail; From patchwork Tue Jun 15 16:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12322439 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A022C48BE5 for ; Tue, 15 Jun 2021 16:53:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80AA261878 for ; Tue, 15 Jun 2021 16:53:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80AA261878 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltCJ9-0005sU-Kx for qemu-devel@archiver.kernel.org; Tue, 15 Jun 2021 12:52:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEn-0005BZ-1P for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltCEk-0003aT-Rm for qemu-devel@nongnu.org; Tue, 15 Jun 2021 12:48:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775706; 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=M472Jsj64cJ+peUQ7tuUXko4J1v5rGFmgGdmduX8ilQ=; b=BPKId9A4S5UwNFXMe4sVnRLggKg7u0EHF5gRiLolpzBstchn0JmzptLyJDO8N5q/RvDU8O In3hUyL05z+fvsNxopLFvgZTQCsv+SmUqLgjcoFh3xGrUH320TFdQ/qCR7ejpIvk88/d/s 0axifDkD/NnJ7gcfMRMx0HMDKsUOa5M= 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-169-pQJrDKCTOQu13R9Mv9PPBA-1; Tue, 15 Jun 2021 12:48:24 -0400 X-MC-Unique: pQJrDKCTOQu13R9Mv9PPBA-1 Received: by mail-wr1-f72.google.com with SMTP id s8-20020adff8080000b0290114e1eeb8c6so8853371wrp.23 for ; Tue, 15 Jun 2021 09:48:24 -0700 (PDT) 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=M472Jsj64cJ+peUQ7tuUXko4J1v5rGFmgGdmduX8ilQ=; b=AlB+ltep9dcG3now27m9/30MgUo86lhXXUBtkbUjlL2jLcPcWLiQoxAmqAqRGwdtTJ tebpjomS4kpJxVLLJkZSQ2wAZpZUgnf/Fi+gxJqywaWGWkpR3AwZxnql3kP2vKfepY8d FWeYFq+HDw5Kv/lZ+N+zl71gV8L53lKfe8Okz5PaQ7EKMkxhsQX+f+UsQZQX5IlaMzeY VX+yuy7WmCG6NM8f1wQAYabvMoUlJfA8Cfu/MutN8ZbFzKn8qS2b1qUOea+oN3sui+Nn gnCJEa/vu2K9wf4zcxqFmKM7cc+db2irCBV0l3gpKmcm2xPbq3+W5AvgDsicnyZyGb9d fTYQ== X-Gm-Message-State: AOAM531C22xRhVZ6f17ikjCLc3ntIDAaZZVsG9Utd7cFHkp1Rhw0rPLq NRHsaGNNLnei4AUZlS7Eu8mmnfI3ioejCULgjqGrhyrbKm/6dLOV5aTuIGw+NQTvCt2VmGGcD52 GQxAQ4JAMgZBxlf5ni1m1QZV0skcu8z8WC8ub3CGb1nEpjyDENGlHF7rWCIjOlLX3 X-Received: by 2002:a1c:7912:: with SMTP id l18mr196259wme.135.1623775703079; Tue, 15 Jun 2021 09:48:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXai/Xjg7czV5SnWXKUoJ38Vq0i010qKWAo9xa3pu9gu46VGbniZHK0zxIHvvWDI+FvUs5Tw== X-Received: by 2002:a1c:7912:: with SMTP id l18mr196231wme.135.1623775702833; Tue, 15 Jun 2021 09:48:22 -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 g83sm1979864wma.10.2021.06.15.09.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:48:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private Date: Tue, 15 Jun 2021 18:47:51 +0200 Message-Id: <20210615164751.2192807-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615164751.2192807-1-philmd@redhat.com> References: <20210615164751.2192807-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , Lukas Straub , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Stefan Weil , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Code consuming the "crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the implementations in crypto/. The headers 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/migration_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é Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407 Fixes: 7de2e856533 ("yank: Unregister function when using TLS migration") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- crypto/tlscredspriv.h | 15 +++++++++++++++ include/crypto/tlscreds.h | 16 ---------------- include/crypto/tlscredsanon.h | 12 ------------ include/crypto/tlscredspsk.h | 12 ------------ include/crypto/tlscredsx509.h | 10 ---------- crypto/tlscredsanon.c | 13 +++++++++++++ crypto/tlscredspsk.c | 14 ++++++++++++++ crypto/tlscredsx509.c | 16 +++++++++++++--- 8 files changed, 55 insertions(+), 53 deletions(-) diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h index 39f1a91c413..67e76c24539 100644 --- a/crypto/tlscredspriv.h +++ b/crypto/tlscredspriv.h @@ -23,6 +23,21 @@ #include "crypto/tlscreds.h" +#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; +}; + #ifdef CONFIG_GNUTLS int qcrypto_tls_creds_get_path(QCryptoTLSCreds *creds, diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index eb9d5e75a84..bb3f2e4f303 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" -#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. */ -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 QCryptoTLSCredsAnonClass; * */ - -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 QCryptoTLSCredsPSKClass; * The PSK file can be created and managed using psktool. */ -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 QCryptoTLSCredsX509Class; * */ -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/tlscredsanon.c b/crypto/tlscredsanon.c index bea5f76c55d..e7f74061ae2 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -26,6 +26,19 @@ #include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include +#endif + +struct QCryptoTLSCredsAnon { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + union { + gnutls_anon_server_credentials_t server; + gnutls_anon_client_credentials_t client; + } data; +#endif +}; #ifdef CONFIG_GNUTLS diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index f5a31108d15..b4053741b3b 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -26,6 +26,20 @@ #include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include +#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 +}; #ifdef CONFIG_GNUTLS diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index d9d6f4421e5..0a8284f930b 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -27,12 +27,22 @@ #include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include +#include +#endif + +struct QCryptoTLSCredsX509 { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + gnutls_certificate_credentials_t data; +#endif + bool sanityCheck; + char *passwordid; +}; #ifdef CONFIG_GNUTLS -#include - - static int qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert, const char *certFile,