Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2016 19:41:37 +0000 (11:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2016 19:41:37 +0000 (11:41 -0800)
commit19c75bcbe0113cbbf05e4d89e0502a23358bfca9
tree544d6b73341ebc66802ae38732d8009d67008aab
parentee84595a91c60d33cbf1d5b941b04a3ee6cf7ce0
parent18e615ad87bce9125ef3990377a4a946ec0f21f3
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - a crash regression in the new skcipher walker

   - incorrect return value in public_key_verify_signature

   - fix for in-place signing in the sign-file utility"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - fix crash in virtual walk
  sign-file: Fix inplace signing when src and dst names are both specified
  crypto: asymmetric_keys - set error code on failure
scripts/sign-file.c