diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-08-26 04:44:31 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2006-09-20 21:46:23 -0400 |
commit | 3ad819c61f5f8347f39cdcbe652b3c60ec615888 (patch) | |
tree | a323dbf1afe0180ceb1d5d7d4caf785742585f1b /include/linux/crypto.h | |
parent | 6010439f47e6b308c031dad7d99686030ef942dd (diff) |
[CRYPTO] api: Deprecate crypto_digest_* and crypto_alg_available
This patch marks the crypto_digest_* functions and crypto_alg_available
as deprecated. They've been replaced by crypto_hash_* and crypto_has_*
respectively.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r-- | include/linux/crypto.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 187c6ea91959..8f2ffa4caabf 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -241,9 +241,12 @@ int crypto_unregister_alg(struct crypto_alg *alg); | |||
241 | * Algorithm query interface. | 241 | * Algorithm query interface. |
242 | */ | 242 | */ |
243 | #ifdef CONFIG_CRYPTO | 243 | #ifdef CONFIG_CRYPTO |
244 | int crypto_alg_available(const char *name, u32 flags); | 244 | int crypto_alg_available(const char *name, u32 flags) |
245 | __deprecated_for_modules; | ||
245 | int crypto_has_alg(const char *name, u32 type, u32 mask); | 246 | int crypto_has_alg(const char *name, u32 type, u32 mask); |
246 | #else | 247 | #else |
248 | static int crypto_alg_available(const char *name, u32 flags); | ||
249 | __deprecated_for_modules; | ||
247 | static inline int crypto_alg_available(const char *name, u32 flags) | 250 | static inline int crypto_alg_available(const char *name, u32 flags) |
248 | { | 251 | { |
249 | return 0; | 252 | return 0; |
@@ -704,12 +707,15 @@ static inline void crypto_cipher_decrypt_one(struct crypto_cipher *tfm, | |||
704 | dst, src); | 707 | dst, src); |
705 | } | 708 | } |
706 | 709 | ||
707 | void crypto_digest_init(struct crypto_tfm *tfm); | 710 | void crypto_digest_init(struct crypto_tfm *tfm) __deprecated_for_modules; |
708 | void crypto_digest_update(struct crypto_tfm *tfm, | 711 | void crypto_digest_update(struct crypto_tfm *tfm, |
709 | struct scatterlist *sg, unsigned int nsg); | 712 | struct scatterlist *sg, unsigned int nsg) |
710 | void crypto_digest_final(struct crypto_tfm *tfm, u8 *out); | 713 | __deprecated_for_modules; |
714 | void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) | ||
715 | __deprecated_for_modules; | ||
711 | void crypto_digest_digest(struct crypto_tfm *tfm, | 716 | void crypto_digest_digest(struct crypto_tfm *tfm, |
712 | struct scatterlist *sg, unsigned int nsg, u8 *out); | 717 | struct scatterlist *sg, unsigned int nsg, u8 *out) |
718 | __deprecated_for_modules; | ||
713 | 719 | ||
714 | static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm) | 720 | static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm) |
715 | { | 721 | { |
@@ -723,6 +729,8 @@ static inline struct crypto_hash *crypto_hash_cast(struct crypto_tfm *tfm) | |||
723 | return __crypto_hash_cast(tfm); | 729 | return __crypto_hash_cast(tfm); |
724 | } | 730 | } |
725 | 731 | ||
732 | static int crypto_digest_setkey(struct crypto_tfm *tfm, const u8 *key, | ||
733 | unsigned int keylen) __deprecated; | ||
726 | static inline int crypto_digest_setkey(struct crypto_tfm *tfm, | 734 | static inline int crypto_digest_setkey(struct crypto_tfm *tfm, |
727 | const u8 *key, unsigned int keylen) | 735 | const u8 *key, unsigned int keylen) |
728 | { | 736 | { |