 678bcc3c2c
			
		
	
	
		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>
		
	
			
		
			
				
	
	
		
			217 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			217 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU crypto TLS anonymous credential support
 | |
|  *
 | |
|  * 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/>.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "crypto/tlscredsanon.h"
 | |
| #include "tlscredspriv.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/module.h"
 | |
| #include "qom/object_interfaces.h"
 | |
| #include "trace.h"
 | |
| 
 | |
| 
 | |
| #ifdef CONFIG_GNUTLS
 | |
| 
 | |
| #include <gnutls/gnutls.h>
 | |
| 
 | |
| 
 | |
| static int
 | |
| qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
 | |
|                             Error **errp)
 | |
| {
 | |
|     g_autofree char *dhparams = NULL;
 | |
|     int ret;
 | |
| 
 | |
|     trace_qcrypto_tls_creds_anon_load(creds,
 | |
|             creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
 | |
| 
 | |
|     if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
 | |
|         if (qcrypto_tls_creds_get_path(&creds->parent_obj,
 | |
|                                        QCRYPTO_TLS_CREDS_DH_PARAMS,
 | |
|                                        false, &dhparams, errp) < 0) {
 | |
|             return -1;
 | |
|         }
 | |
| 
 | |
|         ret = gnutls_anon_allocate_server_credentials(&creds->data.server);
 | |
|         if (ret < 0) {
 | |
|             error_setg(errp, "Cannot allocate credentials: %s",
 | |
|                        gnutls_strerror(ret));
 | |
|             return -1;
 | |
|         }
 | |
| 
 | |
|         if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
 | |
|                                                  &creds->parent_obj.dh_params,
 | |
|                                                  errp) < 0) {
 | |
|             return -1;
 | |
|         }
 | |
| 
 | |
|         gnutls_anon_set_server_dh_params(creds->data.server,
 | |
|                                          creds->parent_obj.dh_params);
 | |
|     } else {
 | |
|         ret = gnutls_anon_allocate_client_credentials(&creds->data.client);
 | |
|         if (ret < 0) {
 | |
|             error_setg(errp, "Cannot allocate credentials: %s",
 | |
|                        gnutls_strerror(ret));
 | |
|             return -1;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *creds)
 | |
| {
 | |
|     if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
 | |
|         if (creds->data.client) {
 | |
|             gnutls_anon_free_client_credentials(creds->data.client);
 | |
|             creds->data.client = NULL;
 | |
|         }
 | |
|     } else {
 | |
|         if (creds->data.server) {
 | |
|             gnutls_anon_free_server_credentials(creds->data.server);
 | |
|             creds->data.server = NULL;
 | |
|         }
 | |
|     }
 | |
|     if (creds->parent_obj.dh_params) {
 | |
|         gnutls_dh_params_deinit(creds->parent_obj.dh_params);
 | |
|         creds->parent_obj.dh_params = NULL;
 | |
|     }
 | |
| }
 | |
| 
 | |
| #else /* ! CONFIG_GNUTLS */
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds G_GNUC_UNUSED,
 | |
|                             Error **errp)
 | |
| {
 | |
|     error_setg(errp, "TLS credentials support requires GNUTLS");
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *creds G_GNUC_UNUSED)
 | |
| {
 | |
|     /* nada */
 | |
| }
 | |
| 
 | |
| 
 | |
| #endif /* ! CONFIG_GNUTLS */
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_prop_set_loaded(Object *obj,
 | |
|                                        bool value,
 | |
|                                        Error **errp)
 | |
| {
 | |
|     QCryptoTLSCredsAnon *creds = QCRYPTO_TLS_CREDS_ANON(obj);
 | |
| 
 | |
|     qcrypto_tls_creds_anon_unload(creds);
 | |
|     if (value) {
 | |
|         qcrypto_tls_creds_anon_load(creds, errp);
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| #ifdef CONFIG_GNUTLS
 | |
| 
 | |
| 
 | |
| static bool
 | |
| qcrypto_tls_creds_anon_prop_get_loaded(Object *obj,
 | |
|                                        Error **errp G_GNUC_UNUSED)
 | |
| {
 | |
|     QCryptoTLSCredsAnon *creds = QCRYPTO_TLS_CREDS_ANON(obj);
 | |
| 
 | |
|     if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
 | |
|         return creds->data.server != NULL;
 | |
|     } else {
 | |
|         return creds->data.client != NULL;
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| #else /* ! CONFIG_GNUTLS */
 | |
| 
 | |
| 
 | |
| static bool
 | |
| qcrypto_tls_creds_anon_prop_get_loaded(Object *obj G_GNUC_UNUSED,
 | |
|                                        Error **errp G_GNUC_UNUSED)
 | |
| {
 | |
|     return false;
 | |
| }
 | |
| 
 | |
| 
 | |
| #endif /* ! CONFIG_GNUTLS */
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_complete(UserCreatable *uc, Error **errp)
 | |
| {
 | |
|     object_property_set_bool(OBJECT(uc), "loaded", true, errp);
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_finalize(Object *obj)
 | |
| {
 | |
|     QCryptoTLSCredsAnon *creds = QCRYPTO_TLS_CREDS_ANON(obj);
 | |
| 
 | |
|     qcrypto_tls_creds_anon_unload(creds);
 | |
| }
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
 | |
| 
 | |
|     ucc->complete = qcrypto_tls_creds_anon_complete;
 | |
| 
 | |
|     object_class_property_add_bool(oc, "loaded",
 | |
|                                    qcrypto_tls_creds_anon_prop_get_loaded,
 | |
|                                    qcrypto_tls_creds_anon_prop_set_loaded);
 | |
| }
 | |
| 
 | |
| 
 | |
| static const TypeInfo qcrypto_tls_creds_anon_info = {
 | |
|     .parent = TYPE_QCRYPTO_TLS_CREDS,
 | |
|     .name = TYPE_QCRYPTO_TLS_CREDS_ANON,
 | |
|     .instance_size = sizeof(QCryptoTLSCredsAnon),
 | |
|     .instance_finalize = qcrypto_tls_creds_anon_finalize,
 | |
|     .class_size = sizeof(QCryptoTLSCredsAnonClass),
 | |
|     .class_init = qcrypto_tls_creds_anon_class_init,
 | |
|     .interfaces = (InterfaceInfo[]) {
 | |
|         { TYPE_USER_CREATABLE },
 | |
|         { }
 | |
|     }
 | |
| };
 | |
| 
 | |
| 
 | |
| static void
 | |
| qcrypto_tls_creds_anon_register_types(void)
 | |
| {
 | |
|     type_register_static(&qcrypto_tls_creds_anon_info);
 | |
| }
 | |
| 
 | |
| 
 | |
| type_init(qcrypto_tls_creds_anon_register_types);
 |