From nobody Mon Feb 9 16:50:50 2026 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=1623775706; cv=none; d=zohomail.com; s=zohoarc; b=ZCr88YO3ozdGdqVXQ7rmA4vIOSAN/oiyq5n4EH25KCkcyf7nEIBJmCeDXQAf8JAPqlaB28wMv3hfa497ZOS8uxCnv5eP+AxfQ94zHzijCIHB6vRB5A/QaS3YOXbOfTdI4Hnq3/+hAQlAFyHFcFqkowExNILe8xrkGyMaJECLhhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623775706; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=M472Jsj64cJ+peUQ7tuUXko4J1v5rGFmgGdmduX8ilQ=; b=MGk0HxCph6aXwUWZ/86E2tmLrMQNN5S0JsI65uHoyfzwHtAJriS+NbYkfJvrHS3TQ4Kcb5bCH2hSx2nBjaXMaZw51RoVrA2rNbFyJyolymHgFuVgWLzQdLANS8pzoZ9NGQWgLNHi48CcMkyJR8aycGO9FDW7pag7Y0pLZWzVTjw= 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 1623775706367887.2026584105006; Tue, 15 Jun 2021 09:48:26 -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-268-cfi3raF6M8SS-7yf2vKB-g-1; Tue, 15 Jun 2021 12:48:24 -0400 Received: by mail-wr1-f71.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so8899764wrc.16 for ; Tue, 15 Jun 2021 09:48:23 -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 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623775705; 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=ARQV7fi05A21rluRgRBnFWc/uJCRlxhYT+fIH0zFD9vp5ZlGdJpM1pb9lFZFkSQXv0c9V3 Rgc8i2kGXHBfFZ3ttv72QPVBELg/o3IWs5tFTK9Y6sMhkW7ayAFCJRH5S/oDhIUjKJLLGt 2Jvu/RoEbXA9qvGvdnqSFMET4hO57E8= X-MC-Unique: cfi3raF6M8SS-7yf2vKB-g-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=M472Jsj64cJ+peUQ7tuUXko4J1v5rGFmgGdmduX8ilQ=; b=a2EzMTuDcJrxfEzA2U8L4PyWKgKsP3aoqIQXiR9mLq9PgcGIMP+K7cbAuQVeNu4CSN jOcWVPun0DEscGMPoB4JgaPnw6mTcrx9umKC3Br2rHrzgEeLq4NdqXvLHF11e18Fm2mP qY3R72OkoguYgp6m7pYaiWC59yRljCHz8di5ZEkgHNvJEin5vpmZocF+AQSjk+vYgl+1 27+YK1yx0vm6qJG8QHATus632JfO8I10sTAlganOGqQNYFZxVieSK5k9K4JPRcQ4V987 qodhy6w2MrPxzHwv0st8oEATbvdV3Li4pLj3oJzjHsobR3tVYm2wJRw6vmsOfVAN2HEs yC6g== X-Gm-Message-State: AOAM53330wNJ2OgCCtDK8Xfz44hJBf2BRe1/1bxh5Rfjj+vtYf+HdtG8 AnlIEdm/sobv95oEwtzRdR1eXzsVVFcZnMTKGBEHmiQfWGQ+4j5rsBKK1uA+sdawDOLPzp8ol8R BWc3nBHL7DWSdpw== X-Received: by 2002:a1c:7912:: with SMTP id l18mr196248wme.135.1623775703042; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Leonardo Bras , Lukas Straub , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil 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 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 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/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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 @@ =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; +}; + #ifdef CONFIG_GNUTLS =20 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" =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/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" =20 +#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 +}; =20 #ifdef CONFIG_GNUTLS =20 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" =20 +#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 +}; =20 #ifdef CONFIG_GNUTLS =20 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" =20 +#ifdef CONFIG_GNUTLS +#include +#include +#endif + +struct QCryptoTLSCredsX509 { + QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS + gnutls_certificate_credentials_t data; +#endif + bool sanityCheck; + char *passwordid; +}; =20 #ifdef CONFIG_GNUTLS =20 -#include - - static int qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert, const char *certFile, --=20 2.31.1