Commit db8add57 authored by Kevin Coffman's avatar Kevin Coffman Committed by J. Bruce Fields

gss_krb5: move gss_krb5_crypto into the krb5 module

The gss_krb5_crypto.o object belongs in the rpcsec_gss_krb5 module.
Also, there is no need to export symbols from gss_krb5_crypto.c
Signed-off-by: default avatarKevin Coffman <kwc@citi.umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent d00953a5
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o
auth_rpcgss-objs := auth_gss.o gss_generic_token.o \ auth_rpcgss-objs := auth_gss.o gss_generic_token.o \
gss_mech_switch.o svcauth_gss.o gss_krb5_crypto.o gss_mech_switch.o svcauth_gss.o
obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o
rpcsec_gss_krb5-objs := gss_krb5_mech.o gss_krb5_seal.o gss_krb5_unseal.o \ rpcsec_gss_krb5-objs := gss_krb5_mech.o gss_krb5_seal.o gss_krb5_unseal.o \
gss_krb5_seqnum.o gss_krb5_wrap.o gss_krb5_seqnum.o gss_krb5_wrap.o gss_krb5_crypto.o
obj-$(CONFIG_RPCSEC_GSS_SPKM3) += rpcsec_gss_spkm3.o obj-$(CONFIG_RPCSEC_GSS_SPKM3) += rpcsec_gss_spkm3.o
......
...@@ -83,8 +83,6 @@ out: ...@@ -83,8 +83,6 @@ out:
return ret; return ret;
} }
EXPORT_SYMBOL(krb5_encrypt);
u32 u32
krb5_decrypt( krb5_decrypt(
struct crypto_blkcipher *tfm, struct crypto_blkcipher *tfm,
...@@ -118,8 +116,6 @@ out: ...@@ -118,8 +116,6 @@ out:
return ret; return ret;
} }
EXPORT_SYMBOL(krb5_decrypt);
static int static int
checksummer(struct scatterlist *sg, void *data) checksummer(struct scatterlist *sg, void *data)
{ {
...@@ -161,8 +157,6 @@ out: ...@@ -161,8 +157,6 @@ out:
return err ? GSS_S_FAILURE : 0; return err ? GSS_S_FAILURE : 0;
} }
EXPORT_SYMBOL(make_checksum);
struct encryptor_desc { struct encryptor_desc {
u8 iv[8]; /* XXX hard-coded blocksize */ u8 iv[8]; /* XXX hard-coded blocksize */
struct blkcipher_desc desc; struct blkcipher_desc desc;
...@@ -262,8 +256,6 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, ...@@ -262,8 +256,6 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,
return ret; return ret;
} }
EXPORT_SYMBOL(gss_encrypt_xdr_buf);
struct decryptor_desc { struct decryptor_desc {
u8 iv[8]; /* XXX hard-coded blocksize */ u8 iv[8]; /* XXX hard-coded blocksize */
struct blkcipher_desc desc; struct blkcipher_desc desc;
...@@ -334,5 +326,3 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, ...@@ -334,5 +326,3 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,
return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc); return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc);
} }
EXPORT_SYMBOL(gss_decrypt_xdr_buf);
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