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

Pull crypto update from Herbert Xu:
 "Here is the crypto update for 4.6:

  API:
   - Convert remaining crypto_hash users to shash or ahash, also convert
     blkcipher/ablkcipher users to skcipher.
   - Remove crypto_hash interface.
   - Remove crypto_pcomp interface.
   - Add crypto engine for async cipher drivers.
   - Add akcipher documentation.
   - Add skcipher documentation.

  Algorithms:
   - Rename crypto/crc32 to avoid name clash with lib/crc32.
   - Fix bug in keywrap where we zero the wrong pointer.

  Drivers:
   - Support T5/M5, T7/M7 SPARC CPUs in n2 hwrng driver.
   - Add PIC32 hwrng driver.
   - Support BCM6368 in bcm63xx hwrng driver.
   - Pack structs for 32-bit compat users in qat.
   - Use crypto engine in omap-aes.
   - Add support for sama5d2x SoCs in atmel-sha.
   - Make atmel-sha available again.
   - Make sahara hashing available again.
   - Make ccp hashing available again.
   - Make sha1-mb available again.
   - Add support for multiple devices in ccp.
   - Improve DMA performance in caam.
   - Add hashing support to rockchip"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  crypto: qat - remove redundant arbiter configuration
  crypto: ux500 - fix checks of error code returned by devm_ioremap_resource()
  crypto: atmel - fix checks of error code returned by devm_ioremap_resource()
  crypto: qat - Change the definition of icp_qat_uof_regtype
  hwrng: exynos - use __maybe_unused to hide pm functions
  crypto: ccp - Add abstraction for device-specific calls
  crypto: ccp - CCP versioning support
  crypto: ccp - Support for multiple CCPs
  crypto: ccp - Remove check for x86 family and model
  crypto: ccp - memset request context to zero during import
  lib/mpi: use "static inline" instead of "extern inline"
  lib/mpi: avoid assembler warning
  hwrng: bcm63xx - fix non device tree compatibility
  crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode.
  crypto: qat - The AE id should be less than the maximal AE number
  lib/mpi: Endianness fix
  crypto: rockchip - add hash support for crypto engine in rk3288
  crypto: xts - fix compile errors
  crypto: doc - add skcipher API documentation
  crypto: doc - update AEAD AD handling
  ...

1 files changed, 0 insertions, 147 deletions

diff --git a/crypto/shash.c b/crypto/shash.c
index 359754591653..a051541a4a17 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -368,151 +368,6 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
         return 0;
 }
 
-static int shash_compat_setkey(struct crypto_hash *tfm, const u8 *key,
-                               unsigned int keylen)
-{
-        struct shash_desc **descp = crypto_hash_ctx(tfm);
-        struct shash_desc *desc = *descp;
-
-        return crypto_shash_setkey(desc->tfm, key, keylen);
-}
-
-static int shash_compat_init(struct hash_desc *hdesc)
-{
-        struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
-        struct shash_desc *desc = *descp;
-
-        desc->flags = hdesc->flags;
-
-        return crypto_shash_init(desc);
-}
-
-static int shash_compat_update(struct hash_desc *hdesc, struct scatterlist *sg,
-                               unsigned int len)
-{
-        struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
-        struct shash_desc *desc = *descp;
-        struct crypto_hash_walk walk;
-        int nbytes;
-
-        for (nbytes = crypto_hash_walk_first_compat(hdesc, &walk, sg, len);
-             nbytes > 0; nbytes = crypto_hash_walk_done(&walk, nbytes))
-                nbytes = crypto_shash_update(desc, walk.data, nbytes);
-
-        return nbytes;
-}
-
-static int shash_compat_final(struct hash_desc *hdesc, u8 *out)
-{
-        struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
-
-        return crypto_shash_final(*descp, out);
-}
-
-static int shash_compat_digest(struct hash_desc *hdesc, struct scatterlist *sg,
-                               unsigned int nbytes, u8 *out)
-{
-        unsigned int offset = sg->offset;
-        int err;
-
-        if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {
-                struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
-                struct shash_desc *desc = *descp;
-                void *data;
-
-                desc->flags = hdesc->flags;
-
-                data = kmap_atomic(sg_page(sg));
-                err = crypto_shash_digest(desc, data + offset, nbytes, out);
-                kunmap_atomic(data);
-                crypto_yield(desc->flags);
-                goto out;
-        }
-
-        err = shash_compat_init(hdesc);
-        if (err)
-                goto out;
-
-        err = shash_compat_update(hdesc, sg, nbytes);
-        if (err)
-                goto out;
-
-        err = shash_compat_final(hdesc, out);
-
-out:
-        return err;
-}
-
-static void crypto_exit_shash_ops_compat(struct crypto_tfm *tfm)
-{
-        struct shash_desc **descp = crypto_tfm_ctx(tfm);
-        struct shash_desc *desc = *descp;
-
-        crypto_free_shash(desc->tfm);
-        kzfree(desc);
-}
-
-static int crypto_init_shash_ops_compat(struct crypto_tfm *tfm)
-{
-        struct hash_tfm *crt = &tfm->crt_hash;
-        struct crypto_alg *calg = tfm->__crt_alg;
-        struct shash_alg *alg = __crypto_shash_alg(calg);
-        struct shash_desc **descp = crypto_tfm_ctx(tfm);
-        struct crypto_shash *shash;
-        struct shash_desc *desc;
-
-        if (!crypto_mod_get(calg))
-                return -EAGAIN;
-
-        shash = crypto_create_tfm(calg, &crypto_shash_type);
-        if (IS_ERR(shash)) {
-                crypto_mod_put(calg);
-                return PTR_ERR(shash);
-        }
-
-        desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(shash),
-                       GFP_KERNEL);
-        if (!desc) {
-                crypto_free_shash(shash);
-                return -ENOMEM;
-        }
-
-        *descp = desc;
-        desc->tfm = shash;
-        tfm->exit = crypto_exit_shash_ops_compat;
-
-        crt->init = shash_compat_init;
-        crt->update = shash_compat_update;
-        crt->final  = shash_compat_final;
-        crt->digest = shash_compat_digest;
-        crt->setkey = shash_compat_setkey;
-
-        crt->digestsize = alg->digestsize;
-
-        return 0;
-}
-
-static int crypto_init_shash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
-{
-        switch (mask & CRYPTO_ALG_TYPE_MASK) {
-        case CRYPTO_ALG_TYPE_HASH_MASK:
-                return crypto_init_shash_ops_compat(tfm);
-        }
-
-        return -EINVAL;
-}
-
-static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type,
-                                         u32 mask)
-{
-        switch (mask & CRYPTO_ALG_TYPE_MASK) {
-        case CRYPTO_ALG_TYPE_HASH_MASK:
-                return sizeof(struct shash_desc *);
-        }
-
-        return 0;
-}
-
 static int crypto_shash_init_tfm(struct crypto_tfm *tfm)
 {
         struct crypto_shash *hash = __crypto_shash_cast(tfm);
@@ -559,9 +414,7 @@ static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
 }
 
 static const struct crypto_type crypto_shash_type = {
-        .ctxsize = crypto_shash_ctxsize,
         .extsize = crypto_alg_extsize,
-        .init = crypto_init_shash_ops,
         .init_tfm = crypto_shash_init_tfm,
 #ifdef CONFIG_PROC_FS
         .show = crypto_shash_show,