X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=crypto%2Fauthenc.c;h=40b6e9ec9e3a0a2069b5f972226918dc33625294;hb=54b7b0deb4c602d0751627d14510dc50b5bba372;hp=fd9f06c63d76efc223a6f025dcab10b19ceba84c;hpb=e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1;p=linux-2.6-omap-h63xx.git

diff --git a/crypto/authenc.c b/crypto/authenc.c
index fd9f06c63d7..40b6e9ec9e3 100644
--- 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>
@@ -431,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);