mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-27 21:40:49 +00:00
da34e65cb4
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>
102 lines
2.6 KiB
C
102 lines
2.6 KiB
C
/*
|
|
* QEMU Crypto block IV generator
|
|
*
|
|
* Copyright (c) 2015-2016 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 "qapi/error.h"
|
|
|
|
#include "crypto/ivgenpriv.h"
|
|
#include "crypto/ivgen-plain.h"
|
|
#include "crypto/ivgen-plain64.h"
|
|
#include "crypto/ivgen-essiv.h"
|
|
|
|
|
|
QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgorithm alg,
|
|
QCryptoCipherAlgorithm cipheralg,
|
|
QCryptoHashAlgorithm hash,
|
|
const uint8_t *key, size_t nkey,
|
|
Error **errp)
|
|
{
|
|
QCryptoIVGen *ivgen = g_new0(QCryptoIVGen, 1);
|
|
|
|
ivgen->algorithm = alg;
|
|
ivgen->cipher = cipheralg;
|
|
ivgen->hash = hash;
|
|
|
|
switch (alg) {
|
|
case QCRYPTO_IVGEN_ALG_PLAIN:
|
|
ivgen->driver = &qcrypto_ivgen_plain;
|
|
break;
|
|
case QCRYPTO_IVGEN_ALG_PLAIN64:
|
|
ivgen->driver = &qcrypto_ivgen_plain64;
|
|
break;
|
|
case QCRYPTO_IVGEN_ALG_ESSIV:
|
|
ivgen->driver = &qcrypto_ivgen_essiv;
|
|
break;
|
|
default:
|
|
error_setg(errp, "Unknown block IV generator algorithm %d", alg);
|
|
g_free(ivgen);
|
|
return NULL;
|
|
}
|
|
|
|
if (ivgen->driver->init(ivgen, key, nkey, errp) < 0) {
|
|
g_free(ivgen);
|
|
return NULL;
|
|
}
|
|
|
|
return ivgen;
|
|
}
|
|
|
|
|
|
int qcrypto_ivgen_calculate(QCryptoIVGen *ivgen,
|
|
uint64_t sector,
|
|
uint8_t *iv, size_t niv,
|
|
Error **errp)
|
|
{
|
|
return ivgen->driver->calculate(ivgen, sector, iv, niv, errp);
|
|
}
|
|
|
|
|
|
QCryptoIVGenAlgorithm qcrypto_ivgen_get_algorithm(QCryptoIVGen *ivgen)
|
|
{
|
|
return ivgen->algorithm;
|
|
}
|
|
|
|
|
|
QCryptoCipherAlgorithm qcrypto_ivgen_get_cipher(QCryptoIVGen *ivgen)
|
|
{
|
|
return ivgen->cipher;
|
|
}
|
|
|
|
|
|
QCryptoHashAlgorithm qcrypto_ivgen_get_hash(QCryptoIVGen *ivgen)
|
|
{
|
|
return ivgen->hash;
|
|
}
|
|
|
|
|
|
void qcrypto_ivgen_free(QCryptoIVGen *ivgen)
|
|
{
|
|
if (!ivgen) {
|
|
return;
|
|
}
|
|
ivgen->driver->cleanup(ivgen);
|
|
g_free(ivgen);
|
|
}
|