Makefile | 2 +- auth_gss.c | 2 ++ gss_generic_token.c | 7 +++++++ gss_krb5_crypto.c | 6 ++++++ gss_mech_switch.c | 16 ++++++++++++++++ sunrpcgss_syms.c | 37 ------------------------------------- svcauth_gss.c | 2 ++ 7 files changed, 34 insertions(+), 38 deletions(-) diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/auth_gss.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/auth_gss.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/auth_gss.c 2004-05-16 17:39:33.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/auth_gss.c 2004-05-16 17:39:37.000000000 -0400 @@ -132,6 +132,8 @@ print_hexl(u32 *p, u_int length, u_int o } } +EXPORT_SYMBOL(print_hexl); + static inline struct gss_cl_ctx * gss_get_ctx(struct gss_cl_ctx *ctx) { diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_generic_token.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_generic_token.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_generic_token.c 2004-05-16 17:39:29.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_generic_token.c 2004-05-16 17:39:37.000000000 -0400 @@ -32,6 +32,7 @@ */ #include +#include #include #include #include @@ -151,6 +152,8 @@ g_token_size(struct xdr_netobj *mech, un return(1 + der_length_size(body_size) + body_size); } +EXPORT_SYMBOL(g_token_size); + /* fills in a buffer with the token header. The buffer is assumed to be the right size. buf is advanced past the token header */ @@ -164,6 +167,8 @@ g_make_token_header(struct xdr_netobj *m TWRITE_STR(*buf, mech->data, ((int) mech->len)); } +EXPORT_SYMBOL(g_make_token_header); + /* * Given a buffer containing a token, reads and verifies the token, * leaving buf advanced past the token header, and setting body_size @@ -226,6 +231,8 @@ g_verify_token_header(struct xdr_netobj return(ret); } +EXPORT_SYMBOL(g_verify_token_header); + /* Given a buffer containing a token, returns a copy of the mech oid in * the parameter mech. */ u32 diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_krb5_crypto.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_krb5_crypto.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_krb5_crypto.c 2004-05-16 17:39:29.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_krb5_crypto.c 2004-05-16 17:39:37.000000000 -0400 @@ -88,6 +88,8 @@ out: return(ret); } +EXPORT_SYMBOL(krb5_encrypt); + u32 krb5_decrypt( struct crypto_tfm *tfm, @@ -128,6 +130,8 @@ out: return(ret); } +EXPORT_SYMBOL(krb5_decrypt); + void buf_to_sg(struct scatterlist *sg, char *ptr, int len) { sg->page = virt_to_page(ptr); @@ -201,3 +205,5 @@ out: crypto_free_tfm(tfm); return code; } + +EXPORT_SYMBOL(make_checksum); diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_mech_switch.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_mech_switch.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/gss_mech_switch.c 2004-05-16 17:39:33.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/gss_mech_switch.c 2004-05-16 18:39:32.000000000 -0400 @@ -119,6 +119,8 @@ gss_mech_register(struct gss_api_mech *g return 0; } +EXPORT_SYMBOL(gss_mech_register); + void gss_mech_unregister(struct gss_api_mech *gm) { @@ -129,6 +131,8 @@ gss_mech_unregister(struct gss_api_mech gss_mech_free(gm); } +EXPORT_SYMBOL(gss_mech_unregister); + struct gss_api_mech * gss_mech_get(struct gss_api_mech *gm) { @@ -136,6 +140,8 @@ gss_mech_get(struct gss_api_mech *gm) return gm; } +EXPORT_SYMBOL(gss_mech_get); + struct gss_api_mech * gss_mech_get_by_name(char *name) { @@ -155,6 +161,8 @@ gss_mech_get_by_name(char *name) } +EXPORT_SYMBOL(gss_mech_get_by_name); + static inline int mech_supports_pseudoflavor(struct gss_api_mech *gm, u32 pseudoflavor) { @@ -187,6 +195,8 @@ gss_mech_get_by_pseudoflavor(u32 pseudof return gm; } +EXPORT_SYMBOL(gss_mech_get_by_pseudoflavor); + u32 gss_pseudoflavor_to_service(struct gss_api_mech *gm, u32 pseudoflavor) { @@ -199,6 +209,8 @@ gss_pseudoflavor_to_service(struct gss_a return 0; } +EXPORT_SYMBOL(gss_pseudoflavor_to_service); + char * gss_service_to_auth_domain_name(struct gss_api_mech *gm, u32 service) { @@ -211,12 +223,16 @@ gss_service_to_auth_domain_name(struct g return NULL; } +EXPORT_SYMBOL(gss_service_to_auth_domain_name); + void gss_mech_put(struct gss_api_mech * gm) { module_put(gm->gm_owner); } +EXPORT_SYMBOL(gss_mech_put); + /* The mech could probably be determined from the token instead, but it's just * as easy for now to pass it in. */ u32 diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/Makefile linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/Makefile --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/Makefile 2004-05-16 17:39:33.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/Makefile 2004-05-16 17:39:37.000000000 -0400 @@ -5,7 +5,7 @@ obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o auth_rpcgss-objs := auth_gss.o gss_generic_token.o \ - sunrpcgss_syms.o gss_mech_switch.o svcauth_gss.o gss_krb5_crypto.o + gss_mech_switch.o svcauth_gss.o gss_krb5_crypto.o obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/sunrpcgss_syms.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/sunrpcgss_syms.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/sunrpcgss_syms.c 2004-05-16 18:38:37.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/sunrpcgss_syms.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,37 +0,0 @@ -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -/* svcauth_gss.c: */ -EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor); - -/* registering gss mechanisms to the mech switching code: */ -EXPORT_SYMBOL(gss_mech_register); -EXPORT_SYMBOL(gss_mech_unregister); -EXPORT_SYMBOL(gss_mech_get); -EXPORT_SYMBOL(gss_mech_get_by_pseudoflavor); -EXPORT_SYMBOL(gss_mech_get_by_name); -EXPORT_SYMBOL(gss_mech_put); -EXPORT_SYMBOL(gss_pseudoflavor_to_service); -EXPORT_SYMBOL(gss_service_to_auth_domain_name); - -/* generic functionality in gss code: */ -EXPORT_SYMBOL(g_make_token_header); -EXPORT_SYMBOL(g_verify_token_header); -EXPORT_SYMBOL(g_token_size); -EXPORT_SYMBOL(make_checksum); -EXPORT_SYMBOL(krb5_encrypt); -EXPORT_SYMBOL(krb5_decrypt); - -/* debug */ -EXPORT_SYMBOL(print_hexl); diff -u --recursive --new-file --show-c-function linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/svcauth_gss.c linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/svcauth_gss.c --- linux-2.6.6-09-gss_mech_clean/net/sunrpc/auth_gss/svcauth_gss.c 2004-05-16 17:39:33.000000000 -0400 +++ linux-2.6.6-10-gss_ksyms/net/sunrpc/auth_gss/svcauth_gss.c 2004-05-16 17:39:37.000000000 -0400 @@ -664,6 +664,8 @@ out: return stat; } +EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor); + static inline int read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj) {