Merge 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.2:

  API:

   - Convert RNG interface to new style.

   - New AEAD interface with one SG list for AD and plain/cipher text.
     All external AEAD users have been converted.

   - New asymmetric key interface (akcipher).

  Algorithms:

   - Chacha20, Poly1305 and RFC7539 support.

   - New RSA implementation.

   - Jitter RNG.

   - DRBG is now seeded with both /dev/random and Jitter RNG.  If kernel
     pool isn't ready then DRBG will be reseeded when it is.

   - DRBG is now the default crypto API RNG, replacing krng.

   - 842 compression (previously part of powerpc nx driver).

  Drivers:

   - Accelerated SHA-512 for arm64.

   - New Marvell CESA driver that supports DMA and more algorithms.

   - Updated powerpc nx 842 support.

   - Added support for SEC1 hardware to talitos"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (292 commits)
  crypto: marvell/cesa - remove COMPILE_TEST dependency
  crypto: algif_aead - Temporarily disable all AEAD algorithms
  crypto: af_alg - Forbid the use internal algorithms
  crypto: echainiv - Only hold RNG during initialisation
  crypto: seqiv - Add compatibility support without RNG
  crypto: eseqiv - Offer normal cipher functionality without RNG
  crypto: chainiv - Offer normal cipher functionality without RNG
  crypto: user - Add CRYPTO_MSG_DELRNG
  crypto: user - Move cryptouser.h to uapi
  crypto: rng - Do not free default RNG when it becomes unused
  crypto: skcipher - Allow givencrypt to be NULL
  crypto: sahara - propagate the error on clk_disable_unprepare() failure
  crypto: rsa - fix invalid select for AKCIPHER
  crypto: picoxcell - Update to the current clk API
  crypto: nx - Check for bogus firmware properties
  crypto: marvell/cesa - add DT bindings documentation
  crypto: marvell/cesa - add support for Kirkwood and Dove SoCs
  crypto: marvell/cesa - add support for Orion SoCs
  crypto: marvell/cesa - add allhwsupport module parameter
  crypto: marvell/cesa - add support for all armada SoCs
  ...

1 files changed, 151 insertions, 147 deletions

diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c
index f255ec4a04d4..b5e29002b666 100644
--- a/drivers/crypto/vmx/ghash.c
+++ b/drivers/crypto/vmx/ghash.c
@@ -39,184 +39,188 @@
 void gcm_init_p8(u128 htable[16], const u64 Xi[2]);
 void gcm_gmult_p8(u64 Xi[2], const u128 htable[16]);
 void gcm_ghash_p8(u64 Xi[2], const u128 htable[16],
-        const u8 *in,size_t len);
+                  const u8 *in, size_t len);
 
 struct p8_ghash_ctx {
-    u128 htable[16];
-    struct crypto_shash *fallback;
+        u128 htable[16];
+        struct crypto_shash *fallback;
 };
 
 struct p8_ghash_desc_ctx {
-    u64 shash[2];
-    u8 buffer[GHASH_DIGEST_SIZE];
-    int bytes;
-    struct shash_desc fallback_desc;
+        u64 shash[2];
+        u8 buffer[GHASH_DIGEST_SIZE];
+        int bytes;
+        struct shash_desc fallback_desc;
 };
 
 static int p8_ghash_init_tfm(struct crypto_tfm *tfm)
 {
-    const char *alg;
-    struct crypto_shash *fallback;
-    struct crypto_shash *shash_tfm = __crypto_shash_cast(tfm);
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm);
-
-    if (!(alg = crypto_tfm_alg_name(tfm))) {
-        printk(KERN_ERR "Failed to get algorithm name.\n");
-        return -ENOENT;
-    }
-
-    fallback = crypto_alloc_shash(alg, 0 ,CRYPTO_ALG_NEED_FALLBACK);
-    if (IS_ERR(fallback)) {
-        printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",
-                alg, PTR_ERR(fallback));
-        return PTR_ERR(fallback);
-    }
-    printk(KERN_INFO "Using '%s' as fallback implementation.\n",
-            crypto_tfm_alg_driver_name(crypto_shash_tfm(fallback)));
-
-    crypto_shash_set_flags(fallback,
-            crypto_shash_get_flags((struct crypto_shash *) tfm));
-    ctx->fallback = fallback;
-
-    shash_tfm->descsize = sizeof(struct p8_ghash_desc_ctx)
-        + crypto_shash_descsize(fallback);
-
-    return 0;
+        const char *alg;
+        struct crypto_shash *fallback;
+        struct crypto_shash *shash_tfm = __crypto_shash_cast(tfm);
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm);
+
+        if (!(alg = crypto_tfm_alg_name(tfm))) {
+                printk(KERN_ERR "Failed to get algorithm name.\n");
+                return -ENOENT;
+        }
+
+        fallback = crypto_alloc_shash(alg, 0, CRYPTO_ALG_NEED_FALLBACK);
+        if (IS_ERR(fallback)) {
+                printk(KERN_ERR
+                       "Failed to allocate transformation for '%s': %ld\n",
+                       alg, PTR_ERR(fallback));
+                return PTR_ERR(fallback);
+        }
+        printk(KERN_INFO "Using '%s' as fallback implementation.\n",
+               crypto_tfm_alg_driver_name(crypto_shash_tfm(fallback)));
+
+        crypto_shash_set_flags(fallback,
+                               crypto_shash_get_flags((struct crypto_shash
+                                                       *) tfm));
+        ctx->fallback = fallback;
+
+        shash_tfm->descsize = sizeof(struct p8_ghash_desc_ctx)
+            + crypto_shash_descsize(fallback);
+
+        return 0;
 }
 
 static void p8_ghash_exit_tfm(struct crypto_tfm *tfm)
 {
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm);
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(tfm);
 
