git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dmaengine, async_tx: support alignment checks
[safe/jmp/linux-2.6]
/
crypto
/
digest.c
diff --git
a/crypto/digest.c
b/crypto/digest.c
index
025c9ae
..
5d3f130
100644
(file)
--- a/
crypto/digest.c
+++ b/
crypto/digest.c
@@
-12,6
+12,7
@@
*
*/
*
*/
+#include <crypto/internal/hash.h>
#include <crypto/scatterwalk.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <crypto/scatterwalk.h>
#include <linux/mm.h>
#include <linux/errno.h>
@@
-141,7
+142,7
@@
int crypto_init_digest_ops(struct crypto_tfm *tfm)
struct hash_tfm *ops = &tfm->crt_hash;
struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
struct hash_tfm *ops = &tfm->crt_hash;
struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
- if (dalg->dia_digestsize >
crypto_tfm_alg_blocksize(tfm)
)
+ if (dalg->dia_digestsize >
PAGE_SIZE / 8
)
return -EINVAL;
ops->init = init;
return -EINVAL;
ops->init = init;
@@
-224,7
+225,7
@@
int crypto_init_digest_ops_async(struct crypto_tfm *tfm)
struct ahash_tfm *crt = &tfm->crt_ahash;
struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
struct ahash_tfm *crt = &tfm->crt_ahash;
struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
- if (dalg->dia_digestsize >
crypto_tfm_alg_blocksize(tfm)
)
+ if (dalg->dia_digestsize >
PAGE_SIZE / 8
)
return -EINVAL;
crt->init = digest_async_init;
return -EINVAL;
crt->init = digest_async_init;
@@
-234,7
+235,6
@@
int crypto_init_digest_ops_async(struct crypto_tfm *tfm)
crt->setkey = dalg->dia_setkey ? digest_async_setkey :
digest_async_nosetkey;
crt->digestsize = dalg->dia_digestsize;
crt->setkey = dalg->dia_setkey ? digest_async_setkey :
digest_async_nosetkey;
crt->digestsize = dalg->dia_digestsize;
- crt->base = __crypto_ahash_cast(tfm);
return 0;
}
return 0;
}