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: v4.10-rc1~100
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/19c75bcbe0113cbbf05e4d89e0502a23358bfca9?hp=-c

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 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 --combined scripts/sign-file.c
index 53af6dc3e6c1,19ec468b1168..19ec468b1168
mode 100644,100755..100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@@ -267,7 -267,7 +267,7 @@@ int main(int argc, char **argv
  	}
  	x509_name = argv[2];
  	module_name = argv[3];
- 	if (argc == 5) {
+ 	if (argc == 5 && strcmp(argv[3], argv[4]) != 0) {
  		dest_name = argv[4];
  		replace_orig = false;
  	} else {