-    if (ctx->fallback) {
-        crypto_free_shash(ctx->fallback);
-        ctx->fallback = NULL;
-    }
+        if (ctx->fallback) {
+                crypto_free_shash(ctx->fallback);
+                ctx->fallback = NULL;
+        }
 }
 
 static int p8_ghash_init(struct shash_desc *desc)
 {
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
-    struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
-
-    dctx->bytes = 0;
-    memset(dctx->shash, 0, GHASH_DIGEST_SIZE);
-    dctx->fallback_desc.tfm = ctx->fallback;
-    dctx->fallback_desc.flags = desc->flags;
-    return crypto_shash_init(&dctx->fallback_desc);
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
+        struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+        dctx->bytes = 0;
+        memset(dctx->shash, 0, GHASH_DIGEST_SIZE);
+        dctx->fallback_desc.tfm = ctx->fallback;
+        dctx->fallback_desc.flags = desc->flags;
+        return crypto_shash_init(&dctx->fallback_desc);
 }
 
 static int p8_ghash_setkey(struct crypto_shash *tfm, const u8 *key,
-    unsigned int keylen)
+                           unsigned int keylen)
 {
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(tfm));
-
-    if (keylen != GHASH_KEY_LEN)
-        return -EINVAL;
-
-    preempt_disable();
-    pagefault_disable();
-    enable_kernel_altivec();
-    enable_kernel_fp();
-    gcm_init_p8(ctx->htable, (const u64 *) key);
-    pagefault_enable();
-    preempt_enable();
-    return crypto_shash_setkey(ctx->fallback, key, keylen);
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(tfm));
+
+        if (keylen != GHASH_KEY_LEN)
+                return -EINVAL;
+
+        preempt_disable();
+        pagefault_disable();
+        enable_kernel_altivec();
+        enable_kernel_fp();
+        gcm_init_p8(ctx->htable, (const u64 *) key);
+        pagefault_enable();
+        preempt_enable();
+        return crypto_shash_setkey(ctx->fallback, key, keylen);
 }
 
 static int p8_ghash_update(struct shash_desc *desc,
-        const u8 *src, unsigned int srclen)
+                           const u8 *src, unsigned int srclen)
 {
-    unsigned int len;
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
-    struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
-
-    if (IN_INTERRUPT) {
-        return crypto_shash_update(&dctx->fallback_desc, src, srclen);
-    } else {
-        if (dctx->bytes) {
-            if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) {
-                memcpy(dctx->buffer + dctx->bytes, src, srclen);
-                dctx->bytes += srclen;
-                return 0;
-            }
-            memcpy(dctx->buffer + dctx->bytes, src,
-                    GHASH_DIGEST_SIZE - dctx->bytes);
-            preempt_disable();
-            pagefault_disable();
-            enable_kernel_altivec();
-            enable_kernel_fp();
-            gcm_ghash_p8(dctx->shash, ctx->htable, dctx->buffer,
-                    GHASH_DIGEST_SIZE);
-            pagefault_enable();
-            preempt_enable();
-            src += GHASH_DIGEST_SIZE - dctx->bytes;
-            srclen -= GHASH_DIGEST_SIZE - dctx->bytes;
-            dctx->bytes = 0;
-        }
-        len = srclen & ~(GHASH_DIGEST_SIZE - 1);
-        if (len) {
-            preempt_disable();
-            pagefault_disable();
-            enable_kernel_altivec();
-            enable_kernel_fp();
-            gcm_ghash_p8(dctx->shash, ctx->htable, src, len);
-            pagefault_enable();
-            preempt_enable();
-            src += len;
-            srclen -= len;
-        }
-        if (srclen) {
-            memcpy(dctx->buffer, src, srclen);
-            dctx->bytes = srclen;
-        }
-        return 0;
-    }
+        unsigned int len;
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
+        struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+        if (IN_INTERRUPT) {
+                return crypto_shash_update(&dctx->fallback_desc, src,
+                                           srclen);
+        } else {
+                if (dctx->bytes) {
+                        if (dctx->bytes + srclen < GHASH_DIGEST_SIZE) {
+                                memcpy(dctx->buffer + dctx->bytes, src,
+                                       srclen);
+                                dctx->bytes += srclen;
+                                return 0;
+                        }
+                        memcpy(dctx->buffer + dctx->bytes, src,
+                               GHASH_DIGEST_SIZE - dctx->bytes);
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_altivec();
+                        enable_kernel_fp();
+                        gcm_ghash_p8(dctx->shash, ctx->htable,
+                                     dctx->buffer, GHASH_DIGEST_SIZE);
+                        pagefault_enable();
+                        preempt_enable();
+                        src += GHASH_DIGEST_SIZE - dctx->bytes;
+                        srclen -= GHASH_DIGEST_SIZE - dctx->bytes;
+                        dctx->bytes = 0;
+                }
+                len = srclen & ~(GHASH_DIGEST_SIZE - 1);
+                if (len) {
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_altivec();
+                        enable_kernel_fp();
+                        gcm_ghash_p8(dctx->shash, ctx->htable, src, len);
+                        pagefault_enable();
+                        preempt_enable();
+                        src += len;
+                        srclen -= len;
+                }
+                if (srclen) {
+                        memcpy(dctx->buffer, src, srclen);
+                        dctx->bytes = srclen;
+                }
+                return 0;
+        }
 }
 
 static int p8_ghash_final(struct shash_desc *desc, u8 *out)
 {
-    int i;
-    struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
-    struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
-
-    if (IN_INTERRUPT) {
-        return crypto_shash_final(&dctx->fallback_desc, out);
-    } else {
-        if (dctx->bytes) {
-            for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++)
-                dctx->buffer[i] = 0;
-            preempt_disable();
-            pagefault_disable();
-            enable_kernel_altivec();
-            enable_kernel_fp();
-            gcm_ghash_p8(dctx->shash, ctx->htable, dctx->buffer,
-                    GHASH_DIGEST_SIZE);
-            pagefault_enable();
-            preempt_enable();
-            dctx->bytes = 0;
-        }
-        memcpy(out, dctx->shash, GHASH_DIGEST_SIZE);
-        return 0;
-    }
+        int i;
+        struct p8_ghash_ctx *ctx = crypto_tfm_ctx(crypto_shash_tfm(desc->tfm));
+        struct p8_ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+        if (IN_INTERRUPT) {
+                return crypto_shash_final(&dctx->fallback_desc, out);
+        } else {
+                if (dctx->bytes) {
+                        for (i = dctx->bytes; i < GHASH_DIGEST_SIZE; i++)
+                                dctx->buffer[i] = 0;
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_altivec();
+                        enable_kernel_fp();
+                        gcm_ghash_p8(dctx->shash, ctx->htable,
+                                     dctx->buffer, GHASH_DIGEST_SIZE);
+                        pagefault_enable();
+                        preempt_enable();
+                        dctx->bytes = 0;
+                }
+                memcpy(out, dctx->shash, GHASH_DIGEST_SIZE);
+                return 0;
+        }
 }
 
 struct shash_alg p8_ghash_alg = {
-    .digestsize = GHASH_DIGEST_SIZE,
-    .init       = p8_ghash_init,
-    .update     = p8_ghash_update,
-    .final      = p8_ghash_final,
-    .setkey     = p8_ghash_setkey,
-    .descsize   = sizeof(struct p8_ghash_desc_ctx),
-    .base       = {
-        .cra_name = "ghash",
-        .cra_driver_name = "p8_ghash",
-        .cra_priority = 1000,
-        .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK,
-        .cra_blocksize = GHASH_BLOCK_SIZE,
-        .cra_ctxsize = sizeof(struct p8_ghash_ctx),
-        .cra_module = THIS_MODULE,
-        .cra_init = p8_ghash_init_tfm,
-        .cra_exit = p8_ghash_exit_tfm,
-    },
+        .digestsize = GHASH_DIGEST_SIZE,
+        .init = p8_ghash_init,
+        .update = p8_ghash_update,
+        .final = p8_ghash_final,
+        .setkey = p8_ghash_setkey,
+        .descsize = sizeof(struct p8_ghash_desc_ctx),
+        .base = {
+                 .cra_name = "ghash",
+                 .cra_driver_name = "p8_ghash",
+                 .cra_priority = 1000,
+                 .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK,
+                 .cra_blocksize = GHASH_BLOCK_SIZE,
+                 .cra_ctxsize = sizeof(struct p8_ghash_ctx),
+                 .cra_module = THIS_MODULE,
+                 .cra_init = p8_ghash_init_tfm,
+                 .cra_exit = p8_ghash_exit_tfm,
+        },
 };