diff options
author | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
---|---|---|
committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
commit | ed8b19a674c67e1007990991d4e02c02da07c952 (patch) | |
tree | 230d118992bfd9ac76f80822d34c2f4ea9819a44 /crypto/skcipher.c | |
parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
parent | f349a25c7c6b753176540d10e6c243047faefa3a (diff) | |
download | linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.tar.gz linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.zip |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to '')
-rw-r--r-- | crypto/skcipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index d199c0b1..69230e9d 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -118,7 +118,7 @@ static int crypto_init_skcipher_ops_blkcipher(struct crypto_tfm *tfm) skcipher->decrypt = skcipher_decrypt_blkcipher; skcipher->ivsize = crypto_blkcipher_ivsize(blkcipher); - skcipher->has_setkey = calg->cra_blkcipher.max_keysize; + skcipher->keysize = calg->cra_blkcipher.max_keysize; return 0; } @@ -211,7 +211,7 @@ static int crypto_init_skcipher_ops_ablkcipher(struct crypto_tfm *tfm) skcipher->ivsize = crypto_ablkcipher_ivsize(ablkcipher); skcipher->reqsize = crypto_ablkcipher_reqsize(ablkcipher) + sizeof(struct ablkcipher_request); - skcipher->has_setkey = calg->cra_ablkcipher.max_keysize; + skcipher->keysize = calg->cra_ablkcipher.max_keysize; return 0; } |