diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:01 -0700 |
| commit | 0b4d1afc94f1724db95c365d3e36f1578ac96dbc (patch) | |
| tree | 847b6201e4f0cb808dd111cc6830039a6d69ca95 /crypto/internal.h | |
| parent | 7f32197e5e5fbb3b6681a3aae1e5a07aa4e5aaa8 (diff) | |
| parent | a13f0cd0de008cb151bc99a4c7d12d1916118187 (diff) | |
| download | linux-crypto-0b4d1afc94f1724db95c365d3e36f1578ac96dbc.tar.gz linux-crypto-0b4d1afc94f1724db95c365d3e36f1578ac96dbc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (35 commits)
hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)
crypto: api - Use formatting of module name
crypto: testmgr - Allow hash test vectors longer than a page
crypto: testmgr - Check all test vector lengths
crypto: hifn_795x - fix __dev{init,exit} markings
crypto: tcrypt - Do not exit on success in fips mode
crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}
hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 builds
hwrng: via_rng - Support VIA Nano hardware RNG
hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not Chipset
crypto: testmgr - Skip algs not flagged fips_allowed in fips mode
crypto: testmgr - Mark algs allowed in fips mode
crypto: testmgr - Add ctr(aes) test vectors
crypto: testmgr - Dynamically allocate xbuf and axbuf
crypto: testmgr - Print self-test pass notices in fips mode
crypto: testmgr - Catch base cipher self-test failures in fips mode
crypto: testmgr - Add ansi_cprng test vectors
crypto: testmgr - Add infrastructure for ansi_cprng self-tests
crypto: testmgr - Add self-tests for rfc4309(ccm(aes))
crypto: testmgr - Handle AEAD test vectors expected to fail verification
...
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index fc76e1f3..113579a8 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -121,9 +121,6 @@ int crypto_register_notifier(struct notifier_block *nb); int crypto_unregister_notifier(struct notifier_block *nb); int crypto_probing_notify(unsigned long val, void *v); -int __init testmgr_init(void); -void testmgr_exit(void); - static inline void crypto_alg_put(struct crypto_alg *alg) { if (atomic_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy) |