Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: Makefile - replace the use of <module>-objs with <module>-y crypto: hifn_795x - use cancel_delayed_work_sync() crypto: talitos - sparse check endian fixes crypto: talitos - fix checkpatch warning crypto: talitos - fix warning: 'alg' may be used uninitialized in this function crypto: cryptd - Adding the AEAD interface type support to cryptd crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES crypto: Kconfig - update broken web addresses crypto: omap-sham - Adjust DMA parameters crypto: fips - FIPS requires algorithm self-tests crypto: omap-aes - OMAP2/3 AES hw accelerator driver crypto: updates to enable omap aes padata: add missing __percpu markup in include/linux/padata.h MAINTAINERS: Add maintainer entries for padata/pcrypt
This commit is contained in:
@ -23,13 +23,12 @@ comment "Crypto core or helper"
|
||||
|
||||
config CRYPTO_FIPS
|
||||
bool "FIPS 200 compliance"
|
||||
depends on CRYPTO_ANSI_CPRNG
|
||||
depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
|
||||
help
|
||||
This options enables the fips boot option which is
|
||||
required if you want to system to operate in a FIPS 200
|
||||
certification. You should say no unless you know what
|
||||
this is. Note that CRYPTO_ANSI_CPRNG is required if this
|
||||
option is selected
|
||||
this is.
|
||||
|
||||
config CRYPTO_ALGAPI
|
||||
tristate
|
||||
@ -365,7 +364,7 @@ config CRYPTO_RMD128
|
||||
RIPEMD-160 should be used.
|
||||
|
||||
Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
|
||||
See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
|
||||
config CRYPTO_RMD160
|
||||
tristate "RIPEMD-160 digest algorithm"
|
||||
@ -382,7 +381,7 @@ config CRYPTO_RMD160
|
||||
against RIPEMD-160.
|
||||
|
||||
Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
|
||||
See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
|
||||
config CRYPTO_RMD256
|
||||
tristate "RIPEMD-256 digest algorithm"
|
||||
@ -394,7 +393,7 @@ config CRYPTO_RMD256
|
||||
(than RIPEMD-128).
|
||||
|
||||
Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
|
||||
See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
|
||||
config CRYPTO_RMD320
|
||||
tristate "RIPEMD-320 digest algorithm"
|
||||
@ -406,7 +405,7 @@ config CRYPTO_RMD320
|
||||
(than RIPEMD-160).
|
||||
|
||||
Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
|
||||
See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
|
||||
|
||||
config CRYPTO_SHA1
|
||||
tristate "SHA1 digest algorithm"
|
||||
@ -461,7 +460,7 @@ config CRYPTO_WP512
|
||||
Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
|
||||
|
||||
See also:
|
||||
<http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
|
||||
<http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html>
|
||||
|
||||
config CRYPTO_GHASH_CLMUL_NI_INTEL
|
||||
tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
|
||||
@ -579,8 +578,8 @@ config CRYPTO_ANUBIS
|
||||
in the NESSIE competition.
|
||||
|
||||
See also:
|
||||
<https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
|
||||
<http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
|
||||
<https://www.cosic.esat.kuleuven.be/nessie/reports/>
|
||||
<http://www.larc.usp.br/~pbarreto/AnubisPage.html>
|
||||
|
||||
config CRYPTO_ARC4
|
||||
tristate "ARC4 cipher algorithm"
|
||||
@ -659,7 +658,7 @@ config CRYPTO_KHAZAD
|
||||
on 32-bit processors. Khazad uses an 128 bit key size.
|
||||
|
||||
See also:
|
||||
<http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
|
||||
<http://www.larc.usp.br/~pbarreto/KhazadPage.html>
|
||||
|
||||
config CRYPTO_SALSA20
|
||||
tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)"
|
||||
|
206
crypto/cryptd.c
206
crypto/cryptd.c
@ -3,6 +3,13 @@
|
||||
*
|
||||
* Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
|
||||
*
|
||||
* Added AEAD support to cryptd.
|
||||
* Authors: Tadeusz Struk (tadeusz.struk@intel.com)
|
||||
* Adrian Hoban <adrian.hoban@intel.com>
|
||||
* Gabriele Paoloni <gabriele.paoloni@intel.com>
|
||||
* Aidan O'Mahony (aidan.o.mahony@intel.com)
|
||||
* Copyright (c) 2010, Intel Corporation.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or (at your option)
|
||||
@ -12,6 +19,7 @@
|
||||
|
||||
#include <crypto/algapi.h>
|
||||
#include <crypto/internal/hash.h>
|
||||
#include <crypto/internal/aead.h>
|
||||
#include <crypto/cryptd.h>
|
||||
#include <crypto/crypto_wq.h>
|
||||
#include <linux/err.h>
|
||||
@ -44,6 +52,11 @@ struct hashd_instance_ctx {
|
||||
struct cryptd_queue *queue;
|
||||
};
|
||||
|
||||
struct aead_instance_ctx {
|
||||
struct crypto_aead_spawn aead_spawn;
|
||||
struct cryptd_queue *queue;
|
||||
};
|
||||
|
||||
struct cryptd_blkcipher_ctx {
|
||||
struct crypto_blkcipher *child;
|
||||
};
|
||||
@ -61,6 +74,14 @@ struct cryptd_hash_request_ctx {
|
||||
struct shash_desc desc;
|
||||
};
|
||||
|
||||
struct cryptd_aead_ctx {
|
||||
struct crypto_aead *child;
|
||||
};
|
||||
|
||||
struct cryptd_aead_request_ctx {
|
||||
crypto_completion_t complete;
|
||||
};
|
||||
|
||||
static void cryptd_queue_worker(struct work_struct *work);
|
||||
|
||||
static int cryptd_init_queue(struct cryptd_queue *queue,
|
||||
@ -601,6 +622,144 @@ out_put_alg:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void cryptd_aead_crypt(struct aead_request *req,
|
||||
struct crypto_aead *child,
|
||||
int err,
|
||||
int (*crypt)(struct aead_request *req))
|
||||
{
|
||||
struct cryptd_aead_request_ctx *rctx;
|
||||
rctx = aead_request_ctx(req);
|
||||
|
||||
if (unlikely(err == -EINPROGRESS))
|
||||
goto out;
|
||||
aead_request_set_tfm(req, child);
|
||||
err = crypt( req );
|
||||
req->base.complete = rctx->complete;
|
||||
out:
|
||||
local_bh_disable();
|
||||
rctx->complete(&req->base, err);
|
||||
local_bh_enable();
|
||||
}
|
||||
|
||||
static void cryptd_aead_encrypt(struct crypto_async_request *areq, int err)
|
||||
{
|
||||
struct cryptd_aead_ctx *ctx = crypto_tfm_ctx(areq->tfm);
|
||||
struct crypto_aead *child = ctx->child;
|
||||
struct aead_request *req;
|
||||
|
||||
req = container_of(areq, struct aead_request, base);
|
||||
cryptd_aead_crypt(req, child, err, crypto_aead_crt(child)->encrypt);
|
||||
}
|
||||
|
||||
static void cryptd_aead_decrypt(struct crypto_async_request *areq, int err)
|
||||
{
|
||||
struct cryptd_aead_ctx *ctx = crypto_tfm_ctx(areq->tfm);
|
||||
struct crypto_aead *child = ctx->child;
|
||||
struct aead_request *req;
|
||||
|
||||
req = container_of(areq, struct aead_request, base);
|
||||
cryptd_aead_crypt(req, child, err, crypto_aead_crt(child)->decrypt);
|
||||
}
|
||||
|
||||
static int cryptd_aead_enqueue(struct aead_request *req,
|
||||
crypto_completion_t complete)
|
||||
{
|
||||
struct cryptd_aead_request_ctx *rctx = aead_request_ctx(req);
|
||||
struct crypto_aead *tfm = crypto_aead_reqtfm(req);
|
||||
struct cryptd_queue *queue = cryptd_get_queue(crypto_aead_tfm(tfm));
|
||||
|
||||
rctx->complete = req->base.complete;
|
||||
req->base.complete = complete;
|
||||
return cryptd_enqueue_request(queue, &req->base);
|
||||
}
|
||||
|
||||
static int cryptd_aead_encrypt_enqueue(struct aead_request *req)
|
||||
{
|
||||
return cryptd_aead_enqueue(req, cryptd_aead_encrypt );
|
||||
}
|
||||
|
||||
static int cryptd_aead_decrypt_enqueue(struct aead_request *req)
|
||||
{
|
||||
return cryptd_aead_enqueue(req, cryptd_aead_decrypt );
|
||||
}
|
||||
|
||||
static int cryptd_aead_init_tfm(struct crypto_tfm *tfm)
|
||||
{
|
||||
struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);
|
||||
struct aead_instance_ctx *ictx = crypto_instance_ctx(inst);
|
||||
struct crypto_aead_spawn *spawn = &ictx->aead_spawn;
|
||||
struct cryptd_aead_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
struct crypto_aead *cipher;
|
||||
|
||||
cipher = crypto_spawn_aead(spawn);
|
||||
if (IS_ERR(cipher))
|
||||
return PTR_ERR(cipher);
|
||||
|
||||
crypto_aead_set_flags(cipher, CRYPTO_TFM_REQ_MAY_SLEEP);
|
||||
ctx->child = cipher;
|
||||
tfm->crt_aead.reqsize = sizeof(struct cryptd_aead_request_ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void cryptd_aead_exit_tfm(struct crypto_tfm *tfm)
|
||||
{
|
||||
struct cryptd_aead_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
crypto_free_aead(ctx->child);
|
||||
}
|
||||
|
||||
static int cryptd_create_aead(struct crypto_template *tmpl,
|
||||
struct rtattr **tb,
|
||||
struct cryptd_queue *queue)
|
||||
{
|
||||
struct aead_instance_ctx *ctx;
|
||||
struct crypto_instance *inst;
|
||||
struct crypto_alg *alg;
|
||||
int err;
|
||||
|
||||
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_AEAD,
|
||||
CRYPTO_ALG_TYPE_MASK);
|
||||
if (IS_ERR(alg))
|
||||
return PTR_ERR(alg);
|
||||
|
||||
inst = cryptd_alloc_instance(alg, 0, sizeof(*ctx));
|
||||
err = PTR_ERR(inst);
|
||||
if (IS_ERR(inst))
|
||||
goto out_put_alg;
|
||||
|
||||
ctx = crypto_instance_ctx(inst);
|
||||
ctx->queue = queue;
|
||||
|
||||
err = crypto_init_spawn(&ctx->aead_spawn.base, alg, inst,
|
||||
CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
|
||||
if (err)
|
||||
goto out_free_inst;
|
||||
|
||||
inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
|
||||
inst->alg.cra_type = alg->cra_type;
|
||||
inst->alg.cra_ctxsize = sizeof(struct cryptd_aead_ctx);
|
||||
inst->alg.cra_init = cryptd_aead_init_tfm;
|
||||
inst->alg.cra_exit = cryptd_aead_exit_tfm;
|
||||
inst->alg.cra_aead.setkey = alg->cra_aead.setkey;
|
||||
inst->alg.cra_aead.setauthsize = alg->cra_aead.setauthsize;
|
||||
inst->alg.cra_aead.geniv = alg->cra_aead.geniv;
|
||||
inst->alg.cra_aead.ivsize = alg->cra_aead.ivsize;
|
||||
inst->alg.cra_aead.maxauthsize = alg->cra_aead.maxauthsize;
|
||||
inst->alg.cra_aead.encrypt = cryptd_aead_encrypt_enqueue;
|
||||
inst->alg.cra_aead.decrypt = cryptd_aead_decrypt_enqueue;
|
||||
inst->alg.cra_aead.givencrypt = alg->cra_aead.givencrypt;
|
||||
inst->alg.cra_aead.givdecrypt = alg->cra_aead.givdecrypt;
|
||||
|
||||
err = crypto_register_instance(tmpl, inst);
|
||||
if (err) {
|
||||
crypto_drop_spawn(&ctx->aead_spawn.base);
|
||||
out_free_inst:
|
||||
kfree(inst);
|
||||
}
|
||||
out_put_alg:
|
||||
crypto_mod_put(alg);
|
||||
return err;
|
||||
}
|
||||
|
||||
static struct cryptd_queue queue;
|
||||
|
||||
static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)
|
||||
@ -616,6 +775,8 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)
|
||||
return cryptd_create_blkcipher(tmpl, tb, &queue);
|
||||
case CRYPTO_ALG_TYPE_DIGEST:
|
||||
return cryptd_create_hash(tmpl, tb, &queue);
|
||||
case CRYPTO_ALG_TYPE_AEAD:
|
||||
return cryptd_create_aead(tmpl, tb, &queue);
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
@ -625,16 +786,21 @@ static void cryptd_free(struct crypto_instance *inst)
|
||||
{
|
||||
struct cryptd_instance_ctx *ctx = crypto_instance_ctx(inst);
|
||||
struct hashd_instance_ctx *hctx = crypto_instance_ctx(inst);
|
||||
struct aead_instance_ctx *aead_ctx = crypto_instance_ctx(inst);
|
||||
|
||||
switch (inst->alg.cra_flags & CRYPTO_ALG_TYPE_MASK) {
|
||||
case CRYPTO_ALG_TYPE_AHASH:
|
||||
crypto_drop_shash(&hctx->spawn);
|
||||
kfree(ahash_instance(inst));
|
||||
return;
|
||||
case CRYPTO_ALG_TYPE_AEAD:
|
||||
crypto_drop_spawn(&aead_ctx->aead_spawn.base);
|
||||
kfree(inst);
|
||||
return;
|
||||
default:
|
||||
crypto_drop_spawn(&ctx->spawn);
|
||||
kfree(inst);
|
||||
}
|
||||
|
||||
crypto_drop_spawn(&ctx->spawn);
|
||||
kfree(inst);
|
||||
}
|
||||
|
||||
static struct crypto_template cryptd_tmpl = {
|
||||
@ -724,6 +890,40 @@ void cryptd_free_ahash(struct cryptd_ahash *tfm)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cryptd_free_ahash);
|
||||
|
||||
struct cryptd_aead *cryptd_alloc_aead(const char *alg_name,
|
||||
u32 type, u32 mask)
|
||||
{
|
||||
char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
|
||||
struct crypto_aead *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_aead(cryptd_alg_name, type, mask);
|
||||
if (IS_ERR(tfm))
|
||||
return ERR_CAST(tfm);
|
||||
if (tfm->base.__crt_alg->cra_module != THIS_MODULE) {
|
||||
crypto_free_aead(tfm);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
return __cryptd_aead_cast(tfm);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cryptd_alloc_aead);
|
||||
|
||||
struct crypto_aead *cryptd_aead_child(struct cryptd_aead *tfm)
|
||||
{
|
||||
struct cryptd_aead_ctx *ctx;
|
||||
ctx = crypto_aead_ctx(&tfm->base);
|
||||
return ctx->child;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cryptd_aead_child);
|
||||
|
||||
void cryptd_free_aead(struct cryptd_aead *tfm)
|
||||
{
|
||||
crypto_free_aead(&tfm->base);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cryptd_free_aead);
|
||||
|
||||
static int __init cryptd_init(void)
|
||||
{
|
||||
int err;
|
||||
|
Reference in New Issue
Block a user