Skip to content

Commit c92066e

Browse files
Dr. David Alan Gilbertchucklever
authored andcommitted
sunrpc: Remove gss_{de,en}crypt_xdr_buf deadcode
Commit ec596aa ("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>
1 parent afc52b1 commit c92066e

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

net/sunrpc/auth_gss/gss_krb5_crypto.c

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -442,35 +442,6 @@ encryptor(struct scatterlist *sg, void *data)
442442
return 0;
443443
}
444444

445-
int
446-
gss_encrypt_xdr_buf(struct crypto_sync_skcipher *tfm, struct xdr_buf *buf,
447-
int offset, struct page **pages)
448-
{
449-
int ret;
450-
struct encryptor_desc desc;
451-
SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);
452-
453-
BUG_ON((buf->len - offset) % crypto_sync_skcipher_blocksize(tfm) != 0);
454-
455-
skcipher_request_set_sync_tfm(req, tfm);
456-
skcipher_request_set_callback(req, 0, NULL, NULL);
457-
458-
memset(desc.iv, 0, sizeof(desc.iv));
459-
desc.req = req;
460-
desc.pos = offset;
461-
desc.outbuf = buf;
462-
desc.pages = pages;
463-
desc.fragno = 0;
464-
desc.fraglen = 0;
465-
466-
sg_init_table(desc.infrags, 4);
467-
sg_init_table(desc.outfrags, 4);
468-
469-
ret = xdr_process_buf(buf, offset, buf->len - offset, encryptor, &desc);
470-
skcipher_request_zero(req);
471-
return ret;
472-
}
473-
474445
struct decryptor_desc {
475446
u8 iv[GSS_KRB5_MAX_BLOCKSIZE];
476447
struct skcipher_request *req;
@@ -525,32 +496,6 @@ decryptor(struct scatterlist *sg, void *data)
525496
return 0;
526497
}
527498

528-
int
529-
gss_decrypt_xdr_buf(struct crypto_sync_skcipher *tfm, struct xdr_buf *buf,
530-
int offset)
531-
{
532-
int ret;
533-
struct decryptor_desc desc;
534-
SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);
535-
536-
/* XXXJBF: */
537-
BUG_ON((buf->len - offset) % crypto_sync_skcipher_blocksize(tfm) != 0);
538-
539-
skcipher_request_set_sync_tfm(req, tfm);
540-
skcipher_request_set_callback(req, 0, NULL, NULL);
541-
542-
memset(desc.iv, 0, sizeof(desc.iv));
543-
desc.req = req;
544-
desc.fragno = 0;
545-
desc.fraglen = 0;
546-
547-
sg_init_table(desc.frags, 4);
548-
549-
ret = xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc);
550-
skcipher_request_zero(req);
551-
return ret;
552-
}
553-
554499
/*
555500
* This function makes the assumption that it was ultimately called
556501
* from gss_wrap().

net/sunrpc/auth_gss/gss_krb5_internal.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,6 @@ u32 krb5_decrypt(struct crypto_sync_skcipher *key, void *iv, void *in,
172172
int xdr_extend_head(struct xdr_buf *buf, unsigned int base,
173173
unsigned int shiftlen);
174174

175-
int gss_encrypt_xdr_buf(struct crypto_sync_skcipher *tfm,
176-
struct xdr_buf *outbuf, int offset,
177-
struct page **pages);
178-
179-
int gss_decrypt_xdr_buf(struct crypto_sync_skcipher *tfm,
180-
struct xdr_buf *inbuf, int offset);
181-
182175
u32 gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
183176
struct xdr_buf *buf, struct page **pages);
184177

0 commit comments

Comments
 (0)