* [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Introduce the qcrypto_tls_creds_check_endpoint() helper
to access QCryptoTLSCreds internal 'endpoint' field.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/crypto/tlscreds.h | 13 +++++++++++++
crypto/tlscreds.c | 12 ++++++++++++
2 files changed, 25 insertions(+)
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index d0808e391e9..e45f1e34853 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -65,5 +65,18 @@ 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,
+ 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] 10+ messages in thread* [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 3/7] chardev/socket: " Philippe Mathieu-Daudé
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
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] 10+ messages in thread* [PATCH v3 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint()
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 4/7] migration/tls: " Philippe Mathieu-Daudé
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
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] 10+ messages in thread* [PATCH v3 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint()
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-06-15 17:27 ` [PATCH v3 3/7] chardev/socket: " Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
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] 10+ messages in thread* [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-06-15 17:27 ` [PATCH v3 4/7] migration/tls: " Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Philippe Mathieu-Daudé
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Introduce the qcrypto_tls_creds_check_endpoint() helper
to avoid accessing QCryptoTLSCreds internal 'endpoint' field
directly.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/crypto/tlssession.h | 14 ++++++++++++++
crypto/tlssession.c | 7 +++++++
2 files changed, 21 insertions(+)
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index 15b9cef086c..657a2c05521 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -162,6 +162,20 @@ 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,
+ Error **errp);
+
/**
* qcrypto_tls_session_check_credentials:
* @sess: the TLS session object
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 33203e8ca71..4e614b73a28 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -640,3 +640,10 @@ qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess)
}
#endif
+
+bool qcrypto_tls_session_check_role(QCryptoTLSCreds *creds,
+ QCryptoTLSCredsEndpoint endpoint,
+ Error **errp)
+{
+ return qcrypto_tls_creds_check_endpoint(creds, endpoint, errp);
+}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role()
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-06-15 17:27 ` [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 17:39 ` [PATCH v3 0/7] " Philippe Mathieu-Daudé
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Philippe Mathieu-Daudé,
Daniel P. Berrangé,
qemu-block, Leonardo Bras
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_session_check_role() helper.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
ui/vnc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index b3d4d7b9a5f..c7c8454b873 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -4080,9 +4080,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_session_check_role(vd->tlscreds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ errp)) {
goto fail;
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-06-15 17:27 ` [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Philippe Mathieu-Daudé
@ 2021-06-15 17:27 ` Philippe Mathieu-Daudé
2021-06-15 17:29 ` Philippe Mathieu-Daudé
2021-06-15 17:39 ` [PATCH v3 0/7] " Philippe Mathieu-Daudé
7 siblings, 1 reply; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Leonardo Bras, Daniel P. Berrangé,
qemu-block, Stefan Weil, Marc-André Lureau,
Philippe Mathieu-Daudé
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.
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 | 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 | 3 +-
crypto/tlscredspsk.c | 3 +-
crypto/tlscredsx509.c | 4 +--
crypto/tlssession.c | 1 +
11 files changed, 58 insertions(+), 61 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 e45f1e34853..41b8939d417 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..2675b1af8f8 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -26,9 +26,10 @@
#include "qom/object_interfaces.h"
#include "trace.h"
-
#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..820719c5e84 100644
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -26,9 +26,10 @@
#include "qom/object_interfaces.h"
#include "trace.h"
-
#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..44dbe0dc819 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -27,12 +27,10 @@
#include "qom/object_interfaces.h"
#include "trace.h"
-
#ifdef CONFIG_GNUTLS
-
+#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-
static int
qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert,
const char *certFile,
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 4e614b73a28..e5d5675ef30 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] 10+ messages in thread* Re: [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private
2021-06-15 17:27 ` [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-15 17:29 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:29 UTC (permalink / raw)
To: qemu-devel, Daniel P. Berrangé
Cc: Marc-André Lureau, Stefan Weil, qemu-block, Leonardo Bras
On 6/15/21 7:27 PM, 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.
>
> 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 | 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 | 3 +-
> crypto/tlscredspsk.c | 3 +-
> crypto/tlscredsx509.c | 4 +--
> crypto/tlssession.c | 1 +
> 11 files changed, 58 insertions(+), 61 deletions(-)
> index bea5f76c55d..2675b1af8f8 100644
> --- a/crypto/tlscredsanon.c
> +++ b/crypto/tlscredsanon.c
> @@ -26,9 +26,10 @@
> #include "qom/object_interfaces.h"
> #include "trace.h"
>
> -
Involuntary line removal :/ Can restore if v4 required.
> #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..820719c5e84 100644
> --- a/crypto/tlscredspsk.c
> +++ b/crypto/tlscredspsk.c
> @@ -26,9 +26,10 @@
> #include "qom/object_interfaces.h"
> #include "trace.h"
>
> -
> #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..44dbe0dc819 100644
> --- a/crypto/tlscredsx509.c
> +++ b/crypto/tlscredsx509.c
> @@ -27,12 +27,10 @@
> #include "qom/object_interfaces.h"
> #include "trace.h"
>
> -
> #ifdef CONFIG_GNUTLS
> -
> +#include <gnutls/gnutls.h>
> #include <gnutls/x509.h>
>
> -
> static int
> qcrypto_tls_creds_check_cert_times(gnutls_x509_crt_t cert,
> const char *certFile,
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2021-06-15 17:27 ` [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
@ 2021-06-15 17:39 ` Philippe Mathieu-Daudé
7 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-06-15 17:39 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Daniel P. Berrangé,
qemu-block, Leonardo Bras
On 6/15/21 7:27 PM, Philippe Mathieu-Daudé wrote:
> Follow Daniel suggestion to simplify qcrypto TLS implementations,
> aiming to solve the OSX build failure.
>
> Since v2:
> - Add Error* argument (Daniel)
> - Move structure definitions to "tlscredspriv.h"
>
> 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 | 45 ++++++++++++++++++++++++++++++
> include/crypto/tls-cipher-suites.h | 6 ----
> include/crypto/tlscreds.h | 29 +++++++++----------
> include/crypto/tlscredsanon.h | 12 --------
> include/crypto/tlscredspsk.h | 12 --------
> include/crypto/tlscredsx509.h | 10 -------
> include/crypto/tlssession.h | 14 ++++++++++
> 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 | 3 +-
> crypto/tlscredspsk.c | 3 +-
> crypto/tlscredsx509.c | 4 +--
> crypto/tlssession.c | 8 ++++++
> migration/tls.c | 6 +---
> ui/vnc.c | 6 ++--
> 18 files changed, 120 insertions(+), 87 deletions(-)
Sorry Daniel, today it is too hot inside :S
$ git checkout sev_builtin
error: Your local changes to the following files would be overwritten by
checkout:
include/crypto/tlscreds.h
include/crypto/tlssession.h
Please commit your changes or stash them before you switch branches.
Aborting
$ git diff
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index 41b8939d417..2a8a8570109 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -53,6 +53,7 @@ struct QCryptoTLSCredsClass {
* 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.
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index 657a2c05521..2fb0bb02d9f 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -166,6 +166,7 @@ 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
+ * @errp: pointer to a NULL-initialized error object
*
* Check whether the session object operates according to
* the role of the @endpoint argument.
^ permalink raw reply related [flat|nested] 10+ messages in thread