[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private |
Date: |
Tue, 15 Jun 2021 19:16:17 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
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);
| ^~
- [PATCH v2 0/7] crypto: Make QCryptoTLSCreds* structures private, Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper, Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper, Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 6/7] ui/vnc: Use qcrypto_tls_session_check_role(), Philippe Mathieu-Daudé, 2021/06/15
- [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private, Philippe Mathieu-Daudé, 2021/06/15