Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef.  Since then, we've moved to include qemu/osdep.h
everywhere.  Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h.  That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h.  Include qapi/error.h in .c files that need it and don't
get it now.  Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly.  Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third.  Unfortunately, the number depending on
qapi-types.h shrinks only a little.  More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
	
		
			
				
	
	
		
			220 lines
		
	
	
		
			5.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			220 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 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 "crypto/tlscredspriv.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qom/object_interfaces.h"
 | 
						|
#include "trace.h"
 | 
						|
 | 
						|
 | 
						|
#ifdef CONFIG_GNUTLS
 | 
						|
 | 
						|
 | 
						|
static int
 | 
						|
qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
 | 
						|
                            Error **errp)
 | 
						|
{
 | 
						|
    char *dhparams = NULL;
 | 
						|
    int ret;
 | 
						|
    int rv = -1;
 | 
						|
 | 
						|
    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) {
 | 
						|
            goto cleanup;
 | 
						|
        }
 | 
						|
 | 
						|
        ret = gnutls_anon_allocate_server_credentials(&creds->data.server);
 | 
						|
        if (ret < 0) {
 | 
						|
            error_setg(errp, "Cannot allocate credentials: %s",
 | 
						|
                       gnutls_strerror(ret));
 | 
						|
            goto cleanup;
 | 
						|
        }
 | 
						|
 | 
						|
        if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
 | 
						|
                                                 &creds->parent_obj.dh_params,
 | 
						|
                                                 errp) < 0) {
 | 
						|
            goto cleanup;
 | 
						|
        }
 | 
						|
 | 
						|
        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));
 | 
						|
            goto cleanup;
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    rv = 0;
 | 
						|
 cleanup:
 | 
						|
    g_free(dhparams);
 | 
						|
    return rv;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
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);
 | 
						|
 | 
						|
    if (value) {
 | 
						|
        qcrypto_tls_creds_anon_load(creds, errp);
 | 
						|
    } else {
 | 
						|
        qcrypto_tls_creds_anon_unload(creds);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
#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), true, "loaded", 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,
 | 
						|
                                   NULL);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
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);
 |