| commit | d555eb6b363455997f1e3ab8604e323c28972ad5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 09 10:33:49 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 09 10:33:49 2017 -0700 |
| tree | aa35459d6c71b5887698ae7f1a0a5c7dd860dfe8 | |
| parent | 4530cca1989b70b2c487ad5bcf82e608ab55f734 [diff] | |
| parent | 60c4081ec4195389f4fa1fce83eaad5e4b948748 [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "Fix two regressions in the inside-secure driver with respect to hmac(sha1)" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: inside-secure - fix the sha state length in hmac_sha1_setkey crypto: inside-secure - fix invalidation check in hmac_sha1_setkey