diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 10:22:57 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 10:22:57 +0300 |
| commit | 0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch) | |
| tree | b6e4b6cae1028a310a3488ebf745954c51694bfc /crypto/internal.h | |
| parent | 3218c178b41b420cb7e0d120c7a137a3969242e5 (diff) | |
| parent | 9e43f0de690211cf7153b5f3ec251bc315647ada (diff) | |
| download | linux-0ff555192a8d20385d49d1c420e2e8d409b3c0da.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 683fcb2d91f4..8ef72d76092e 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -26,6 +26,12 @@ #include <linux/rwsem.h> #include <linux/slab.h> +#ifdef CONFIG_CRYPTO_FIPS +extern int fips_enabled; +#else +#define fips_enabled 0 +#endif + /* Crypto notification events. */ enum { CRYPTO_MSG_ALG_REQUEST, @@ -82,7 +88,7 @@ static inline unsigned int crypto_compress_ctxsize(struct crypto_alg *alg) } struct crypto_alg *crypto_mod_get(struct crypto_alg *alg); -struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask); +struct crypto_alg *crypto_alg_lookup(const char *name, u32 type, u32 mask); struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask); int crypto_init_digest_ops(struct crypto_tfm *tfm); @@ -94,9 +100,11 @@ void crypto_exit_digest_ops(struct crypto_tfm *tfm); void crypto_exit_cipher_ops(struct crypto_tfm *tfm); void crypto_exit_compress_ops(struct crypto_tfm *tfm); +struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask); void crypto_larval_kill(struct crypto_alg *alg); struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask); void crypto_larval_error(const char *name, u32 type, u32 mask); +void crypto_alg_tested(const char *name, int err); void crypto_shoot_alg(struct crypto_alg *alg); struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, @@ -107,6 +115,10 @@ int crypto_register_instance(struct crypto_template *tmpl, 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) { @@ -139,9 +151,9 @@ static inline int crypto_is_moribund(struct crypto_alg *alg) return alg->cra_flags & (CRYPTO_ALG_DEAD | CRYPTO_ALG_DYING); } -static inline int crypto_notify(unsigned long val, void *v) +static inline void crypto_notify(unsigned long val, void *v) { - return blocking_notifier_call_chain(&crypto_chain, val, v); + blocking_notifier_call_chain(&crypto_chain, val, v); } #endif /* _CRYPTO_INTERNAL_H */ |