sunrpc: Remove gss_{de,en}crypt_xdr_buf deadcode

Commit ec596aaf9b48 ("SUNRPC: Remove code behind
CONFIG_RPCSEC_GSS_KRB5_SIMPLIFIED") was the last user of the
gss_decrypt_xdr_buf() and gss_encrypt_xdr_buf() functions.

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index d2b02710ab0709dfc92b4ce8e1bc0d892016594e..9a27201638e28680cb3e2f176f09516b4196d1bd 100644 (file)
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -442,35 +442,6 @@ encryptor(struct scatterlist *sg, void *data)
        return 0;
 }
 
-int
-gss_encrypt_xdr_buf(struct crypto_sync_skcipher *tfm, struct xdr_buf *buf,
-                   int offset, struct page **pages)
-{
-       int ret;
-       struct encryptor_desc desc;
-       SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);
-
-       BUG_ON((buf->len - offset) % crypto_sync_skcipher_blocksize(tfm) != 0);
-
-       skcipher_request_set_sync_tfm(req, tfm);
-       skcipher_request_set_callback(req, 0, NULL, NULL);
-
-       memset(desc.iv, 0, sizeof(desc.iv));
-       desc.req = req;
-       desc.pos = offset;
-       desc.outbuf = buf;
-       desc.pages = pages;
-       desc.fragno = 0;
-       desc.fraglen = 0;
-
-       sg_init_table(desc.infrags, 4);
-       sg_init_table(desc.outfrags, 4);
-
-       ret = xdr_process_buf(buf, offset, buf->len - offset, encryptor, &desc);
-       skcipher_request_zero(req);
-       return ret;
-}
-
 struct decryptor_desc {
        u8 iv[GSS_KRB5_MAX_BLOCKSIZE];
        struct skcipher_request *req;
@@ -525,32 +496,6 @@ decryptor(struct scatterlist *sg, void *data)
        return 0;
 }
 
-int
-gss_decrypt_xdr_buf(struct crypto_sync_skcipher *tfm, struct xdr_buf *buf,
-                   int offset)
-{
-       int ret;
-       struct decryptor_desc desc;
-       SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);
-
-       /* XXXJBF: */
-       BUG_ON((buf->len - offset) % crypto_sync_skcipher_blocksize(tfm) != 0);
-
-       skcipher_request_set_sync_tfm(req, tfm);
-       skcipher_request_set_callback(req, 0, NULL, NULL);
-
-       memset(desc.iv, 0, sizeof(desc.iv));
-       desc.req = req;
-       desc.fragno = 0;
-       desc.fraglen = 0;
-
-       sg_init_table(desc.frags, 4);
-
-       ret = xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc);
-       skcipher_request_zero(req);
-       return ret;
-}
-
 /*
  * This function makes the assumption that it was ultimately called
  * from gss_wrap().

diff --git a/net/sunrpc/auth_gss/gss_krb5_internal.h b/net/sunrpc/auth_gss/gss_krb5_internal.h
index 3afd4065bf3d08b8a9fc63bcba893cf3f966a9b5..a47e9ec228a5e776730bfca9beddd74b95dca5a9 100644 (file)
--- a/net/sunrpc/auth_gss/gss_krb5_internal.h
+++ b/net/sunrpc/auth_gss/gss_krb5_internal.h
@@ -172,13 +172,6 @@ u32 krb5_decrypt(struct crypto_sync_skcipher *key, void *iv, void *in,
 int xdr_extend_head(struct xdr_buf *buf, unsigned int base,
                    unsigned int shiftlen);
 
-int gss_encrypt_xdr_buf(struct crypto_sync_skcipher *tfm,
-                       struct xdr_buf *outbuf, int offset,
-                       struct page **pages);
-
-int gss_decrypt_xdr_buf(struct crypto_sync_skcipher *tfm,
-                       struct xdr_buf *inbuf, int offset);
-
 u32 gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
                         struct xdr_buf *buf, struct page **pages);