diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /include/linux/crypto.h | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r-- | include/linux/crypto.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index b92eadf92d7..e5e468e9133 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -18,9 +18,9 @@ | |||
18 | #define _LINUX_CRYPTO_H | 18 | #define _LINUX_CRYPTO_H |
19 | 19 | ||
20 | #include <linux/atomic.h> | 20 | #include <linux/atomic.h> |
21 | #include <linux/module.h> | ||
21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
22 | #include <linux/list.h> | 23 | #include <linux/list.h> |
23 | #include <linux/bug.h> | ||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
26 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
@@ -72,16 +72,6 @@ | |||
72 | #define CRYPTO_ALG_TESTED 0x00000400 | 72 | #define CRYPTO_ALG_TESTED 0x00000400 |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * Set if the algorithm is an instance that is build from templates. | ||
76 | */ | ||
77 | #define CRYPTO_ALG_INSTANCE 0x00000800 | ||
78 | |||
79 | /* Set this bit if the algorithm provided is hardware accelerated but | ||
80 | * not available to userspace via instruction set or so. | ||
81 | */ | ||
82 | #define CRYPTO_ALG_KERN_DRIVER_ONLY 0x00001000 | ||
83 | |||
84 | /* | ||
85 | * Transform masks and values (for crt_flags). | 75 | * Transform masks and values (for crt_flags). |
86 | */ | 76 | */ |
87 | #define CRYPTO_TFM_REQ_MASK 0x000fff00 | 77 | #define CRYPTO_TFM_REQ_MASK 0x000fff00 |
@@ -315,8 +305,6 @@ struct crypto_alg { | |||
315 | */ | 305 | */ |
316 | int crypto_register_alg(struct crypto_alg *alg); | 306 | int crypto_register_alg(struct crypto_alg *alg); |
317 | int crypto_unregister_alg(struct crypto_alg *alg); | 307 | int crypto_unregister_alg(struct crypto_alg *alg); |
318 | int crypto_register_algs(struct crypto_alg *algs, int count); | ||
319 | int crypto_unregister_algs(struct crypto_alg *algs, int count); | ||
320 | 308 | ||
321 | /* | 309 | /* |
322 | * Algorithm query interface. | 310 | * Algorithm query interface. |
@@ -517,6 +505,11 @@ static inline int crypto_tfm_alg_priority(struct crypto_tfm *tfm) | |||
517 | return tfm->__crt_alg->cra_priority; | 505 | return tfm->__crt_alg->cra_priority; |
518 | } | 506 | } |
519 | 507 | ||
508 | static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm) | ||
509 | { | ||
510 | return module_name(tfm->__crt_alg->cra_module); | ||
511 | } | ||
512 | |||
520 | static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm) | 513 | static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm) |
521 | { | 514 | { |
522 | return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK; | 515 | return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK; |