diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 17:10:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 17:10:06 +0100 |
| commit | 3d47a1390bd80b7b974185827a340012d21ad1e3 (patch) | |
| tree | efc8ae3427853eff1299f759ab86c5db746d0a7f /dtc | |
| parent | 55b90fc7660399d6c7ff0bddc509e4f622a80d0a (diff) | |
| parent | b57482d7a0fe669aeb6f0c3c3503d143b9db89dd (diff) | |
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 <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'dtc')
0 files changed, 0 insertions, 0 deletions