summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 22:41:37 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 22:41:37 +0300
commit19c75bcbe0113cbbf05e4d89e0502a23358bfca9 (patch)
tree544d6b73341ebc66802ae38732d8009d67008aab /scripts
parentee84595a91c60d33cbf1d5b941b04a3ee6cf7ce0 (diff)
parent18e615ad87bce9125ef3990377a4a946ec0f21f3 (diff)
downloadlinux-19c75bcbe0113cbbf05e4d89e0502a23358bfca9.tar.xz
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
Diffstat (limited to 'scripts')
-rw-r--r--scripts/sign-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 53af6dc3e6c1..19ec468b1168 100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -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 {