diff options
| author | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
| commit | fe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch) | |
| tree | 2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/hmac.c | |
| parent | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff) | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| download | linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip | |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'crypto/hmac.c')
| -rw-r--r-- | crypto/hmac.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index 92871dc2..e7473022 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -195,11 +195,15 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb) salg = shash_attr_alg(tb[1], 0, 0); if (IS_ERR(salg)) return PTR_ERR(salg); + alg = &salg->base; + /* The underlying hash algorithm must be unkeyed */ err = -EINVAL; + if (crypto_shash_alg_has_setkey(salg)) + goto out_put_alg; + ds = salg->digestsize; ss = salg->statesize; - alg = &salg->base; if (ds > alg->cra_blocksize || ss < alg->cra_blocksize) goto out_put_alg; |