Merge tag 'nfs-for-4.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / net / sunrpc / auth_gss / gss_krb5_wrap.c

diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index 6af6f11..5cdde6c 100644 (file)
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -174,7 +174,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,
 
        now = get_seconds();
 
-       blocksize = crypto_skcipher_blocksize(kctx->enc);
+       blocksize = crypto_sync_skcipher_blocksize(kctx->enc);
        gss_krb5_add_padding(buf, offset, blocksize);
        BUG_ON((buf->len - offset) % blocksize);
        plainlen = conflen + buf->len - offset;
@@ -237,10 +237,10 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,
                return GSS_S_FAILURE;
 
        if (kctx->enctype == ENCTYPE_ARCFOUR_HMAC) {
-               struct crypto_skcipher *cipher;
+               struct crypto_sync_skcipher *cipher;
                int err;
-               cipher = crypto_alloc_skcipher(kctx->gk5e->encrypt_name, 0,
-                                              CRYPTO_ALG_ASYNC);
+               cipher = crypto_alloc_sync_skcipher(kctx->gk5e->encrypt_name,
+                                                   0, 0);
                if (IS_ERR(cipher))
                        return GSS_S_FAILURE;
 
@@ -248,7 +248,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,
 
                err = gss_encrypt_xdr_buf(cipher, buf,
                                          offset + headlen - conflen, pages);
-               crypto_free_skcipher(cipher);
+               crypto_free_sync_skcipher(cipher);
                if (err)
                        return GSS_S_FAILURE;
        } else {
@@ -325,18 +325,18 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
                return GSS_S_BAD_SIG;
 
        if (kctx->enctype == ENCTYPE_ARCFOUR_HMAC) {
-               struct crypto_skcipher *cipher;
+               struct crypto_sync_skcipher *cipher;
                int err;
 
-               cipher = crypto_alloc_skcipher(kctx->gk5e->encrypt_name, 0,
-                                              CRYPTO_ALG_ASYNC);
+               cipher = crypto_alloc_sync_skcipher(kctx->gk5e->encrypt_name,
+                                                   0, 0);
                if (IS_ERR(cipher))
                        return GSS_S_FAILURE;
 
                krb5_rc4_setup_enc_key(kctx, cipher, seqnum);
 
                err = gss_decrypt_xdr_buf(cipher, buf, crypt_offset);
-               crypto_free_skcipher(cipher);
+               crypto_free_sync_skcipher(cipher);
                if (err)
                        return GSS_S_DEFECTIVE_TOKEN;
        } else {
@@ -369,7 +369,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
        /* Copy the data back to the right position.  XXX: Would probably be
         * better to copy and encrypt at the same time. */
 
-       blocksize = crypto_skcipher_blocksize(kctx->enc);
+       blocksize = crypto_sync_skcipher_blocksize(kctx->enc);
        data_start = ptr + (GSS_KRB5_TOK_HDR_LEN + kctx->gk5e->cksumlength) +
                                        conflen;
        orig_start = buf->head[0].iov_base + offset;