From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm0aA-0006RG-LK for qemu-devel@nongnu.org; Mon, 19 Sep 2016 11:34:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bm0a5-00072I-Hx for qemu-devel@nongnu.org; Mon, 19 Sep 2016 11:34:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm0a5-00072D-BL for qemu-devel@nongnu.org; Mon, 19 Sep 2016 11:34:05 -0400 From: "Daniel P. Berrange" Date: Mon, 19 Sep 2016 16:33:49 +0100 Message-Id: <1474299237-1054-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v2 0/8] Merge qcrypto 2016/09/19 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Daniel P. Berrange" 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-2 for you to fetch changes up to b57482d7a0fe669aeb6f0c3c3503d143b9db89dd: crypto: add trace points for TLS cert verification (2016-09-19 16:30:46 +0100) ---------------------------------------------------------------- Merge qcrypto 2016/09/19 v2 ---------------------------------------------------------------- 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