Commit ae6ad5d0 authored by Chuck Lever's avatar Chuck Lever

SUNRPC: Rename .encrypt_v2 and .decrypt_v2 methods

Clean up: there is now only one encrypt and only one decrypt method,
thus there is no longer a need for the v2-suffixed method names.
Tested-by: default avatarScott Mayhew <smayhew@redhat.com>
Reviewed-by: default avatarSimo Sorce <simo@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent d50b8152
...@@ -73,12 +73,10 @@ struct gss_krb5_enctype { ...@@ -73,12 +73,10 @@ struct gss_krb5_enctype {
u32 (*mk_key) (const struct gss_krb5_enctype *gk5e, u32 (*mk_key) (const struct gss_krb5_enctype *gk5e,
struct xdr_netobj *in, struct xdr_netobj *in,
struct xdr_netobj *out); /* complete key generation */ struct xdr_netobj *out); /* complete key generation */
u32 (*encrypt_v2) (struct krb5_ctx *kctx, u32 offset, u32 (*encrypt)(struct krb5_ctx *kctx, u32 offset,
struct xdr_buf *buf, struct xdr_buf *buf, struct page **pages);
struct page **pages); /* v2 encryption function */ u32 (*decrypt)(struct krb5_ctx *kctx, u32 offset, u32 len,
u32 (*decrypt_v2) (struct krb5_ctx *kctx, u32 offset, u32 len, struct xdr_buf *buf, u32 *headskip, u32 *tailskip);
struct xdr_buf *buf, u32 *headskip,
u32 *tailskip); /* v2 decryption function */
u32 (*get_mic)(struct krb5_ctx *kctx, struct xdr_buf *text, u32 (*get_mic)(struct krb5_ctx *kctx, struct xdr_buf *text,
struct xdr_netobj *token); struct xdr_netobj *token);
u32 (*verify_mic)(struct krb5_ctx *kctx, struct xdr_buf *message_buffer, u32 (*verify_mic)(struct krb5_ctx *kctx, struct xdr_buf *message_buffer,
...@@ -276,14 +274,4 @@ gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e, ...@@ -276,14 +274,4 @@ gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e,
struct xdr_netobj *randombits, struct xdr_netobj *randombits,
struct xdr_netobj *key); struct xdr_netobj *key);
u32
gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
struct xdr_buf *buf,
struct page **pages);
u32
gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, u32 len,
struct xdr_buf *buf, u32 *plainoffset,
u32 *plainlen);
#endif /* _LINUX_SUNRPC_GSS_KRB5_H */ #endif /* _LINUX_SUNRPC_GSS_KRB5_H */
...@@ -50,4 +50,10 @@ u32 krb5_encrypt(struct crypto_sync_skcipher *key, void *iv, void *in, ...@@ -50,4 +50,10 @@ u32 krb5_encrypt(struct crypto_sync_skcipher *key, void *iv, void *in,
u32 krb5_decrypt(struct crypto_sync_skcipher *key, void *iv, void *in, u32 krb5_decrypt(struct crypto_sync_skcipher *key, void *iv, void *in,
void *out, int length); void *out, int length);
u32 gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
struct xdr_buf *buf, struct page **pages);
u32 gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, u32 len,
struct xdr_buf *buf, u32 *plainoffset, u32 *plainlen);
#endif /* _NET_SUNRPC_AUTH_GSS_KRB5_INTERNAL_H */ #endif /* _NET_SUNRPC_AUTH_GSS_KRB5_INTERNAL_H */
...@@ -98,8 +98,8 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { ...@@ -98,8 +98,8 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
.cksum_name = "hmac(sha1)", .cksum_name = "hmac(sha1)",
.import_ctx = gss_krb5_import_ctx_v2, .import_ctx = gss_krb5_import_ctx_v2,
.mk_key = gss_krb5_aes_make_key, .mk_key = gss_krb5_aes_make_key,
.encrypt_v2 = gss_krb5_aes_encrypt, .encrypt = gss_krb5_aes_encrypt,
.decrypt_v2 = gss_krb5_aes_decrypt, .decrypt = gss_krb5_aes_decrypt,
.get_mic = gss_krb5_get_mic_v2, .get_mic = gss_krb5_get_mic_v2,
.verify_mic = gss_krb5_verify_mic_v2, .verify_mic = gss_krb5_verify_mic_v2,
...@@ -125,8 +125,8 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { ...@@ -125,8 +125,8 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
.cksum_name = "hmac(sha1)", .cksum_name = "hmac(sha1)",
.import_ctx = gss_krb5_import_ctx_v2, .import_ctx = gss_krb5_import_ctx_v2,
.mk_key = gss_krb5_aes_make_key, .mk_key = gss_krb5_aes_make_key,
.encrypt_v2 = gss_krb5_aes_encrypt, .encrypt = gss_krb5_aes_encrypt,
.decrypt_v2 = gss_krb5_aes_decrypt, .decrypt = gss_krb5_aes_decrypt,
.get_mic = gss_krb5_get_mic_v2, .get_mic = gss_krb5_get_mic_v2,
.verify_mic = gss_krb5_verify_mic_v2, .verify_mic = gss_krb5_verify_mic_v2,
......
...@@ -390,9 +390,6 @@ gss_krb5_wrap_v2(struct krb5_ctx *kctx, int offset, ...@@ -390,9 +390,6 @@ gss_krb5_wrap_v2(struct krb5_ctx *kctx, int offset,
dprintk("RPC: %s\n", __func__); dprintk("RPC: %s\n", __func__);
if (kctx->gk5e->encrypt_v2 == NULL)
return GSS_S_FAILURE;
/* make room for gss token header */ /* make room for gss token header */
if (xdr_extend_head(buf, offset, GSS_KRB5_TOK_HDR_LEN)) if (xdr_extend_head(buf, offset, GSS_KRB5_TOK_HDR_LEN))
return GSS_S_FAILURE; return GSS_S_FAILURE;
...@@ -420,7 +417,7 @@ gss_krb5_wrap_v2(struct krb5_ctx *kctx, int offset, ...@@ -420,7 +417,7 @@ gss_krb5_wrap_v2(struct krb5_ctx *kctx, int offset,
be64ptr = (__be64 *)be16ptr; be64ptr = (__be64 *)be16ptr;
*be64ptr = cpu_to_be64(atomic64_fetch_inc(&kctx->seq_send64)); *be64ptr = cpu_to_be64(atomic64_fetch_inc(&kctx->seq_send64));
err = (*kctx->gk5e->encrypt_v2)(kctx, offset, buf, pages); err = (*kctx->gk5e->encrypt)(kctx, offset, buf, pages);
if (err) if (err)
return err; return err;
...@@ -445,9 +442,6 @@ gss_krb5_unwrap_v2(struct krb5_ctx *kctx, int offset, int len, ...@@ -445,9 +442,6 @@ gss_krb5_unwrap_v2(struct krb5_ctx *kctx, int offset, int len,
dprintk("RPC: %s\n", __func__); dprintk("RPC: %s\n", __func__);
if (kctx->gk5e->decrypt_v2 == NULL)
return GSS_S_FAILURE;
ptr = buf->head[0].iov_base + offset; ptr = buf->head[0].iov_base + offset;
if (be16_to_cpu(*((__be16 *)ptr)) != KG2_TOK_WRAP) if (be16_to_cpu(*((__be16 *)ptr)) != KG2_TOK_WRAP)
...@@ -477,8 +471,8 @@ gss_krb5_unwrap_v2(struct krb5_ctx *kctx, int offset, int len, ...@@ -477,8 +471,8 @@ gss_krb5_unwrap_v2(struct krb5_ctx *kctx, int offset, int len,
if (rrc != 0) if (rrc != 0)
rotate_left(offset + 16, buf, rrc); rotate_left(offset + 16, buf, rrc);
err = (*kctx->gk5e->decrypt_v2)(kctx, offset, len, buf, err = (*kctx->gk5e->decrypt)(kctx, offset, len, buf,
&headskip, &tailskip); &headskip, &tailskip);
if (err) if (err)
return GSS_S_FAILURE; return GSS_S_FAILURE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment