* [PATCH v5 1/6] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
` (5 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Philippe Mathieu-Daudé, Daniel P . Berrangé
Introduce the qcrypto_tls_creds_check_endpoint() helper
to access QCryptoTLSCreds internal 'endpoint' field.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/crypto/tlscreds.h | 14 ++++++++++++++
crypto/tlscreds.c | 12 ++++++++++++
2 files changed, 26 insertions(+)
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index d0808e391e9..a14e44fac15 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -65,5 +65,19 @@ 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
+ * @errp: pointer to a NULL-initialized error object
+ *
+ * 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,
+ Error **errp);
#endif /* QCRYPTO_TLSCREDS_H */
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index b68735f06fe..084ce0d51ae 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi-types-crypto.h"
#include "qemu/module.h"
#include "tlscredspriv.h"
#include "trace.h"
@@ -259,6 +260,17 @@ qcrypto_tls_creds_finalize(Object *obj)
g_free(creds->priority);
}
+bool qcrypto_tls_creds_check_endpoint(QCryptoTLSCreds *creds,
+ QCryptoTLSCredsEndpoint endpoint,
+ Error **errp)
+{
+ if (creds->endpoint != endpoint) {
+ error_setg(errp, "Expected TLS credentials for a %s endpoint",
+ QCryptoTLSCredsEndpoint_str(endpoint));
+ return false;
+ }
+ return true;
+}
static const TypeInfo qcrypto_tls_creds_info = {
.parent = TYPE_OBJECT,
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 1/6] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 3/6] chardev/socket: " Philippe Mathieu-Daudé
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Philippe Mathieu-Daudé, Daniel P . Berrangé
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nbd.c | 6 +++---
blockdev-nbd.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 616f9ae6c4d..b13a33c3d21 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -2159,9 +2159,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
return NULL;
}
- if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
- error_setg(errp,
- "Expecting TLS credentials with a client endpoint");
+ if (!qcrypto_tls_creds_check_endpoint(creds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
+ errp)) {
return NULL;
}
object_ref(obj);
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index b264620b98d..bdfa7ed3a5a 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -108,9 +108,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
return NULL;
}
- if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- error_setg(errp,
- "Expecting TLS credentials with a server endpoint");
+ if (!qcrypto_tls_creds_check_endpoint(creds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ errp)) {
return NULL;
}
object_ref(obj);
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v5 3/6] chardev/socket: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 1/6] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 4/6] migration/tls: " Philippe Mathieu-Daudé
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Philippe Mathieu-Daudé, Daniel P . Berrangé
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
chardev/char-socket.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index daa89fe5d1d..d0fb5459638 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1402,18 +1402,12 @@ static void qmp_chardev_open_socket(Chardev *chr,
return;
}
object_ref(OBJECT(s->tls_creds));
- if (is_listen) {
- if (s->tls_creds->endpoint != 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) {
- error_setg(errp, "%s",
- "Expected TLS credentials for client endpoint");
- return;
- }
+ if (!qcrypto_tls_creds_check_endpoint(s->tls_creds,
+ is_listen
+ ? QCRYPTO_TLS_CREDS_ENDPOINT_SERVER
+ : QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
+ errp)) {
+ return;
}
}
s->tls_authz = g_strdup(sock->tls_authz);
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v5 4/6] migration/tls: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-06-17 12:18 ` [PATCH v5 3/6] chardev/socket: " Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 5/6] ui/vnc: " Philippe Mathieu-Daudé
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Philippe Mathieu-Daudé, Daniel P . Berrangé
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
migration/tls.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/migration/tls.c b/migration/tls.c
index abb149d8325..ca1ea3bbdd4 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -49,11 +49,7 @@ migration_tls_get_creds(MigrationState *s,
s->parameters.tls_creds);
return NULL;
}
- if (ret->endpoint != endpoint) {
- error_setg(errp,
- "Expected TLS credentials for a %s endpoint",
- endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT ?
- "client" : "server");
+ if (!qcrypto_tls_creds_check_endpoint(ret, endpoint, errp)) {
return NULL;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v5 5/6] ui/vnc: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-06-17 12:18 ` [PATCH v5 4/6] migration/tls: " Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-17 15:34 ` Richard Henderson
2021-06-18 8:35 ` Daniel P. Berrangé
2021-06-17 12:18 ` [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-28 3:56 ` [PATCH v5 0/6] " Akihiko Odaki
6 siblings, 2 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
ui/vnc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index b3d4d7b9a5f..f7d63a16dd5 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -46,6 +46,7 @@
#include "qapi/qapi-commands-ui.h"
#include "ui/input.h"
#include "crypto/hash.h"
+#include "crypto/tlscreds.h"
#include "crypto/tlscredsanon.h"
#include "crypto/tlscredsx509.h"
#include "crypto/random.h"
@@ -4080,9 +4081,9 @@ void vnc_display_open(const char *id, Error **errp)
}
object_ref(OBJECT(vd->tlscreds));
- if (vd->tlscreds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- error_setg(errp,
- "Expecting TLS credentials with a server endpoint");
+ if (!qcrypto_tls_creds_check_endpoint(vd->tlscreds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ errp)) {
goto fail;
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v5 5/6] ui/vnc: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 ` [PATCH v5 5/6] ui/vnc: " Philippe Mathieu-Daudé
@ 2021-06-17 15:34 ` Richard Henderson
2021-06-18 8:35 ` Daniel P. Berrangé
1 sibling, 0 replies; 12+ messages in thread
From: Richard Henderson @ 2021-06-17 15:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
On 6/17/21 5:18 AM, Philippe Mathieu-Daudé wrote:
> Avoid accessing QCryptoTLSCreds internals by using
> the qcrypto_tls_creds_check_endpoint() helper.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> ui/vnc.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v5 5/6] ui/vnc: Use qcrypto_tls_creds_check_endpoint()
2021-06-17 12:18 ` [PATCH v5 5/6] ui/vnc: " Philippe Mathieu-Daudé
2021-06-17 15:34 ` Richard Henderson
@ 2021-06-18 8:35 ` Daniel P. Berrangé
1 sibling, 0 replies; 12+ messages in thread
From: Daniel P. Berrangé @ 2021-06-18 8:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel
On Thu, Jun 17, 2021 at 02:18:29PM +0200, Philippe Mathieu-Daudé wrote:
> Avoid accessing QCryptoTLSCreds internals by using
> the qcrypto_tls_creds_check_endpoint() helper.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> ui/vnc.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
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 :|
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-06-17 12:18 ` [PATCH v5 5/6] ui/vnc: " Philippe Mathieu-Daudé
@ 2021-06-17 12:18 ` Philippe Mathieu-Daudé
2021-06-18 8:35 ` Daniel P. Berrangé
2021-06-28 3:56 ` [PATCH v5 0/6] " Akihiko Odaki
6 siblings, 1 reply; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-17 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Stefan Weil, Philippe Mathieu-Daudé, Daniel P . Berrangé
Code consuming the "crypto/tlscreds*.h" APIs doesn't need
to access its internals. Move the structure definitions to
the "tlscredspriv.h" private header (only accessible by
implementations). The public headers (in include/) still
forward-declare the structures typedef.
Note, tlscreds.c and 3 of the 5 modified source files already
include "tlscredspriv.h", so only add it to tls-cipher-suites.c
and tlssession.c.
Removing the internals from the public header solves a bug
introduced by commit 7de2e856533 ("yank: Unregister function
when using TLS migration") which made migration/qemu-file-channel.c
include "io/channel-tls.h", itself sometime depends on GNUTLS,
leading to a 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 | 45 ++++++++++++++++++++++++++++++
include/crypto/tls-cipher-suites.h | 6 ----
include/crypto/tlscreds.h | 16 -----------
include/crypto/tlscredsanon.h | 12 --------
include/crypto/tlscredspsk.h | 12 --------
include/crypto/tlscredsx509.h | 10 -------
crypto/tls-cipher-suites.c | 7 +++++
crypto/tlscredsanon.c | 2 ++
crypto/tlscredspsk.c | 2 ++
crypto/tlscredsx509.c | 1 +
crypto/tlssession.c | 1 +
11 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h
index 39f1a91c413..df9815a2863 100644
--- a/crypto/tlscredspriv.h
+++ b/crypto/tlscredspriv.h
@@ -23,6 +23,51 @@
#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;
+};
+
+struct QCryptoTLSCredsAnon {
+ QCryptoTLSCreds parent_obj;
+#ifdef CONFIG_GNUTLS
+ union {
+ gnutls_anon_server_credentials_t server;
+ gnutls_anon_client_credentials_t client;
+ } data;
+#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
+};
+
+struct QCryptoTLSCredsX509 {
+ QCryptoTLSCreds parent_obj;
+#ifdef CONFIG_GNUTLS
+ gnutls_certificate_credentials_t data;
+#endif
+ bool sanityCheck;
+ char *passwordid;
+};
+
#ifdef CONFIG_GNUTLS
int qcrypto_tls_creds_get_path(QCryptoTLSCreds *creds,
diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher-suites.h
index bb9ee53e03a..7eb1b76122d 100644
--- a/include/crypto/tls-cipher-suites.h
+++ b/include/crypto/tls-cipher-suites.h
@@ -19,12 +19,6 @@ typedef struct QCryptoTLSCipherSuites QCryptoTLSCipherSuites;
DECLARE_INSTANCE_CHECKER(QCryptoTLSCipherSuites, QCRYPTO_TLS_CIPHER_SUITES,
TYPE_QCRYPTO_TLS_CIPHER_SUITES)
-struct QCryptoTLSCipherSuites {
- /* <private> */
- QCryptoTLSCreds parent_obj;
- /* <public> */
-};
-
/**
* qcrypto_tls_cipher_suites_get_data:
* @obj: pointer to a TLS cipher suites object
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index a14e44fac15..2a8a8570109 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 <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;
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/tls-cipher-suites.c b/crypto/tls-cipher-suites.c
index 55fb5f7c19d..5e4f5974645 100644
--- a/crypto/tls-cipher-suites.c
+++ b/crypto/tls-cipher-suites.c
@@ -14,8 +14,15 @@
#include "crypto/tlscreds.h"
#include "crypto/tls-cipher-suites.h"
#include "hw/nvram/fw_cfg.h"
+#include "tlscredspriv.h"
#include "trace.h"
+struct QCryptoTLSCipherSuites {
+ /* <private> */
+ QCryptoTLSCreds parent_obj;
+ /* <public> */
+};
+
/*
* IANA registered TLS ciphers:
* https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index bea5f76c55d..6fb83639ecd 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -29,6 +29,8 @@
#ifdef CONFIG_GNUTLS
+#include <gnutls/gnutls.h>
+
static int
qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c
index f5a31108d15..752f2d92bee 100644
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -29,6 +29,8 @@
#ifdef CONFIG_GNUTLS
+#include <gnutls/gnutls.h>
+
static int
lookup_key(const char *pskfile, const char *username, gnutls_datum_t *key,
Error **errp)
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index d9d6f4421e5..32948a6bdc4 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -30,6 +30,7 @@
#ifdef CONFIG_GNUTLS
+#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 33203e8ca71..a8db8c76d13 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -25,6 +25,7 @@
#include "crypto/tlscredsx509.h"
#include "qapi/error.h"
#include "authz/base.h"
+#include "tlscredspriv.h"
#include "trace.h"
#ifdef CONFIG_GNUTLS
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private
2021-06-17 12:18 ` [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-18 8:35 ` Daniel P. Berrangé
0 siblings, 0 replies; 12+ messages in thread
From: Daniel P. Berrangé @ 2021-06-18 8:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Stefan Weil, qemu-devel
On Thu, Jun 17, 2021 at 02:18:30PM +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 "tlscredspriv.h" private header (only accessible by
> implementations). The public headers (in include/) still
> forward-declare the structures typedef.
>
> Note, tlscreds.c and 3 of the 5 modified source files already
> include "tlscredspriv.h", so only add it to tls-cipher-suites.c
> and tlssession.c.
>
> Removing the internals from the public header solves a bug
> introduced by commit 7de2e856533 ("yank: Unregister function
> when using TLS migration") which made migration/qemu-file-channel.c
> include "io/channel-tls.h", itself sometime depends on GNUTLS,
> leading to a 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 | 45 ++++++++++++++++++++++++++++++
> include/crypto/tls-cipher-suites.h | 6 ----
> include/crypto/tlscreds.h | 16 -----------
> include/crypto/tlscredsanon.h | 12 --------
> include/crypto/tlscredspsk.h | 12 --------
> include/crypto/tlscredsx509.h | 10 -------
> crypto/tls-cipher-suites.c | 7 +++++
> crypto/tlscredsanon.c | 2 ++
> crypto/tlscredspsk.c | 2 ++
> crypto/tlscredsx509.c | 1 +
> crypto/tlssession.c | 1 +
> 11 files changed, 58 insertions(+), 56 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
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 :|
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-06-17 12:18 ` [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-28 3:56 ` Akihiko Odaki
2021-06-28 13:22 ` Philippe Mathieu-Daudé
6 siblings, 1 reply; 12+ messages in thread
From: Akihiko Odaki @ 2021-06-28 3:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Hi,
qemu-nbd.c still refers to members of QCryptoTLSCreds* and can't be
compiled.
Regards,
Akihiko Odaki
On 2021/06/17 21:18, Philippe Mathieu-Daudé wrote:
> Missing review: 5 & 6
>
> Follow Daniel suggestion to simplify qcrypto TLS implementations,
> aiming to solve the OSX build failure.
>
> Since v4:
> - Do not introduce qcrypto_tls_session_check_role (Richard, Daniel)
> - Added R-b tags
>
> Since v3:
> - Added missing @errp docstring description
>
> Since v2:
> - Add Error* argument (Daniel)
> - Move structure definitions to "tlscredspriv.h"
>
> Philippe Mathieu-Daudé (6):
> 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()
> ui/vnc: Use qcrypto_tls_creds_check_endpoint()
> crypto: Make QCryptoTLSCreds* structures private
>
> crypto/tlscredspriv.h | 45 ++++++++++++++++++++++++++++++
> include/crypto/tls-cipher-suites.h | 6 ----
> include/crypto/tlscreds.h | 30 ++++++++++----------
> include/crypto/tlscredsanon.h | 12 --------
> include/crypto/tlscredspsk.h | 12 --------
> include/crypto/tlscredsx509.h | 10 -------
> block/nbd.c | 6 ++--
> blockdev-nbd.c | 6 ++--
> chardev/char-socket.c | 18 ++++--------
> crypto/tls-cipher-suites.c | 7 +++++
> crypto/tlscreds.c | 12 ++++++++
> crypto/tlscredsanon.c | 2 ++
> crypto/tlscredspsk.c | 2 ++
> crypto/tlscredsx509.c | 1 +
> crypto/tlssession.c | 1 +
> migration/tls.c | 6 +---
> ui/vnc.c | 7 +++--
> 17 files changed, 101 insertions(+), 82 deletions(-)
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private
2021-06-28 3:56 ` [PATCH v5 0/6] " Akihiko Odaki
@ 2021-06-28 13:22 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-28 13:22 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 6/28/21 5:56 AM, Akihiko Odaki wrote:
> Hi,
>
> qemu-nbd.c still refers to members of QCryptoTLSCreds* and can't be
> compiled.
Thanks for testing, I'll have a look.
>
> Regards,
> Akihiko Odaki
>
> On 2021/06/17 21:18, Philippe Mathieu-Daudé wrote:
>> Missing review: 5 & 6
>>
>> Follow Daniel suggestion to simplify qcrypto TLS implementations,
>> aiming to solve the OSX build failure.
^ permalink raw reply [flat|nested] 12+ messages in thread