fs/Kconfig: move afs out

[safe/jmp/linux-2.6] / crypto / authenc.c

diff --git a/crypto/authenc.c b/crypto/authenc.c
index 4b22676..40b6e9e 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -11,6 +11,7 @@
  */
 
 #include <crypto/aead.h>
+#include <crypto/internal/hash.h>
 #include <crypto/internal/skcipher.h>
 #include <crypto/authenc.h>
 #include <crypto/scatterwalk.h>
@@ -174,8 +175,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
 static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
                                        int err)
 {
+       struct aead_request *areq = req->data;
+
        if (!err) {
-               struct aead_request *areq = req->data;
                struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
                struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
                struct ablkcipher_request *abreq = aead_request_ctx(areq);
@@ -185,7 +187,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
                err = crypto_authenc_genicv(areq, iv, 0);
        }
 
-       aead_request_complete(req->data, err);
+       aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_encrypt(struct aead_request *req)
@@ -216,14 +218,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)
 static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
                                           int err)
 {
+       struct aead_request *areq = req->data;
+
        if (!err) {
-               struct aead_request *areq = req->data;
                struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
 
                err = crypto_authenc_genicv(areq, greq->giv, 0);
        }
 
-       aead_request_complete(req->data, err);
+       aead_request_complete(areq, err);
 }
 
 static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
@@ -429,6 +432,8 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
        inst->alg.cra_aead.ivsize = enc->cra_ablkcipher.ivsize;
        inst->alg.cra_aead.maxauthsize = auth->cra_type == &crypto_hash_type ?
                                         auth->cra_hash.digestsize :
+                                        auth->cra_type ?
+                                        __crypto_shash_alg(auth)->digestsize :
                                         auth->cra_digest.dia_digestsize;
 
        inst->alg.cra_ctxsize = sizeof(struct crypto_authenc_ctx);