qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] e9ac68: crypto/tlscreds: Introduce qcrypto_tl

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] e9ac68: crypto/tlscreds: Introduce qcrypto_tls_creds_check...
Date: Fri, 02 Jul 2021 00:28:12 -0700 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: e9ac68083f26759b85ef0d871ca2bbe897218f64
      
https://github.com/qemu/qemu/commit/e9ac68083f26759b85ef0d871ca2bbe897218f64
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M crypto/tlscreds.c
    M include/crypto/tlscreds.h

  Log Message:
  -----------
  crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper

Introduce the qcrypto_tls_creds_check_endpoint() helper
to access QCryptoTLSCreds internal 'endpoint' field.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 7b3b616838c30830c004b746e7b1209297118318
      
https://github.com/qemu/qemu/commit/7b3b616838c30830c004b746e7b1209297118318
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M block/nbd.c
    M blockdev-nbd.c

  Log Message:
  -----------
  block/nbd: Use qcrypto_tls_creds_check_endpoint()

Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 0279cd9535283cf5711768ab6401b204e5697a81
      
https://github.com/qemu/qemu/commit/0279cd9535283cf5711768ab6401b204e5697a81
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: Use qcrypto_tls_creds_check_endpoint()

Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 8612df2ebef9ff1f880fe76d223a3369b9c98db2
      
https://github.com/qemu/qemu/commit/8612df2ebef9ff1f880fe76d223a3369b9c98db2
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M chardev/char-socket.c

  Log Message:
  -----------
  chardev/socket: Use qcrypto_tls_creds_check_endpoint()

Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 5590f65facc508fbc38575f19a0ab2fdcdcf18a4
      
https://github.com/qemu/qemu/commit/5590f65facc508fbc38575f19a0ab2fdcdcf18a4
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M migration/tls.c

  Log Message:
  -----------
  migration/tls: Use qcrypto_tls_creds_check_endpoint()

Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 3c52bf0c608419d7892fea95f2a0af8f2e99633e
      
https://github.com/qemu/qemu/commit/3c52bf0c608419d7892fea95f2a0af8f2e99633e
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  ui/vnc: Use qcrypto_tls_creds_check_endpoint()

Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 678bcc3c2cf22262d0a72b52da57737c4a40e040
      
https://github.com/qemu/qemu/commit/678bcc3c2cf22262d0a72b52da57737c4a40e040
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-06-29 (Tue, 29 Jun 2021)

  Changed paths:
    M crypto/tls-cipher-suites.c
    M crypto/tlscredsanon.c
    M crypto/tlscredspriv.h
    M crypto/tlscredspsk.c
    M crypto/tlscredsx509.c
    M crypto/tlssession.c
    M include/crypto/tls-cipher-suites.h
    M include/crypto/tlscreds.h
    M include/crypto/tlscredsanon.h
    M include/crypto/tlscredspsk.h
    M include/crypto/tlscredsx509.h

  Log Message:
  -----------
  crypto: Make QCryptoTLSCreds* structures private

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>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 5a67d7735d4162630769ef495cf813244fc850df
      
https://github.com/qemu/qemu/commit/5a67d7735d4162630769ef495cf813244fc850df
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-02 (Fri, 02 Jul 2021)

  Changed paths:
    M block/nbd.c
    M blockdev-nbd.c
    M chardev/char-socket.c
    M crypto/tls-cipher-suites.c
    M crypto/tlscreds.c
    M crypto/tlscredsanon.c
    M crypto/tlscredspriv.h
    M crypto/tlscredspsk.c
    M crypto/tlscredsx509.c
    M crypto/tlssession.c
    M include/crypto/tls-cipher-suites.h
    M include/crypto/tlscreds.h
    M include/crypto/tlscredsanon.h
    M include/crypto/tlscredspsk.h
    M include/crypto/tlscredsx509.h
    M migration/tls.c
    M qemu-nbd.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/berrange-gitlab/tags/tls-deps-pull-request' into staging

Hide build time dependancy on gnutls fom non-crypto code

# gpg: Signature made Wed 30 Jun 2021 12:18:47 BST
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange-gitlab/tags/tls-deps-pull-request:
  crypto: Make QCryptoTLSCreds* structures private
  ui/vnc: Use qcrypto_tls_creds_check_endpoint()
  migration/tls: Use qcrypto_tls_creds_check_endpoint()
  chardev/socket: Use qcrypto_tls_creds_check_endpoint()
  qemu-nbd: Use qcrypto_tls_creds_check_endpoint()
  block/nbd: Use qcrypto_tls_creds_check_endpoint()
  crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/67e25eed977c...5a67d7735d41
reply via email to
[Prev in Thread] Current Thread [Next in Thread]