crypto: Make QCryptoTLSCreds* structures private
Subsystems (2)
v2 cover crypto: Make QCryptoTLSCreds* structures private
Follow Daniel suggestion to simplify qcrypto TLS implementations, aiming to solve the OSX build failure.
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (7):
crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper block/nbd: Use qcrypto_tls_creds_check_endpoint() chardev/socket: Use qcrypto_tls_creds_check_endpoint() migration/tls: Use qcrypto_tls_creds_check_endpoint() crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper ui/vnc: Use qcrypto_tls_session_check_role()
crypto: Make QCryptoTLSCreds* structures private
crypto/tlscredspriv.h | 15 +++++++++++++++ include/crypto/tlscreds.h | 28 ++++++++++++---------------- include/crypto/tlscredsanon.h | 12 ------------ include/crypto/tlscredspsk.h | 12 ------------ include/crypto/tlscredsx509.h | 10 ---------- include/crypto/tlssession.h | 13 +++++++++++++ block/nbd.c | 3 ++- blockdev-nbd.c | 3 ++- chardev/char-socket.c | 6 ++++-- crypto/tlscreds.c | 5 +++++ crypto/tlscredsanon.c | 13 +++++++++++++ crypto/tlscredspsk.c | 14 ++++++++++++++ crypto/tlscredsx509.c | 16 +++++++++++++--- crypto/tlssession.c | 6 ++++++ migration/tls.c | 2 +- ui/vnc.c | 3 ++- 16 files changed, 102 insertions(+), 59 deletions(-)
Signature · 1 line
2.31.1
PATCH v2 1/7 crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper
Introduce the qcrypto_tls_creds_check_endpoint() helper to access QCryptoTLSCreds internal 'endpoint' field.
--- include/crypto/tlscreds.h | 12 ++++++++++++ crypto/tlscreds.c | 5 +++++ 2 files changed, 17 insertions(+)
include/crypto/tlscreds.h +12 -0
@@ -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 */
crypto/tlscreds.c +5 -0
@@ -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 ,
Signature · 1 line
2.31.1
PATCH v2 2/7 block/nbd: Use qcrypto_tls_creds_check_endpoint()
In reply to Philippe Mathieu-DaudéAvoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper.
--- block/nbd.c | 3 ++- blockdev-nbd.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
block/nbd.c +2 -1
@@ -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 ;
blockdev-nbd.c +2 -1
@@ -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 ;
Signature · 1 line
2.31.1
Re: [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()
Quoted 14 lines · Philippe Mathieu-Daudé
Avoid accessing QCryptoTLSCreds internals by using the
qcrypto_tls_creds_check_endpoint()helper.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nbd.c | 3 ++- blockdev-nbd.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)block/nbd.c +0
-0
block/nbd.c static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) · line 2165
Quoted 8 lines
block/nbd.c +2
-1@@ -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" );
I'd suggest we pass 'errp' into the qcrypto_tls_creds_check_endpoint method, so we don't duplicate the error message in all callers.
Quoted 18 lines
block/nbd.c +0
-0return NULL ;blockdev-nbd.c +2
-1@@ -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 ;Signature · 1 line
2.31.1
Regards,
Daniel
Signature · 3 lines
|: 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 :|
PATCH v2 3/7 chardev/socket: Use qcrypto_tls_creds_check_endpoint()
In reply to Philippe Mathieu-DaudéAvoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper.
--- chardev/char-socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
chardev/char-socket.c +4 -2
@@ -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 ;
Signature · 1 line
2.31.1
PATCH v2 4/7 migration/tls: Use qcrypto_tls_creds_check_endpoint()
In reply to Philippe Mathieu-DaudéAvoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper.
--- migration/tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/tls.c +1 -1
@@ -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 ?
Signature · 1 line
2.31.1
PATCH v2 5/7 crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper
In reply to Philippe Mathieu-DaudéIntroduce the qcrypto_tls_creds_check_endpoint() helper to avoid accessing QCryptoTLSCreds internal 'endpoint' field directly.
--- include/crypto/tlssession.h | 13 +++++++++++++ crypto/tlssession.c | 6 ++++++ 2 files changed, 19 insertions(+)
include/crypto/tlssession.h +13 -0
@@ -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
crypto/tlssession.c +6 -0
@@ -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); +}
Signature · 1 line
2.31.1
PATCH v2 6/7 ui/vnc: Use qcrypto_tls_session_check_role()
In reply to Philippe Mathieu-DaudéAvoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_session_check_role() helper.
--- ui/vnc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ui/vnc.c +2 -1
@@ -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;
Signature · 1 line
2.31.1
PATCH v2 7/7 crypto: Make QCryptoTLSCreds* structures private
In reply to Philippe Mathieu-Daudé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.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407
--- 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(-)
crypto/tlscredspriv.h +15 -0
@@ -23,6 +23,21 @@#include "crypto/tlscreds.h" +#ifdef CONFIG_GNUTLS +#include <gnutls/gnutls.h> +#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,
include/crypto/tlscreds.h +0 -16
@@ -24,10 +24,6 @@#include "qapi/qapi-types-crypto.h" #include "qom/object.h" -#ifdef CONFIG_GNUTLS -#include <gnutls/gnutls.h> -#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;
include/crypto/tlscredsanon.h +0 -12
@@ -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; };
include/crypto/tlscredspsk.h +0 -12
@@ -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; };
include/crypto/tlscredsx509.h +0 -10
@@ -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; };
crypto/tlscredsanon.c +13 -0
@@ -26,6 +26,19 @@#include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include <gnutls/gnutls.h> +#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
crypto/tlscredspsk.c +14 -0
@@ -26,6 +26,20 @@#include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include <gnutls/gnutls.h> +#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
crypto/tlscredsx509.c +13 -3
@@ -27,12 +27,22 @@#include "qom/object_interfaces.h" #include "trace.h" +#ifdef CONFIG_GNUTLS +#include <gnutls/gnutls.h> +#include <gnutls/x509.h> +#endif + +struct QCryptoTLSCredsX509 { +QCryptoTLSCreds parent_obj; +#ifdef CONFIG_GNUTLS +gnutls_certificate_credentials_t data; +#endif +bool sanityCheck; +char *passwordid; +};#ifdef CONFIG_GNUTLS -#include <gnutls/x509.h> - - static int qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert, const char *certFile,
Signature · 1 line
2.31.1
Quoted 26 lines · Philippe Mathieu-Daudé
Code consuming the "
crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the implementations incrypto/. The headers still forward declare the structures typedef.This solves a bug introduced by commit
7de2e856533which mademigration/qemu-file-channel.cinclude "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 [ ... ] -olibmigration.fa.p/migration_qemu-file-channel.c.o-c../migration/qemu-file-channel.cIn file included from../migration/qemu-file-channel.c:29:
In file included frominclude/io/channel-tls.h:26:
In file included frominclude/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 <[email protected]>Suggested-by Daniel P. Berrangé <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407
Fixes 7de2e856533 ("yank: Unregister function when using TLS migration")Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 10 lines
--- 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(-)
Regards,
Daniel
Signature · 3 lines
|: 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 :|
Quoted 38 lines · Daniel P. Berrangé
Quoted 26 lines · Philippe Mathieu-Daudé
Code consuming the "
crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the implementations incrypto/. The headers still forward declare the structures typedef.This solves a bug introduced by commit
7de2e856533which mademigration/qemu-file-channel.cinclude "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 [ ... ] -olibmigration.fa.p/migration_qemu-file-channel.c.o-c../migration/qemu-file-channel.cIn file included from../migration/qemu-file-channel.c:29:
In file included frominclude/io/channel-tls.h:26:
In file included frominclude/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 <[email protected]>Suggested-by Daniel P. Berrangé <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407
Fixes 7de2e856533 ("yank: Unregister function when using TLS migration")Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 10 lines
--- 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(-)
Quoted 1 line
Reviewed-by Daniel P. Berrangé <[email protected]>
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);
| ^~
Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 38 lines · Daniel P. Berrangé
Quoted 26 lines · Philippe Mathieu-Daudé
Code consuming the "
crypto/tlscreds*.h" APIs doesn't need to access its internals. Move the structure definitions to the implementations incrypto/. The headers still forward declare the structures typedef.This solves a bug introduced by commit
7de2e856533which mademigration/qemu-file-channel.cinclude "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 [ ... ] -olibmigration.fa.p/migration_qemu-file-channel.c.o-c../migration/qemu-file-channel.cIn file included from../migration/qemu-file-channel.c:29:
In file included frominclude/io/channel-tls.h:26:
In file included frominclude/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 <[email protected]>Suggested-by Daniel P. Berrangé <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/407
Fixes 7de2e856533 ("yank: Unregister function when using TLS migration")Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 10 lines
--- 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(-)Quoted 1 line
Reviewed-by Daniel P. Berrangé <[email protected]>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);
| ^~
Quoted 8 lines
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
Signature · 3 lines
|: 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 :|