diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-02-18 03:56:59 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-02-18 03:56:59 -0500 |
commit | 3f683d6175748ef9daf4698d9ef5a488dd037063 (patch) | |
tree | 1cea62b5937871b34c533416e05bedbee4a4914c /crypto/internal.h | |
parent | ff753308d2f70f210ba468492cd9a01274d9d7ce (diff) |
crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
This is based on a report and patch by Geert Uytterhoeven.
The functions crypto_alloc_tfm and create_create_tfm return a
pointer that needs to be adjusted by the caller when successful
and otherwise an error value. This means that the caller has
to check for the error and only perform the adjustment if the
pointer returned is valid.
Since all callers want to make the adjustment and we know how
to adjust it ourselves, it's much easier to just return adjusted
pointer directly.
The only caveat is that we have to return a void * instead of
struct crypto_tfm *. However, this isn't that bad because both
of these functions are for internal use only (by types code like
shash.c, not even algorithms code).
This patch also moves crypto_alloc_tfm into crypto/internal.h
(crypto_create_tfm is already there) to reflect this.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/internal.h')
-rw-r--r-- | crypto/internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 3c19a27a7563..fc76e1f37fc3 100644 --- a/crypto/internal.h +++ b/crypto/internal.h | |||
@@ -109,8 +109,10 @@ void crypto_alg_tested(const char *name, int err); | |||
109 | void crypto_shoot_alg(struct crypto_alg *alg); | 109 | void crypto_shoot_alg(struct crypto_alg *alg); |
110 | struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, | 110 | struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, |
111 | u32 mask); | 111 | u32 mask); |
112 | struct crypto_tfm *crypto_create_tfm(struct crypto_alg *alg, | 112 | void *crypto_create_tfm(struct crypto_alg *alg, |
113 | const struct crypto_type *frontend); | 113 | const struct crypto_type *frontend); |
114 | void *crypto_alloc_tfm(const char *alg_name, | ||
115 | const struct crypto_type *frontend, u32 type, u32 mask); | ||
114 | 116 | ||
115 | int crypto_register_instance(struct crypto_template *tmpl, | 117 | int crypto_register_instance(struct crypto_template *tmpl, |
116 | struct crypto_instance *inst); | 118 | struct crypto_instance *inst); |