Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81ff5d2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto update from Herbert Xu:
 "API:
   - Add support for AEAD in simd
   - Add fuzz testing to testmgr
   - Add panic_on_fail module parameter to testmgr
   - Use per-CPU struct instead multiple variables in scompress
   - Change verify API for akcipher

  Algorithms:
   - Convert x86 AEAD algorithms over to simd
   - Forbid 2-key 3DES in FIPS mode
   - Add EC-RDSA (GOST 34.10) algorithm

  Drivers:
   - Set output IV with ctr-aes in crypto4xx
   - Set output IV in rockchip
   - Fix potential length overflow with hashing in sun4i-ss
   - Fix computation error with ctr in vmx
   - Add SM4 protected keys support in ccree
   - Remove long-broken mxc-scc driver
   - Add rfc4106(gcm(aes)) cipher support in cavium/nitrox"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (179 commits)
  crypto: ccree - use a proper le32 type for le32 val
  crypto: ccree - remove set but not used variable 'du_size'
  crypto: ccree - Make cc_sec_disable static
  crypto: ccree - fix spelling mistake "protedcted" -> "protected"
  crypto: caam/qi2 - generate hash keys in-place
  crypto: caam/qi2 - fix DMA mapping of stack memory
  crypto: caam/qi2 - fix zero-length buffer DMA mapping
  crypto: stm32/cryp - update to return iv_out
  crypto: stm32/cryp - remove request mutex protection
  crypto: stm32/cryp - add weak key check for DES
  crypto: atmel - remove set but not used variable 'alg_name'
  crypto: picoxcell - Use dev_get_drvdata()
  crypto: crypto4xx - get rid of redundant using_sd variable
  crypto: crypto4xx - use sync skcipher for fallback
  crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues
  crypto: crypto4xx - fix ctr-aes missing output IV
  crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA
  crypto: ux500 - use ccflags-y instead of CFLAGS_<basename>.o
  crypto: ccree - handle tee fips error during power management resume
  crypto: ccree - add function to handle cryptocell tee fips error
  ...
parents 7aefd944 e59f755c

Documentation/crypto/api-samples.rst

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ Code Example For Use of Operational State Memory With SHASH 
        if (!sdesc)

            return ERR_PTR(-ENOMEM);

        sdesc->shash.tfm = alg;

        sdesc->shash.flags = 0x0;

        return sdesc;

    }

arch/arm/crypto/aes-neonbs-glue.c

+2 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ static int __xts_crypt(struct skcipher_request *req, 
	int err;



	err = skcipher_walk_virt(&walk, req, true);

	if (err)

		return err;



	crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);

arch/arm/crypto/chacha-neon-glue.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <crypto/algapi.h>

#include <crypto/chacha.h>

#include <crypto/internal/simd.h>

#include <crypto/internal/skcipher.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -93,7 +94,7 @@ static int chacha_neon(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);



	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !may_use_simd())

	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())

		return crypto_chacha_crypt(req);



	return chacha_neon_stream_xor(req, ctx, req->iv);
@@ -107,7 +108,7 @@ static int xchacha_neon(struct skcipher_request *req) 
	u32 state[16];

	u8 real_iv[16];



	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !may_use_simd())

	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())

		return crypto_xchacha_crypt(req);



	crypto_chacha_init(state, ctx, req->iv);

arch/arm/crypto/crc32-ce-glue.c

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/string.h>



#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/hwcap.h>

#include <asm/neon.h>
@@ -113,7 +114,7 @@ static int crc32_pmull_update(struct shash_desc *desc, const u8 *data, 
	u32 *crc = shash_desc_ctx(desc);

	unsigned int l;



	if (may_use_simd()) {

	if (crypto_simd_usable()) {

		if ((u32)data % SCALE_F) {

			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));
@@ -147,7 +148,7 @@ static int crc32c_pmull_update(struct shash_desc *desc, const u8 *data, 
	u32 *crc = shash_desc_ctx(desc);

	unsigned int l;



	if (may_use_simd()) {

	if (crypto_simd_usable()) {

		if ((u32)data % SCALE_F) {

			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));

arch/arm/crypto/crct10dif-ce-glue.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/string.h>



#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/neon.h>

#include <asm/simd.h>
@@ -36,7 +37,7 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data, 
{

	u16 *crc = shash_desc_ctx(desc);



	if (length >= CRC_T10DIF_PMULL_CHUNK_SIZE && may_use_simd()) {

	if (length >= CRC_T10DIF_PMULL_CHUNK_SIZE && crypto_simd_usable()) {

		kernel_neon_begin();

		*crc = crc_t10dif_pmull(*crc, data, length);

		kernel_neon_end();