The following changes since commit 0f2fa73ba0ca19ebdaccf0d1785583d6601411b6:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
(2016-09-19 11:23:20 +0100)
are available in the git repository at:
git://github.com/berrange/qemu tags/pull-qcrypto-2016-09-19-1
for you to fetch changes up to 7b1f229a860fa98258a345923dd35df1097838b2:
crypto: add trace points for TLS cert verification (2016-09-19 12:22:22 +0100)
----------------------------------------------------------------
Merge qcrypto 2016/09/19 v1
----------------------------------------------------------------
Daniel P. Berrange (8):
crypto: use uint64_t for pbkdf iteration count parameters
crypto: make PBKDF iterations configurable for LUKS format
crypto: clear out buffer after timing pbkdf algorithm
crypto: use correct derived key size when timing pbkdf
crypto: remove bogus /= 2 for pbkdf iterations
crypto: increase default pbkdf2 time for luks to 2 seconds
crypto: support more hash algorithms for pbkdf
crypto: add trace points for TLS cert verification
block/crypto.c | 6 ++++++
crypto/block-luks.c | 78
+++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
crypto/pbkdf-gcrypt.c | 21 +++++++++++++++++++--
crypto/pbkdf-nettle.c | 71
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
crypto/pbkdf-stub.c | 2 +-
crypto/pbkdf.c | 35 +++++++++++++++++++----------------
crypto/tlssession.c | 10 ++++++++--
crypto/trace-events | 1 +
include/crypto/pbkdf.h | 16 ++++++++++------
qapi/crypto.json | 6 +++++-
tests/test-crypto-pbkdf.c | 54
+++++++++++++++++++++++++++++++++++++++++++++++++++++-
11 files changed, 238 insertions(+), 62 deletions(-)
--
2.7.4
