projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4530cca 60c4081)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Aug 2017 17:33:49 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Aug 2017 17:33:49 +0000 (10:33 -0700)
commitd555eb6b363455997f1e3ab8604e323c28972ad5
treeaa35459d6c71b5887698ae7f1a0a5c7dd860dfe8tree | snapshot
parent4530cca1989b70b2c487ad5bcf82e608ab55f734commit | diff
parent60c4081ec4195389f4fa1fce83eaad5e4b948748commit | diff
Merge branch 'linus' of git://git./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
John Crispins staging tree