From: Peter Maydell Date: Mon, 19 Sep 2016 16:10:06 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-09-19-2' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3d47a1390bd80b7b974185827a340012d21ad1e3;p=qemu.git Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-09-19-2' into staging Merge qcrypto 2016/09/19 v2 # gpg: Signature made Mon 19 Sep 2016 16:30:52 BST # gpg: using RSA key 0xBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange " # gpg: aka "Daniel P. Berrange " # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/pull-qcrypto-2016-09-19-2: crypto: add trace points for TLS cert verification crypto: support more hash algorithms for pbkdf crypto: increase default pbkdf2 time for luks to 2 seconds crypto: remove bogus /= 2 for pbkdf iterations crypto: use correct derived key size when timing pbkdf crypto: clear out buffer after timing pbkdf algorithm crypto: make PBKDF iterations configurable for LUKS format crypto: use uint64_t for pbkdf iteration count parameters Signed-off-by: Peter Maydell --- 3d47a1390bd80b7b974185827a340012d21ad1e3