]> git.ipfire.org Git - thirdparty/qemu.git/commit
crypto: Make QCryptoTLSCreds* structures private
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Mon, 28 Jun 2021 16:09:14 +0000 (18:09 +0200)
committerMichael Roth <michael.roth@amd.com>
Thu, 14 Oct 2021 21:27:39 +0000 (16:27 -0500)
commit747fd3cb1336e482c2da31036cb2706e9c45074d
treeb7a010b11deb6def62d835caef87ecd0c1d54e61
parent43844c2fb2fffd0f710071259453714acb804c07
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>
(cherry picked from commit 678bcc3c2cf22262d0a72b52da57737c4a40e040)
Signed-off-by: Michael Roth <michael.roth@amd.com>
crypto/tls-cipher-suites.c
crypto/tlscredsanon.c
crypto/tlscredspriv.h
crypto/tlscredspsk.c
crypto/tlscredsx509.c
crypto/tlssession.c
include/crypto/tls-cipher-suites.h
include/crypto/tlscreds.h
include/crypto/tlscredsanon.h
include/crypto/tlscredspsk.h
include/crypto/tlscredsx509.h