Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "Here is the crypto update for 5.3: API: - Test shash interface directly in testmgr - cra_driver_name is now mandatory Algorithms: - Replace arc4 crypto_cipher with library helper - Implement 5 way interleave for ECB, CBC and CTR on arm64 - Add xxhash - Add continuous self-test on noise source to drbg - Update jitter RNG Drivers: - Add support for SHA204A random number generator - Add support for 7211 in iproc-rng200 - Fix fuzz test failures in inside-secure - Fix fuzz test failures in talitos - Fix fuzz test failures in qat" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (143 commits) crypto: stm32/hash - remove interruptible condition for dma crypto: stm32/hash - Fix hmac issue more than 256 bytes crypto: stm32/crc32 - rename driver file crypto: amcc - remove memset after dma_alloc_coherent crypto: ccp - Switch to SPDX license identifiers crypto: ccp - Validate the the error value used to index error messages crypto: doc - Fix formatting of new crypto engine content crypto: doc - Add parameter documentation crypto: arm64/aes-ce - implement 5 way interleave for ECB, CBC and CTR crypto: arm64/aes-ce - add 5 way interleave routines crypto: talitos - drop icv_ool crypto: talitos - fix hash on SEC1. crypto: talitos - move struct talitos_edesc into talitos.h lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE crypto/NX: Set receive window credits to max number of CRBs in RxFIFO crypto: asymmetric_keys - select CRYPTO_HASH where needed crypto: serpent - mark __serpent_setkey_sbox noinline crypto: testmgr - dynamically allocate crypto_shash crypto: testmgr - dynamically allocate testvec_config crypto: talitos - eliminate unneeded 'done' functions at build time ...
このコミットが含まれているのは:
Linus Torvalds
@@ -7,62 +7,51 @@
|
||||
* Author: Marcelo Henrique Cerri <mhcerri@br.ibm.com>
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/crypto.h>
|
||||
#include <linux/delay.h>
|
||||
#include <asm/simd.h>
|
||||
#include <asm/switch_to.h>
|
||||
#include <crypto/aes.h>
|
||||
#include <crypto/internal/simd.h>
|
||||
#include <crypto/scatterwalk.h>
|
||||
#include <crypto/skcipher.h>
|
||||
#include <crypto/internal/skcipher.h>
|
||||
|
||||
#include "aesp8-ppc.h"
|
||||
|
||||
struct p8_aes_ctr_ctx {
|
||||
struct crypto_sync_skcipher *fallback;
|
||||
struct crypto_skcipher *fallback;
|
||||
struct aes_key enc_key;
|
||||
};
|
||||
|
||||
static int p8_aes_ctr_init(struct crypto_tfm *tfm)
|
||||
static int p8_aes_ctr_init(struct crypto_skcipher *tfm)
|
||||
{
|
||||
const char *alg = crypto_tfm_alg_name(tfm);
|
||||
struct crypto_sync_skcipher *fallback;
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
struct crypto_skcipher *fallback;
|
||||
|
||||
fallback = crypto_alloc_sync_skcipher(alg, 0,
|
||||
CRYPTO_ALG_NEED_FALLBACK);
|
||||
fallback = crypto_alloc_skcipher("ctr(aes)", 0,
|
||||
CRYPTO_ALG_NEED_FALLBACK |
|
||||
CRYPTO_ALG_ASYNC);
|
||||
if (IS_ERR(fallback)) {
|
||||
printk(KERN_ERR
|
||||
"Failed to allocate transformation for '%s': %ld\n",
|
||||
alg, PTR_ERR(fallback));
|
||||
pr_err("Failed to allocate ctr(aes) fallback: %ld\n",
|
||||
PTR_ERR(fallback));
|
||||
return PTR_ERR(fallback);
|
||||
}
|
||||
|
||||
crypto_sync_skcipher_set_flags(
|
||||
fallback,
|
||||
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
|
||||
crypto_skcipher_set_reqsize(tfm, sizeof(struct skcipher_request) +
|
||||
crypto_skcipher_reqsize(fallback));
|
||||
ctx->fallback = fallback;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void p8_aes_ctr_exit(struct crypto_tfm *tfm)
|
||||
static void p8_aes_ctr_exit(struct crypto_skcipher *tfm)
|
||||
{
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
|
||||
if (ctx->fallback) {
|
||||
crypto_free_sync_skcipher(ctx->fallback);
|
||||
ctx->fallback = NULL;
|
||||
}
|
||||
crypto_free_skcipher(ctx->fallback);
|
||||
}
|
||||
|
||||
static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
|
||||
static int p8_aes_ctr_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
||||
unsigned int keylen)
|
||||
{
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
int ret;
|
||||
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
|
||||
preempt_disable();
|
||||
pagefault_disable();
|
||||
@@ -72,13 +61,13 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
|
||||
pagefault_enable();
|
||||
preempt_enable();
|
||||
|
||||
ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
|
||||
ret |= crypto_skcipher_setkey(ctx->fallback, key, keylen);
|
||||
|
||||
return ret ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,
|
||||
struct blkcipher_walk *walk)
|
||||
static void p8_aes_ctr_final(const struct p8_aes_ctr_ctx *ctx,
|
||||
struct skcipher_walk *walk)
|
||||
{
|
||||
u8 *ctrblk = walk->iv;
|
||||
u8 keystream[AES_BLOCK_SIZE];
|
||||
@@ -98,77 +87,63 @@ static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,
|
||||
crypto_inc(ctrblk, AES_BLOCK_SIZE);
|
||||
}
|
||||
|
||||
static int p8_aes_ctr_crypt(struct blkcipher_desc *desc,
|
||||
struct scatterlist *dst,
|
||||
struct scatterlist *src, unsigned int nbytes)
|
||||
static int p8_aes_ctr_crypt(struct skcipher_request *req)
|
||||
{
|
||||
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
|
||||
const struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
struct skcipher_walk walk;
|
||||
unsigned int nbytes;
|
||||
int ret;
|
||||
u64 inc;
|
||||
struct blkcipher_walk walk;
|
||||
struct p8_aes_ctr_ctx *ctx =
|
||||
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
|
||||
|
||||
if (!crypto_simd_usable()) {
|
||||
SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
|
||||
skcipher_request_set_sync_tfm(req, ctx->fallback);
|
||||
skcipher_request_set_callback(req, desc->flags, NULL, NULL);
|
||||
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
|
||||
ret = crypto_skcipher_encrypt(req);
|
||||
skcipher_request_zero(req);
|
||||
} else {
|
||||
blkcipher_walk_init(&walk, dst, src, nbytes);
|
||||
ret = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
|
||||
while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
|
||||
preempt_disable();
|
||||
pagefault_disable();
|
||||
enable_kernel_vsx();
|
||||
aes_p8_ctr32_encrypt_blocks(walk.src.virt.addr,
|
||||
walk.dst.virt.addr,
|
||||
(nbytes &
|
||||
AES_BLOCK_MASK) /
|
||||
AES_BLOCK_SIZE,
|
||||
&ctx->enc_key,
|
||||
walk.iv);
|
||||
disable_kernel_vsx();
|
||||
pagefault_enable();
|
||||
preempt_enable();
|
||||
struct skcipher_request *subreq = skcipher_request_ctx(req);
|
||||
|
||||
/* We need to update IV mostly for last bytes/round */
|
||||
inc = (nbytes & AES_BLOCK_MASK) / AES_BLOCK_SIZE;
|
||||
if (inc > 0)
|
||||
while (inc--)
|
||||
crypto_inc(walk.iv, AES_BLOCK_SIZE);
|
||||
|
||||
nbytes &= AES_BLOCK_SIZE - 1;
|
||||
ret = blkcipher_walk_done(desc, &walk, nbytes);
|
||||
}
|
||||
if (walk.nbytes) {
|
||||
p8_aes_ctr_final(ctx, &walk);
|
||||
ret = blkcipher_walk_done(desc, &walk, 0);
|
||||
}
|
||||
*subreq = *req;
|
||||
skcipher_request_set_tfm(subreq, ctx->fallback);
|
||||
return crypto_skcipher_encrypt(subreq);
|
||||
}
|
||||
|
||||
ret = skcipher_walk_virt(&walk, req, false);
|
||||
while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
|
||||
preempt_disable();
|
||||
pagefault_disable();
|
||||
enable_kernel_vsx();
|
||||
aes_p8_ctr32_encrypt_blocks(walk.src.virt.addr,
|
||||
walk.dst.virt.addr,
|
||||
nbytes / AES_BLOCK_SIZE,
|
||||
&ctx->enc_key, walk.iv);
|
||||
disable_kernel_vsx();
|
||||
pagefault_enable();
|
||||
preempt_enable();
|
||||
|
||||
do {
|
||||
crypto_inc(walk.iv, AES_BLOCK_SIZE);
|
||||
} while ((nbytes -= AES_BLOCK_SIZE) >= AES_BLOCK_SIZE);
|
||||
|
||||
ret = skcipher_walk_done(&walk, nbytes);
|
||||
}
|
||||
if (nbytes) {
|
||||
p8_aes_ctr_final(ctx, &walk);
|
||||
ret = skcipher_walk_done(&walk, 0);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct crypto_alg p8_aes_ctr_alg = {
|
||||
.cra_name = "ctr(aes)",
|
||||
.cra_driver_name = "p8_aes_ctr",
|
||||
.cra_module = THIS_MODULE,
|
||||
.cra_priority = 2000,
|
||||
.cra_type = &crypto_blkcipher_type,
|
||||
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
|
||||
.cra_alignmask = 0,
|
||||
.cra_blocksize = 1,
|
||||
.cra_ctxsize = sizeof(struct p8_aes_ctr_ctx),
|
||||
.cra_init = p8_aes_ctr_init,
|
||||
.cra_exit = p8_aes_ctr_exit,
|
||||
.cra_blkcipher = {
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.setkey = p8_aes_ctr_setkey,
|
||||
.encrypt = p8_aes_ctr_crypt,
|
||||
.decrypt = p8_aes_ctr_crypt,
|
||||
},
|
||||
struct skcipher_alg p8_aes_ctr_alg = {
|
||||
.base.cra_name = "ctr(aes)",
|
||||
.base.cra_driver_name = "p8_aes_ctr",
|
||||
.base.cra_module = THIS_MODULE,
|
||||
.base.cra_priority = 2000,
|
||||
.base.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
|
||||
.base.cra_blocksize = 1,
|
||||
.base.cra_ctxsize = sizeof(struct p8_aes_ctr_ctx),
|
||||
.setkey = p8_aes_ctr_setkey,
|
||||
.encrypt = p8_aes_ctr_crypt,
|
||||
.decrypt = p8_aes_ctr_crypt,
|
||||
.init = p8_aes_ctr_init,
|
||||
.exit = p8_aes_ctr_exit,
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
.ivsize = AES_BLOCK_SIZE,
|
||||
.chunksize = AES_BLOCK_SIZE,
|
||||
};
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする