3 files changed, 0 insertions, 85 deletions

diff --git a/crypto/api.c b/crypto/api.c
index 4fb7fa45cb0d..8c446871cd5b 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -466,23 +466,8 @@ void crypto_free_tfm(struct crypto_tfm *tfm)
         kfree(tfm);
 }
 
-int crypto_alg_available(const char *name, u32 flags)
-{
-        int ret = 0;
-        struct crypto_alg *alg = crypto_alg_mod_lookup(name, 0,
-                                                       CRYPTO_ALG_ASYNC);
-        
-        if (!IS_ERR(alg)) {
-                crypto_mod_put(alg);
-                ret = 1;
-        }
-        
-        return ret;
-}
-
 EXPORT_SYMBOL_GPL(crypto_alloc_tfm);
 EXPORT_SYMBOL_GPL(crypto_free_tfm);
-EXPORT_SYMBOL_GPL(crypto_alg_available);
 
 int crypto_has_alg(const char *name, u32 type, u32 mask)
 {
diff --git a/crypto/digest.c b/crypto/digest.c
index 0155a94e4b15..8f4593268ce0 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -21,54 +21,6 @@
 #include "internal.h"
 #include "scatterwalk.h"
 
-void crypto_digest_init(struct crypto_tfm *tfm)
-{
-        struct crypto_hash *hash = crypto_hash_cast(tfm);
-        struct hash_desc desc = { .tfm = hash, .flags = tfm->crt_flags };
-
-        crypto_hash_init(&desc);
-}
-EXPORT_SYMBOL_GPL(crypto_digest_init);
-
-void crypto_digest_update(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg)
-{
-        struct crypto_hash *hash = crypto_hash_cast(tfm);
-        struct hash_desc desc = { .tfm = hash, .flags = tfm->crt_flags };
-        unsigned int nbytes = 0;
-        unsigned int i;
-
-        for (i = 0; i < nsg; i++)
-                nbytes += sg[i].length;
-
-        crypto_hash_update(&desc, sg, nbytes);
-}
-EXPORT_SYMBOL_GPL(crypto_digest_update);
-
-void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
-{
-        struct crypto_hash *hash = crypto_hash_cast(tfm);
-        struct hash_desc desc = { .tfm = hash, .flags = tfm->crt_flags };
-
-        crypto_hash_final(&desc, out);
-}
-EXPORT_SYMBOL_GPL(crypto_digest_final);
-
-void crypto_digest_digest(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg, u8 *out)
-{
-        struct crypto_hash *hash = crypto_hash_cast(tfm);
-        struct hash_desc desc = { .tfm = hash, .flags = tfm->crt_flags };
-        unsigned int nbytes = 0;
-        unsigned int i;
-
-        for (i = 0; i < nsg; i++)
-                nbytes += sg[i].length;
-
-        crypto_hash_digest(&desc, sg, nbytes, out);
-}
-EXPORT_SYMBOL_GPL(crypto_digest_digest);
-
 static int init(struct hash_desc *desc)
 {
         struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm);
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 6485e9716b36..4aa9046601da 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -241,12 +241,8 @@ int crypto_unregister_alg(struct crypto_alg *alg);
  * Algorithm query interface.
  */
 #ifdef CONFIG_CRYPTO
-int crypto_alg_available(const char *name, u32 flags)
-        __deprecated_for_modules;
 int crypto_has_alg(const char *name, u32 type, u32 mask);
 #else
-static int crypto_alg_available(const char *name, u32 flags)
-        __deprecated_for_modules;
 static inline int crypto_alg_available(const char *name, u32 flags)
 {
         return 0;
@@ -707,16 +703,6 @@ static inline void crypto_cipher_decrypt_one(struct crypto_cipher *tfm,
                                                 dst, src);
 }
 
-void crypto_digest_init(struct crypto_tfm *tfm) __deprecated_for_modules;
-void crypto_digest_update(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg)
-        __deprecated_for_modules;
-void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
-        __deprecated_for_modules;
-void crypto_digest_digest(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg, u8 *out)
-        __deprecated_for_modules;
-
 static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm)
 {
         return (struct crypto_hash *)tfm;
@@ -729,14 +715,6 @@ static inline struct crypto_hash *crypto_hash_cast(struct crypto_tfm *tfm)
         return __crypto_hash_cast(tfm);
 }
 
-static int crypto_digest_setkey(struct crypto_tfm *tfm, const u8 *key,
-                                unsigned int keylen) __deprecated;
-static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
-{
-        return tfm->crt_hash.setkey(crypto_hash_cast(tfm), key, keylen);
-}
-
 static inline struct crypto_hash *crypto_alloc_hash(const char *alg_name,
                                                     u32 type, u32 mask)
 {