Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "* sha512 bug fixes (already in your tree).
  * SHA224/SHA384 AEAD support in caam.
  * X86-64 optimised version of Camellia.
  * Tegra AES support.
  * Bulk algorithm registration interface to make driver registration easier.
  * padata race fixes.
  * Misc fixes."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
  padata: Fix race on sequence number wrap
  padata: Fix race in the serialization path
  crypto: camellia - add assembler implementation for x86_64
  crypto: camellia - rename camellia.c to camellia_generic.c
  crypto: camellia - fix checkpatch warnings
  crypto: camellia - rename camellia module to camellia_generic
  crypto: tcrypt - add more camellia tests
  crypto: testmgr - add more camellia test vectors
  crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
  crypto: twofish-x86_64/i586 - set alignmask to zero
  crypto: blowfish-x86_64 - set alignmask to zero
  crypto: serpent-sse2 - combine ablk_*_init functions
  crypto: blowfish-x86_64 - use crypto_[un]register_algs
  crypto: twofish-x86_64-3way - use crypto_[un]register_algs
  crypto: serpent-sse2 - use crypto_[un]register_algs
  crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
  crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
  crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
  crypto: caam - fix gcc 4.6 warning
  crypto: Add bulk algorithm registration interface
  ...

1 files changed, 35 insertions, 11 deletions

diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index 58480d009324..410a03c01ca4 100644
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -1322,6 +1322,7 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_driver_name = "cbc-aes-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
                         .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                     CRYPTO_ALG_KERN_DRIVER_ONLY |
                                      CRYPTO_ALG_ASYNC |
                                      CRYPTO_ALG_NEED_FALLBACK,
                         .cra_blocksize = AES_BLOCK_SIZE,
@@ -1349,6 +1350,7 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_driver_name = "ecb-aes-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
                         .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                CRYPTO_ALG_KERN_DRIVER_ONLY |
                                 CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
@@ -1373,7 +1375,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "cbc(des)",
                         .cra_driver_name = "cbc-des-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                         .cra_type = &crypto_ablkcipher_type,
@@ -1398,7 +1402,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "ecb(des)",
                         .cra_driver_name = "ecb-des-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                         .cra_type = &crypto_ablkcipher_type,
@@ -1422,7 +1428,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "cbc(des3_ede)",
                         .cra_driver_name = "cbc-des3-ede-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                         .cra_type = &crypto_ablkcipher_type,
@@ -1447,7 +1455,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "ecb(des3_ede)",
                         .cra_driver_name = "ecb-des3-ede-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                         .cra_type = &crypto_ablkcipher_type,
@@ -1472,7 +1482,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(sha1),cbc(aes))",
                         .cra_driver_name = "authenc-hmac-sha1-cbc-aes-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1500,7 +1512,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(sha256),cbc(aes))",
                         .cra_driver_name = "authenc-hmac-sha256-cbc-aes-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1527,7 +1541,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(md5),cbc(aes))",
                         .cra_driver_name = "authenc-hmac-md5-cbc-aes-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = AES_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1554,7 +1570,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(sha1),cbc(des3_ede))",
                         .cra_driver_name = "authenc-hmac-sha1-cbc-3des-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1582,7 +1600,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(sha256),cbc(des3_ede))",
                         .cra_driver_name = "authenc-hmac-sha256-cbc-3des-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1609,7 +1629,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                         .cra_name = "authenc(hmac(md5),cbc(des3_ede))",
                         .cra_driver_name = "authenc-hmac-md5-cbc-3des-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                         .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                         .cra_type = &crypto_aead_type,
@@ -1639,7 +1661,9 @@ static struct spacc_alg l2_engine_algs[] = {
                         .cra_name = "f8(kasumi)",
                         .cra_driver_name = "f8-kasumi-picoxcell",
                         .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                        .cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER | CRYPTO_ALG_ASYNC,
+                        .cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER |
+                                        CRYPTO_ALG_ASYNC |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY,
                         .cra_blocksize = 8,
                         .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                         .cra_type = &crypto_ablkcipher_type,