[PATCH v2 0/7] crypto: Make QCryptoTLSCreds* structures private

[PATCH v2 0/7] crypto: Make QCryptoTLSCreds* structures private

[Philippe Mathieu-Daudé]

Follow Daniel suggestion to simplify qcrypto TLS implementations,
aiming to solve the OSX build failure.

Supersedes: <20210614052623.1657103-1-f4bug@amsat.org>

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(-)

-- 
2.31.1

[PATCH v2 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper

[Philippe Mathieu-Daudé]

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 | 12 ++++++++++++
 crypto/tlscreds.c         |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index d0808e391e9..eb9d5e75a84 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -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 */
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index b68735f06fe..f9f45e12db1 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -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,
-- 
2.31.1

[PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()

[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>
---
 block/nbd.c    | 3 ++-
 blockdev-nbd.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/block/nbd.c b/block/nbd.c
index 616f9ae6c4d..c3523ebf785 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -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;
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index b264620b98d..b6023052ac7 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -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;
-- 
2.31.1

[PATCH v2 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint()

[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>
---
 chardev/char-socket.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index daa89fe5d1d..fe6b1fe2110 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -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;
-- 
2.31.1

[PATCH v2 4/7] migration/tls: Use qcrypto_tls_creds_check_endpoint()

[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>
---
 migration/tls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/tls.c b/migration/tls.c
index abb149d8325..ee49ecba484 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -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 ?
-- 
2.31.1

[PATCH v2 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper

[Philippe Mathieu-Daudé]

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 | 13 +++++++++++++
 crypto/tlssession.c         |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index 15b9cef086c..fdf7578609c 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -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
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 33203e8ca71..cf2781363fe 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -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);
+}
-- 
2.31.1

[PATCH v2 6/7] ui/vnc: Use qcrypto_tls_session_check_role()

[Philippe Mathieu-Daudé]

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index b3d4d7b9a5f..ad68f9b639f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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;
-- 
2.31.1

[PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private

[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.

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(-)

diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h
index 39f1a91c413..67e76c24539 100644
--- a/crypto/tlscredspriv.h
+++ b/crypto/tlscredspriv.h
@@ -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,
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index eb9d5e75a84..bb3f2e4f303 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/tlscredsanon.c b/crypto/tlscredsanon.c
index bea5f76c55d..e7f74061ae2 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -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
 
diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c
index f5a31108d15..b4053741b3b 100644
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -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
 
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index d9d6f4421e5..0a8284f930b 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -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,
-- 
2.31.1

Re: [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()

[Daniel P. Berrangé]

On Tue, Jun 15, 2021 at 06:47:46PM +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>
> ---
>  block/nbd.c    | 3 ++-
>  blockdev-nbd.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/block/nbd.c b/block/nbd.c
> index 616f9ae6c4d..c3523ebf785 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -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.

>          return NULL;
> diff --git a/blockdev-nbd.c b/blockdev-nbd.c
> index b264620b98d..b6023052ac7 100644
> --- a/blockdev-nbd.c
> +++ b/blockdev-nbd.c
> @@ -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;
> -- 
> 2.31.1
> 

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 :|

Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private

[Daniel P. Berrangé]

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>


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 :|

Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private

[Philippe Mathieu-Daudé]

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);
      |                                            ^~

Re: [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private

[Daniel P. Berrangé]

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 :|