[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0 |
Date: |
Wed, 8 Jul 2015 13:19:52 +0200 |
The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into
staging (2015-07-06 23:37:53 +0100)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 2828a307232ffceeddec9feb6a87ac660b68b693:
ossaudio: fix memory leak (2015-07-08 13:11:01 +0200)
----------------------------------------------------------------
Bugfixes and Daniel Berrange's crypto library.
----------------------------------------------------------------
Daniel P. Berrange (10):
crypto: introduce new module for computing hash digests
crypto: move built-in AES implementation into crypto/
crypto: move built-in D3DES implementation into crypto/
crypto: introduce generic cipher API & built-in implementation
crypto: add a gcrypt cipher implementation
crypto: add a nettle cipher implementation
block: convert quorum blockdrv to use crypto APIs
ui: convert VNC websockets to use crypto APIs
block: convert qcow/qcow2 to use generic cipher API
ui: convert VNC to use generic cipher API
Eric Auger (1):
vl: move rom_load_all after machine init done
Gonglei (1):
ossaudio: fix memory leak
MAINTAINERS | 7 +
Makefile.objs | 1 +
audio/ossaudio.c | 1 +
block/Makefile.objs | 2 +-
block/qcow.c | 102 ++++++---
block/qcow2-cluster.c | 46 +++-
block/qcow2.c | 96 ++++----
block/qcow2.h | 13 +-
block/quorum.c | 39 ++--
configure | 160 +++++++++-----
crypto/Makefile.objs | 5 +
{util => crypto}/aes.c | 2 +-
crypto/cipher-builtin.c | 398 ++++++++++++++++++++++++++++++++++
crypto/cipher-gcrypt.c | 195 +++++++++++++++++
crypto/cipher-nettle.c | 206 ++++++++++++++++++
crypto/cipher.c | 74 +++++++
ui/d3des.c => crypto/desrfb.c | 2 +-
crypto/hash.c | 200 +++++++++++++++++
crypto/init.c | 150 +++++++++++++
hw/core/loader.c | 8 +-
include/{qemu => crypto}/aes.h | 0
include/crypto/cipher.h | 210 ++++++++++++++++++
ui/d3des.h => include/crypto/desrfb.h | 0
include/crypto/hash.h | 189 ++++++++++++++++
include/crypto/init.h | 29 +++
include/hw/loader.h | 3 +-
target-arm/crypto_helper.c | 2 +-
target-i386/fpu_helper.c | 1 -
target-i386/ops_sse.h | 2 +-
target-ppc/int_helper.c | 2 +-
tests/.gitignore | 2 +
tests/Makefile | 4 +
tests/test-crypto-cipher.c | 290 +++++++++++++++++++++++++
tests/test-crypto-hash.c | 209 ++++++++++++++++++
ui/Makefile.objs | 4 +-
ui/vnc-ws.c | 22 +-
ui/vnc-ws.h | 2 -
ui/vnc.c | 119 +++++-----
ui/vnc.h | 8 -
util/Makefile.objs | 2 +-
vl.c | 18 +-
41 files changed, 2546 insertions(+), 279 deletions(-)
create mode 100644 crypto/Makefile.objs
rename {util => crypto}/aes.c (99%)
create mode 100644 crypto/cipher-builtin.c
create mode 100644 crypto/cipher-gcrypt.c
create mode 100644 crypto/cipher-nettle.c
create mode 100644 crypto/cipher.c
rename ui/d3des.c => crypto/desrfb.c (99%)
create mode 100644 crypto/hash.c
create mode 100644 crypto/init.c
rename include/{qemu => crypto}/aes.h (100%)
create mode 100644 include/crypto/cipher.h
rename ui/d3des.h => include/crypto/desrfb.h (100%)
create mode 100644 include/crypto/hash.h
create mode 100644 include/crypto/init.h
create mode 100644 tests/test-crypto-cipher.c
create mode 100644 tests/test-crypto-hash.c
--
2.4.3
diff --git a/block/quorum.c b/block/quorum.c
index 5938864..4e66221 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -24,8 +24,6 @@
#include "qapi-event.h"
#include "crypto/hash.h"
-#include <glib/gi18n.h>
-
#define HASH_LENGTH 32
#define QUORUM_OPT_VOTE_THRESHOLD "vote-threshold"
diff --git a/crypto/cipher.c b/crypto/cipher.c
index 663bbe3..024a00c 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -33,8 +33,7 @@ qcrypto_cipher_validate_key_length(QCryptoCipherAlgorithm alg,
size_t nkey,
Error **errp)
{
- if (alg < 0 ||
- alg >= QCRYPTO_CIPHER_ALG_LAST) {
+ if ((unsigned)alg >= QCRYPTO_CIPHER_ALG_LAST) {
error_setg(errp, "Cipher algorithm %d out of range",
alg);
return false;
- [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Peter Maydell, 2015/07/08
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Paolo Bonzini, 2015/07/08
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Daniel P. Berrange, 2015/07/24
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Paolo Bonzini, 2015/07/24
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Peter Maydell, 2015/07/24
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Paolo Bonzini, 2015/07/24
- Re: [Qemu-devel] [PULL v3 00/12] Final changes for 2.4-rc0, Peter Maydell, 2015/07/24