2009-01-16 07:10:23

by Huang, Ying

[permalink] [raw]

Subject: [PATCH crypto -v5 1/2] AES-NI: Add support to access underlying blkcipher under cryptd ablkcipher

---

cryptd_alloc_ablkcipher() will allocate a cryptd-ed ablkcipher for
specified algorithm name. The new allocated one is guaranteed to be
cryptd-ed ablkcipher, so the blkcipher underlying can be gotten via
cryptd_ablkcipher_child().


v5:

- Move declaration to crypto/cryptd.h

- Fix allocation error processing in cryptd_alloc_ablkcipher()

Signed-off-by: Huang Ying <[email protected]>

---
crypto/cryptd.c | 33 +++++++++++++++++++++++++++++++++
include/crypto/cryptd.h | 27 +++++++++++++++++++++++++++
2 files changed, 60 insertions(+)

--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -12,6 +12,7 @@

#include <crypto/algapi.h>
#include <crypto/internal/hash.h>
+#include <crypto/cryptd.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -537,6 +538,38 @@ static struct crypto_template cryptd_tmp
.module = THIS_MODULE,
};

+struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,
+ u32 type, u32 mask)
+{
+ char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
+ struct crypto_ablkcipher *tfm;
+
+ if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
+ "cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
+ return ERR_PTR(-EINVAL);
+ tfm = crypto_alloc_ablkcipher(cryptd_alg_name, type, mask);
+ if (IS_ERR(tfm))
+ return ERR_CAST(tfm);
+ if (crypto_ablkcipher_tfm(tfm)->__crt_alg->cra_module != THIS_MODULE)
+ return ERR_PTR(-EINVAL);
+
+ return __cryptd_ablkcipher_cast(tfm);
+}
+EXPORT_SYMBOL_GPL(cryptd_alloc_ablkcipher);
+
+struct crypto_blkcipher *cryptd_ablkcipher_child(struct cryptd_ablkcipher *tfm)
+{
+ struct cryptd_blkcipher_ctx *ctx = crypto_ablkcipher_ctx(&tfm->base);
+ return ctx->child;
+}
+EXPORT_SYMBOL_GPL(cryptd_ablkcipher_child);
+
+void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm)
+{
+ crypto_free_ablkcipher(&tfm->base);
+}
+EXPORT_SYMBOL_GPL(cryptd_free_ablkcipher);
+
static inline int cryptd_create_thread(struct cryptd_state *state,
int (*fn)(void *data), const char *name)
{
--- /dev/null
+++ b/include/crypto/cryptd.h
@@ -0,0 +1,27 @@
+/*
+ * Software async crypto daemon
+ */
+
+#ifndef _CRYPTO_CRYPT_H
+#define _CRYPTO_CRYPT_H
+
+#include <linux/crypto.h>
+#include <linux/kernel.h>
+
+struct cryptd_ablkcipher {
+ struct crypto_ablkcipher base;
+};
+
+static inline struct cryptd_ablkcipher *__cryptd_ablkcipher_cast(
+ struct crypto_ablkcipher *tfm)
+{
+ return (struct cryptd_ablkcipher *)tfm;
+}
+
+/* alg_name should be algorithm to be cryptd-ed */
+struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,
+ u32 type, u32 mask);
+struct crypto_blkcipher *cryptd_ablkcipher_child(struct cryptd_ablkcipher *tfm);
+void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm);
+
+#endif

---

Attachments:

signature.asc (197.00 B)
This is a digitally signed message part

2009-01-16 07:12:09

by Herbert Xu

[permalink] [raw]

Subject: Re: [PATCH crypto -v5 1/2] AES-NI: Add support to access underlying blkcipher under cryptd ablkcipher

---

On Fri, Jan 16, 2009 at 03:10:20PM +0800, Huang Ying wrote:
>
> v5:
>
> - Move declaration to crypto/cryptd.h
>
> - Fix allocation error processing in cryptd_alloc_ablkcipher()
>
> Signed-off-by: Huang Ying <[email protected]>

OK we're nearly there :)

> +struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,
> + u32 type, u32 mask)
> +{
> + char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
> + struct crypto_ablkcipher *tfm;
> +
> + if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
> + "cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
> + return ERR_PTR(-EINVAL);
> + tfm = crypto_alloc_ablkcipher(cryptd_alg_name, type, mask);
> + if (IS_ERR(tfm))
> + return ERR_CAST(tfm);
> + if (crypto_ablkcipher_tfm(tfm)->__crt_alg->cra_module != THIS_MODULE)
> + return ERR_PTR(-EINVAL);

Need to free the tfm here or it'll be leaked.

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt