[PATCH 06/28] gss_krb5: move krb5_crypto into the krb5 module

[J. Bruce Fields]

On Mon, Mar 31, 2008 at 04:26:21PM -0400, Kevin Coffman wrote:
> My version has the spkm3 code using make_spkm3_checksum()?

Gah, yes, of course, the last hit from my "grep" is actually just a
(mispelled) dprintk.  This file used to be generic, but it looks like it
hasn't been for a long time, so your patch is right.

But then we should also remove all the EXPORT_SYMBOL()'s from
gss_krb5_crypto.c and make sure a modular build still works.

--b.

> 
> On Mon, Mar 31, 2008 at 4:15 PM, J. Bruce Fields <bfields at fieldses.org> wrote:
> > On Mon, Mar 31, 2008 at 10:31:23AM -0400, Kevin Coffman wrote:
> >  > The gss_krb5_crypto.o object belongs in the rpcsec_gss_krb5 module.
> >
> >  $ git grep make_checksum net/sunrpc/auth_gss/
> >  net/sunrpc/auth_gss/gss_krb5_crypto.c:make_checksum(char *cksumname, char *heade
> >  net/sunrpc/auth_gss/gss_krb5_crypto.c:EXPORT_SYMBOL(make_checksum);
> >  net/sunrpc/auth_gss/gss_krb5_seal.c:    if (make_checksum("md5", krb5_hdr, 8, te
> >  net/sunrpc/auth_gss/gss_krb5_unseal.c:  if (make_checksum("md5", ptr - 2, 8, mes
> >  net/sunrpc/auth_gss/gss_krb5_wrap.c:    if (make_checksum("md5", krb5_hdr, 8, bu
> >  net/sunrpc/auth_gss/gss_krb5_wrap.c:    if (make_checksum("md5", ptr - 2, 8, buf
> >  net/sunrpc/auth_gss/gss_spkm3_seal.c:                   dprintk("RPC: spkm
> >
> >  So gss_spkm3_seal.c uses make_checksum, to give one example.
> >
> >  So it looks like this file now provides generic crypto stuff that's used
> >  by both mechanisms.  We might want to just rename it to something
> >  without "krb5" in the  name.
> >
> >  --b.
> >
> >
> >
> >
> >  >
> >  > Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
> >  > ---
> >  >
> >  >  net/sunrpc/auth_gss/Makefile |    4 ++--
> >  >  1 files changed, 2 insertions(+), 2 deletions(-)
> >  >
> >  > diff --git a/net/sunrpc/auth_gss/Makefile b/net/sunrpc/auth_gss/Makefile
> >  > index f3431a7..4de8bcf 100644
> >  > --- a/net/sunrpc/auth_gss/Makefile
> >  > +++ b/net/sunrpc/auth_gss/Makefile
> >  > @@ -5,12 +5,12 @@
> >  >  obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.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
> >  >
> >  >  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
> >  >
> >  >
> >
> >