diff options
| author | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
| commit | db5c6566ee03e097b4b7f7e207189c0906e9d1aa (patch) | |
| tree | fb78e31032dcca2fcb0e9123cf11be12728f99c5 /crypto/authencesn.c | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| parent | ef734472771a62ae9f901367a40a89382a991917 (diff) | |
| download | linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.tar.gz linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.zip | |
Merge tag 'v4.17-rc3' into apparmor-next
Linux v4.17-rc3
Merge in v4.17 for LSM updates
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'crypto/authencesn.c')
| -rw-r--r-- | crypto/authencesn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/authencesn.c b/crypto/authencesn.c index 0cf5fefd..15f91ddd 100644 --- a/crypto/authencesn.c +++ b/crypto/authencesn.c @@ -352,7 +352,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm) if (IS_ERR(enc)) goto err_free_ahash; - null = crypto_get_default_null_skcipher2(); + null = crypto_get_default_null_skcipher(); err = PTR_ERR(null); if (IS_ERR(null)) goto err_free_skcipher; @@ -389,7 +389,7 @@ static void crypto_authenc_esn_exit_tfm(struct crypto_aead *tfm) crypto_free_ahash(ctx->auth); crypto_free_skcipher(ctx->enc); - crypto_put_default_null_skcipher2(); + crypto_put_default_null_skcipher(); } static void crypto_authenc_esn_free(struct aead_instance *inst) |