]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 849ee3d 7996094)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2015 18:46:44 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2015 18:46:44 +0000 (10:46 -0800)
commit9cfe5212745a41fbe7cba1a74289f5c66fc45c1f
tree5e2cf7b4b8ea1f0a9b318aa411602d4e48483489tree | snapshot
parent849ee3d46a7334e950fb17d1ac2cbe2c6b088f65commit | diff
parent79960943fdc114fd4583c9ab164b5c89da7aa601commit | diff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a couple of crypto drivers that were using memcmp to verify
  authentication tags.  They now use crypto_memneq instead"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: talitos - Fix timing leak in ESP ICV verification
  crypto: nx - Fix timing leak in GCM and CCM decryption
Michael's Linux tree.