diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-25 10:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-25 10:48:23 -0700 |
| commit | 5d02f9af7a1ffc7d3f11da77e2cd9cb878d403c9 (patch) | |
| tree | a0acdfc71e55b88c24c76bf2b4ff28cc72acdf5a /crypto/asymmetric_keys/signature.c | |
| parent | 104f8303786d44331b0f8cd1e4d7d5346fe5a465 (diff) | |
| parent | eb87dc2017888231891a7806483d329a39befe13 (diff) | |
| download | linux-crypto-5d02f9af7a1ffc7d3f11da77e2cd9cb878d403c9.tar.gz linux-crypto-5d02f9af7a1ffc7d3f11da77e2cd9cb878d403c9.zip | |
Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a regression that broke iwd as well as a divide by zero in
iaa"
* tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: iaa - Fix nr_cpus < nr_iaa case
Revert "crypto: pkcs7 - remove sha1 support"
Diffstat (limited to 'crypto/asymmetric_keys/signature.c')
| -rw-r--r-- | crypto/asymmetric_keys/signature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/signature.c b/crypto/asymmetric_keys/signature.c index 398983be..2deff81f 100644 --- a/crypto/asymmetric_keys/signature.c +++ b/crypto/asymmetric_keys/signature.c @@ -115,7 +115,7 @@ EXPORT_SYMBOL_GPL(decrypt_blob); * Sign the specified data blob using the private key specified by params->key. * The signature is wrapped in an encoding if params->encoding is specified * (eg. "pkcs1"). If the encoding needs to know the digest type, this can be - * passed through params->hash_algo (eg. "sha512"). + * passed through params->hash_algo (eg. "sha1"). * * Returns the length of the data placed in the signature buffer or an error. */ |