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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock - Revert aes-all alias to aes
  crypto: api - Fix algorithm module auto-loading
  crypto: eseqiv - Fix IV generation for sync algorithms
  crypto: ixp4xx - check firmware for crypto support

2 files changed, 4 insertions, 2 deletions

diff --git a/crypto/api.c b/crypto/api.c
index 314dab96840e..fd2545decb28 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -221,7 +221,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
 
                 request_module(name);
 
-                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
+                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
+                      CRYPTO_ALG_NEED_FALLBACK) &&
                     snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
                         request_module(tmp);
 
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c
index 2a342c8e52b3..3ca3b669d5d5 100644
--- a/crypto/eseqiv.c
+++ b/crypto/eseqiv.c
@@ -153,7 +153,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req)
         if (err)
                 goto out;
 
-        eseqiv_complete2(req);
+        if (giv != req->giv)
+                eseqiv_complete2(req);
 
 out:
         return err;