diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 22:27:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 22:27:48 +0300 |
| commit | a2f54be94f4cbce269bca6188d3fb4310c346fd1 (patch) | |
| tree | e323af2baad99ec751c4f052d76d3b5b5bbb7522 /crypto/testmgr.c | |
| parent | e8a0b37d28ace440776c0a4fe3c65f5832a9a7ee (diff) | |
| parent | 44a17ef872fa8f754626aa578c8d05301c905b86 (diff) | |
| download | linux-a2f54be94f4cbce269bca6188d3fb4310c346fd1.tar.xz | |
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/testmgr.c')
| -rw-r--r-- | crypto/testmgr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 975e1eac3e2d..d0a42bd3aae9 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -2056,6 +2056,10 @@ static const struct alg_test_desc alg_test_descs[] = { .alg = "__driver-ecb-twofish-avx", .test = alg_test_null, }, { + .alg = "__driver-gcm-aes-aesni", + .test = alg_test_null, + .fips_allowed = 1, + }, { .alg = "__ghash-pclmulqdqni", .test = alg_test_null, .fips_allowed = 1, |