From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Leonardo Bras" <leobras.c@gmail.com>,
"Lukas Straub" <lukasstraub2@web.de>,
qemu-block@nongnu.org, "Stefan Weil" <sw@weilnetz.de>,
qemu-devel@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private
Date: Tue, 15 Jun 2021 18:21:35 +0100 [thread overview]
Message-ID: <YMjhny52SrKrOkE8@redhat.com> (raw)
In-Reply-To: <33a34588-a878-74c4-6d84-833ceeb45c52@redhat.com>
On Tue, Jun 15, 2021 at 07:16:17PM +0200, Philippe Mathieu-Daudé wrote:
> On 6/15/21 6:52 PM, Daniel P. Berrangé wrote:
> > On Tue, Jun 15, 2021 at 06:47:51PM +0200, Philippe Mathieu-Daudé wrote:
> >> 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 <gnutls/gnutls.h>
> >> ^~~~~~~~~~~~~~~~~
> >> 1 error generated.
> >>
> >> Reported-by: Stefan Weil <sw@weilnetz.de>
> >> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> >> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407
> >> Fixes: 7de2e856533 ("yank: Unregister function when using TLS migration")
> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> ---
> >> 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(-)
> >
> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
> Thanks, however I missed something:
>
> crypto/tlssession.c: In function ‘qcrypto_tls_session_new’:
> crypto/tlssession.c:163:48: error: invalid use of incomplete typedef
> ‘QCryptoTLSCredsAnon’
> 163 | acreds->data.server);
> | ^~
> crypto/tlssession.c:167:48: error: invalid use of incomplete typedef
> ‘QCryptoTLSCredsAnon’
> 167 | acreds->data.client);
> | ^~
> crypto/tlssession.c:201:48: error: invalid use of incomplete typedef
> ‘QCryptoTLSCredsPSK’
> 201 | pcreds->data.server);
> | ^~
> crypto/tlssession.c:205:48: error: invalid use of incomplete typedef
> ‘QCryptoTLSCredsPSK’
> 205 | pcreds->data.client);
> | ^~
> crypto/tlssession.c:228:44: error: invalid use of incomplete typedef
> ‘QCryptoTLSCredsX509’
> 228 | tcreds->data);
> | ^~
Ah, yes, the tls session code needs to peer at the tlscred data.
We could have a 'crypto/tlscredspriv.h' header that declares
some accessors for getting this data from tls session.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
prev parent reply other threads:[~2021-06-15 17:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 16:47 [PATCH v2 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
2021-06-15 16:51 ` Daniel P. Berrangé
2021-06-15 16:47 ` [PATCH v2 3/7] chardev/socket: " Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 4/7] migration/tls: " Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 16:52 ` Daniel P. Berrangé
2021-06-15 17:16 ` Philippe Mathieu-Daudé
2021-06-15 17:21 ` Daniel P. Berrangé [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMjhny52SrKrOkE8@redhat.com \
--to=berrange@redhat.com \
--cc=leobras.c@gmail.com \
--cc=lukasstraub2@web.de \
--cc=marcandre.lureau@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).