summaryrefslogtreecommitdiff
path: root/include/linux/crypto.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@intercode.com.au>2002-10-28 02:36:29 -0800
committerJames Morris <jmorris@intercode.com.au>2002-10-28 02:36:29 -0800
commit03882e044f1bbf3603a856652100652aeabe465a (patch)
tree56c11d0d5e6169dd9dd9772d7ac6d871ffa801a1 /include/linux/crypto.h
parent3ba6853fe600793fe4b732ddb3eb98acc072de70 (diff)
[CRYPTO]: Cleanups and more consistency checks.
- Removed local_bh_disable() from kmap wrapper, not needed now with two atomic kmaps. - Nuked atomic flag, use in_softirq() instead. - Converted crypto_kmap() and crypto_yield() to check in_softirq(). - Check CRYPTO_MAX_CIPHER_BLOCK_SIZE during alg init. - Try to initialize as much at compile time as possible (feedback from Christoph Hellwig). - Clean up list handling a bit (feedback from Christoph Hellwig).
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r--include/linux/crypto.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index cbe627423228..b93d806cbe6b 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -37,8 +37,7 @@
#define CRYPTO_TFM_MODE_CFB 0x00000004
#define CRYPTO_TFM_MODE_CTR 0x00000008
-#define CRYPTO_TFM_REQ_ATOMIC 0x00000100
-#define CRYPTO_TFM_REQ_WEAK_KEY 0x00000200
+#define CRYPTO_TFM_REQ_WEAK_KEY 0x00000100
#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000
#define CRYPTO_TFM_RES_BAD_KEY_LEN 0x00200000
@@ -52,7 +51,7 @@
*/
#define CRYPTO_UNSPEC 0
#define CRYPTO_MAX_ALG_NAME 64
-#define CRYPTO_MAX_BLOCK_SIZE 16
+#define CRYPTO_MAX_CIPHER_BLOCK_SIZE 16
struct scatterlist;