678bcc3c2c
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>
87 lines
2.3 KiB
C
87 lines
2.3 KiB
C
/*
|
|
* QEMU crypto TLS credential support private helpers
|
|
*
|
|
* Copyright (c) 2015 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef QCRYPTO_TLSCREDSPRIV_H
|
|
#define QCRYPTO_TLSCREDSPRIV_H
|
|
|
|
#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,
|
|
const char *filename,
|
|
bool required,
|
|
char **cred,
|
|
Error **errp);
|
|
|
|
int qcrypto_tls_creds_get_dh_params_file(QCryptoTLSCreds *creds,
|
|
const char *filename,
|
|
gnutls_dh_params_t *dh_params,
|
|
Error **errp);
|
|
|
|
#endif
|
|
|
|
#endif /* QCRYPTO_TLSCREDSPRIV_H */
|