---

yaml --- r: 267692 b: refs/heads/master c: 76de64d h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · f1bd0d2 · f1bd0d2
1 parent daffedc
commit f1bd0d2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c29fed1e5c1d0c31dceddc539f75c668b469f50b
+refs/heads/master: 76de64db13d0f05401d984bce45dbcf9a805cd84
diff --git a/trunk/drivers/staging/rtl8192e/internal.h b/trunk/drivers/staging/rtl8192e/internal.h
@@ -63,18 +63,13 @@ static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name)
 }
 #endif
 
-#ifdef CONFIG_CRYPTO_HMAC
-int crypto_alloc_hmac_block(struct crypto_tfm *tfm);
-void crypto_free_hmac_block(struct crypto_tfm *tfm);
-#else
 static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
 {
 	return 0;
 }
 
 static inline void crypto_free_hmac_block(struct crypto_tfm *tfm)
 { }
-#endif
 
 #ifdef CONFIG_PROC_FS
 void __init crypto_init_proc(void);

diff --git a/trunk/drivers/staging/rtl8192e/rtl_crypto.h b/trunk/drivers/staging/rtl8192e/rtl_crypto.h
@@ -168,9 +168,6 @@ struct digest_tfm {
 	                   unsigned int nsg, u8 *out);
 	int (*dit_setkey)(struct crypto_tfm *tfm,
 	                  const u8 *key, unsigned int keylen);
-#ifdef CONFIG_CRYPTO_HMAC
-	void *dit_hmac_block;
-#endif
 };
 
 struct compress_tfm {
@@ -382,17 +379,4 @@ static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
 	return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
 }
 
-/*
- * HMAC support.
- */
-#ifdef CONFIG_CRYPTO_HMAC
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
-void crypto_hmac_update(struct crypto_tfm *tfm,
-                        struct scatterlist *sg, unsigned int nsg);
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out);
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out);
-#endif	/* CONFIG_CRYPTO_HMAC */
-
 #endif	/* _LINUX_CRYPTO_H */