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
Showing the changes to scripts (1 of 3 files). Show all
Unified · Split
| @@ -267,7 +267,7 @@ int main(int argc, char **argv) · 266 unmodified lines | |||
| 267 | } | 267 | } |
| 268 | x509_name = argv[2]; | 268 | x509_name = argv[2]; |
| 269 | module_name = argv[3]; | 269 | module_name = argv[3]; |
| 270 | if (argc == 5) { | 270 | if (argc == 5 && strcmp(argv[3], argv[4]) != 0) { |
| 271 | dest_name = argv[4]; | 271 | dest_name = argv[4]; |
| 272 | replace_orig = false; | 272 | replace_orig = false; |
| 273 | } else { | 273 | } else { |