aboutsummaryrefslogtreecommitdiffstats
path: root/include/crypto/algapi.h
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-17 07:07:31 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-10 16:16:42 -0500
commit378f4f51f9fdd8df80ea875320e2bf1d7c6e6e77 (patch)
treef38f23fa09ec7971546a0a3aa42a79cc055c455f /include/crypto/algapi.h
parent84c911523020a2e39b307a2da26ee1886b7214fe (diff)
[CRYPTO] skcipher: Add crypto_grab_skcipher interface
Note: From now on the collective of ablkcipher/blkcipher/givcipher will be known as skcipher, i.e., symmetric key cipher. The name blkcipher has always been much of a misnomer since it supports stream ciphers too. This patch adds the function crypto_grab_skcipher as a new way of getting an ablkcipher spawn. The problem is that previously we did this in two steps, first getting the algorithm and then calling crypto_init_spawn. This meant that each spawn user had to be aware of what type and mask to use for these two steps. This is difficult and also presents a problem when the type/mask changes as they're about to be for IV generators. The new interface does both steps together just like crypto_alloc_ablkcipher. As a side-effect this also allows us to be stronger on type enforcement for spawns. For now this is only done for ablkcipher but it's trivial to extend for other types. This patch also moves the type/mask logic for skcipher into the helpers crypto_skcipher_type and crypto_skcipher_mask. Finally this patch introduces the function crypto_require_sync to determine whether the user is specifically requesting a sync algorithm. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto/algapi.h')
-rw-r--r--include/crypto/algapi.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 726a765e5ec6..fda1759ffe2d 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -111,6 +111,12 @@ void crypto_drop_spawn(struct crypto_spawn *spawn);
111struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type, 111struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
112 u32 mask); 112 u32 mask);
113 113
114static inline void crypto_set_spawn(struct crypto_spawn *spawn,
115 struct crypto_instance *inst)
116{
117 spawn->inst = inst;
118}
119
114struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb); 120struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);
115int crypto_check_attr_type(struct rtattr **tb, u32 type); 121int crypto_check_attr_type(struct rtattr **tb, u32 type);
116const char *crypto_attr_alg_name(struct rtattr *rta); 122const char *crypto_attr_alg_name(struct rtattr *rta);
@@ -195,10 +201,9 @@ static inline struct crypto_instance *crypto_aead_alg_instance(
195static inline struct crypto_ablkcipher *crypto_spawn_ablkcipher( 201static inline struct crypto_ablkcipher *crypto_spawn_ablkcipher(
196 struct crypto_spawn *spawn) 202 struct crypto_spawn *spawn)
197{ 203{
198 u32 type = CRYPTO_ALG_TYPE_BLKCIPHER; 204 return __crypto_ablkcipher_cast(
199 u32 mask = CRYPTO_ALG_TYPE_BLKCIPHER_MASK; 205 crypto_spawn_tfm(spawn, crypto_skcipher_type(0),
200 206 crypto_skcipher_mask(0)));
201 return __crypto_ablkcipher_cast(crypto_spawn_tfm(spawn, type, mask));
202} 207}
203 208
204static inline struct crypto_blkcipher *crypto_spawn_blkcipher( 209static inline struct crypto_blkcipher *crypto_spawn_blkcipher(
@@ -308,5 +313,14 @@ static inline struct crypto_alg *crypto_get_attr_alg(struct rtattr **tb,
308 return crypto_attr_alg(tb[1], type, mask); 313 return crypto_attr_alg(tb[1], type, mask);
309} 314}
310 315
316/*
317 * Returns CRYPTO_ALG_ASYNC if type/mask requires the use of sync algorithms.
318 * Otherwise returns zero.
319 */
320static inline int crypto_requires_sync(u32 type, u32 mask)
321{
322 return (type ^ CRYPTO_ALG_ASYNC) & mask & CRYPTO_ALG_ASYNC;
323}
324
311#endif /* _CRYPTO_ALGAPI_H */ 325#endif /* _CRYPTO_ALGAPI_H */
312 326