diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 12:27:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 12:27:48 -0700 |
commit | b0690807eda0e60e297217baab301e099d94e215 (patch) | |
tree | 69dbbfb2719c39ed69c048ccba4a08d37638a4bf /crypto/akcipher.c | |
parent | 3842e003fd6c9048588ca2862310fb90b9e4dfe1 (diff) | |
parent | 72ae89b5ef7d867369a65458e7a3f4051affffae (diff) | |
download | linux-crypto-b0690807eda0e60e297217baab301e099d94e215.tar.gz linux-crypto-b0690807eda0e60e297217baab301e099d94e215.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- move -O0 jitterentropy code into its own file instead of using gcc
pragma magic.
- kill testmgr warning for gcm-aes-aesni.
- fix build failure in old rsa.
Other minor fixes:
- ignore asn1 files generated by new rsa.
- remove unnecessary kzfree NULL checks in jitterentropy.
- typo fix in akcipher"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: rsa - add .gitignore for crypto/*.-asn1.[ch] files
crypto: asymmetric_keys/rsa - Use non-conflicting variable name
crypto: testmgr - don't print info about missing test for gcm-aes-aesni
crypto: jitterentropy - Delete unnecessary checks before the function call "kzfree"
crypto: akcipher - fix spelling cihper -> cipher
crypto: jitterentropy - avoid compiler warnings
Diffstat (limited to 'crypto/akcipher.c')
-rw-r--r-- | crypto/akcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/akcipher.c b/crypto/akcipher.c index d7986414..528ae6aa 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -114,4 +114,4 @@ void crypto_unregister_akcipher(struct akcipher_alg *alg) EXPORT_SYMBOL_GPL(crypto_unregister_akcipher); MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Generic public key cihper type"); +MODULE_DESCRIPTION("Generic public key cipher type"); |