Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 6f501de..5c511ba 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -88,9 +88,17 @@
  */
 #define CRYPTO_ALG_INSTANCE            0x00000800
 
+/*
+ * Set if the algorithm has a ->setkey() method but can be used without
+ * calling it first, i.e. there is a default key.
+ */
+#define CRYPTO_ALG_OPTIONAL_KEY                0x00004000
+
 /*
  * Transform masks and values (for crt_flags).
  */
+#define CRYPTO_TFM_NEED_KEY            0x00000001
+
 #define CRYPTO_TFM_REQ_MASK            0x000fff00
 #define CRYPTO_TFM_RES_MASK            0xfff00000