diff options
author | Doug Ledford <dledford@redhat.com> | 2015-09-25 10:46:07 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2015-09-25 10:46:07 -0400 |
commit | a99c59c0accea388f83ea651e90c814aeac04785 (patch) | |
tree | 1d102927807aa7c12a8a66cbb59d6560c6520645 /crypto/pcrypt.c | |
parent | c16e43ca0904ac1f8c20a2c007801d4d69bdb6f7 (diff) | |
parent | 733601f243cfd24755f2c120fb9f9ec284fa5ca1 (diff) | |
download | linux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.tar.gz linux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.zip |
Merge tag 'v4.3-rc2' into k.o/for-4.3-v1
Linux 4.3-rc2
Diffstat (limited to 'crypto/pcrypt.c')
-rw-r--r-- | crypto/pcrypt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index 45e7d515..ee9cfb99 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -274,11 +274,16 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb, u32 type, u32 mask) { struct pcrypt_instance_ctx *ctx; + struct crypto_attr_type *algt; struct aead_instance *inst; struct aead_alg *alg; const char *name; int err; + algt = crypto_get_attr_type(tb); + if (IS_ERR(algt)) + return PTR_ERR(algt); + name = crypto_attr_alg_name(tb[1]); if (IS_ERR(name)) return PTR_ERR(name); @@ -299,6 +304,8 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb, if (err) goto out_drop_aead; + inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC; + inst->alg.ivsize = crypto_aead_alg_ivsize(alg); inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg); |