From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Dec 2016 19:41:37 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15~12257
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19c75bcbe0113cbbf05e4d89e0502a23358bfca9;p=platform%2Fkernel%2Flinux-starfive.git

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
---

19c75bcbe0113cbbf05e4d89e0502a23358bfca9
diff --cc scripts/sign-file.c
index 53af6dc,19ec468..19ec468
mode 100644,100755..100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c