The following changes since commit 8c4575472494a5dfedfe05e7b58ca9ce3872ad56:
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging (2016-03-17 08:52:58 +0000) are available in the git repository at: git://github.com/berrange/qemu tags/pull-qcrypto-2016-03-17-1 for you to fetch changes up to 0a3d53cfda6f200c84c13c3818017e56edc761ba: crypto: implement the LUKS block encryption format (2016-03-17 12:42:33 +0000) ---------------------------------------------------------------- Merge QCrypto 2016/03/17 v1 ---------------------------------------------------------------- Daniel P. Berrange (13): crypto: add cryptographic random byte source crypto: add support for PBKDF2 algorithm crypto: add support for generating initialization vectors crypto: add support for anti-forensic split algorithm crypto: skip testing of unsupported cipher algorithms crypto: add support for the cast5-128 cipher algorithm crypto: add support for the serpent cipher algorithm crypto: add support for the twofish cipher algorithm crypto: import an implementation of the XTS cipher mode crypto: refactor code for dealing with AES cipher crypto: wire up XTS mode for cipher APIs crypto: add block encryption framework crypto: implement the LUKS block encryption format Makefile.objs | 2 +- configure | 32 ++ crypto/Makefile.objs | 17 + crypto/afsplit.c | 158 +++++ crypto/block-luks.c | 1328 +++++++++++++++++++++++++++++++++++++++++++ crypto/block-luks.h | 28 + crypto/block-qcow.c | 173 ++++++ crypto/block-qcow.h | 28 + crypto/block.c | 260 +++++++++ crypto/blockpriv.h | 92 +++ crypto/cipher-builtin.c | 207 +++++-- crypto/cipher-gcrypt.c | 171 +++++- crypto/cipher-nettle.c | 197 ++++++- crypto/cipher.c | 41 +- crypto/ivgen-essiv.c | 118 ++++ crypto/ivgen-essiv.h | 28 + crypto/ivgen-plain.c | 59 ++ crypto/ivgen-plain.h | 28 + crypto/ivgen-plain64.c | 59 ++ crypto/ivgen-plain64.h | 28 + crypto/ivgen.c | 99 ++++ crypto/ivgenpriv.h | 49 ++ crypto/pbkdf-gcrypt.c | 68 +++ crypto/pbkdf-nettle.c | 65 +++ crypto/pbkdf-stub.c | 42 ++ crypto/pbkdf.c | 77 +++ crypto/random-gcrypt.c | 33 ++ crypto/random-gnutls.c | 43 ++ crypto/random-stub.c | 31 + crypto/xts.c | 230 ++++++++ include/crypto/afsplit.h | 135 +++++ include/crypto/block.h | 232 ++++++++ include/crypto/ivgen.h | 206 +++++++ include/crypto/pbkdf.h | 152 +++++ include/crypto/random.h | 44 ++ include/crypto/xts.h | 86 +++ qapi/crypto.json | 146 ++++- tests/.gitignore | 5 + tests/Makefile | 10 + tests/test-crypto-afsplit.c | 193 +++++++ tests/test-crypto-block.c | 353 ++++++++++++ tests/test-crypto-cipher.c | 215 ++++++- tests/test-crypto-ivgen.c | 173 ++++++ tests/test-crypto-pbkdf.c | 388 +++++++++++++ tests/test-crypto-xts.c | 423 ++++++++++++++ 45 files changed, 6443 insertions(+), 109 deletions(-) create mode 100644 crypto/afsplit.c create mode 100644 crypto/block-luks.c create mode 100644 crypto/block-luks.h create mode 100644 crypto/block-qcow.c create mode 100644 crypto/block-qcow.h create mode 100644 crypto/block.c create mode 100644 crypto/blockpriv.h create mode 100644 crypto/ivgen-essiv.c create mode 100644 crypto/ivgen-essiv.h create mode 100644 crypto/ivgen-plain.c create mode 100644 crypto/ivgen-plain.h create mode 100644 crypto/ivgen-plain64.c create mode 100644 crypto/ivgen-plain64.h create mode 100644 crypto/ivgen.c create mode 100644 crypto/ivgenpriv.h create mode 100644 crypto/pbkdf-gcrypt.c create mode 100644 crypto/pbkdf-nettle.c create mode 100644 crypto/pbkdf-stub.c create mode 100644 crypto/pbkdf.c create mode 100644 crypto/random-gcrypt.c create mode 100644 crypto/random-gnutls.c create mode 100644 crypto/random-stub.c create mode 100644 crypto/xts.c create mode 100644 include/crypto/afsplit.h create mode 100644 include/crypto/block.h create mode 100644 include/crypto/ivgen.h create mode 100644 include/crypto/pbkdf.h create mode 100644 include/crypto/random.h create mode 100644 include/crypto/xts.h create mode 100644 tests/test-crypto-afsplit.c create mode 100644 tests/test-crypto-block.c create mode 100644 tests/test-crypto-ivgen.c create mode 100644 tests/test-crypto-pbkdf.c create mode 100644 tests/test-crypto-xts.c -- 2.5.0
