diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
| commit | a0b9ce4bee60136363cfff7a93c4e42eab972c02 (patch) | |
| tree | 400984337fe3766653ff4cc2cb6b7d3d7f87f3f4 /src/lib/krb5 | |
| parent | a9266b1dec31de9f33b0d032b885edd377a23ee5 (diff) | |
| download | krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.zip krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.gz krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.bz2 | |
Windows/NT integration (V1_0_WIN32_BRANCH merge)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5')
169 files changed, 954 insertions, 502 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index e77f6b9..e2e717c 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + Mon Nov 18 20:42:39 1996 Ezra Peisach <epeisach@mit.edu> * configure.in: Set shared library version to 1.0. [krb5-libs/201] diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 7387c76..f9227fa 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,4 +1,7 @@ ##DOSBUILDTOP = ..\.. +##DOSLIBNAME=krb5.lib +##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst free.lst keytab.lst krb.lst os.lst posix.lst rcache.lst +##DOSOBJFILELIST=@asn1.lst @ccache.lst @err_tbls.lst @free.lst @keytab.lst @krb.lst @os.lst @posix.lst @rcache.lst ANAME_DBDEP=@ANAME_DBDEP@ ANAME_DBLIB=@ANAME_DBLIB@ @@ -28,7 +31,6 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ all-unix:: - all-windows:: libkrb5.$(STEXT): $(LIBDONE) @@ -47,62 +49,62 @@ clean-windows:: $(RM) krb5.lib krb5.bak all-windows:: - cd ASN.1 - @echo Making in lib\asn.1 + cd asn.1 + @echo Making in krb5\asn.1 -$(MAKE) -$(MFLAGS) - cd ..\CCACHE - @echo Making in lib\ccache + cd ..\ccache + @echo Making in krb5\ccache -$(MAKE) -$(MFLAGS) cd ..\error_tables - @echo Making in lib\error_tables + @echo Making in krb5\error_tables -$(MAKE) -$(MFLAGS) - cd ..\FREE - @echo Making in lib\free + cd ..\free + @echo Making in krb5\free -$(MAKE) -$(MFLAGS) - cd ..\KEYTAB - @echo Making in lib\keytab + cd ..\keytab + @echo Making in krb5\keytab -$(MAKE) -$(MFLAGS) - cd ..\KRB - @echo Making in lib\krb + cd ..\krb + @echo Making in krb5\krb -$(MAKE) -$(MFLAGS) - cd ..\OS - @echo Making in lib\os + cd ..\os + @echo Making in krb5\os -$(MAKE) -$(MFLAGS) - cd ..\POSIX - @echo Making in lib\posix + cd ..\posix + @echo Making in krb5\posix -$(MAKE) -$(MFLAGS) - cd ..\RCACHE - @echo Making in lib\rcache + cd ..\rcache + @echo Making in krb5\rcache -$(MAKE) -$(MFLAGS) cd .. clean-windows:: cd ASN.1 - @echo Making clean in lib\asn.1 + @echo Making clean in krb5\asn.1 -$(MAKE) -$(MFLAGS) clean cd ..\CCACHE - @echo Making clean in lib\ccache + @echo Making clean in krb5\ccache -$(MAKE) -$(MFLAGS) clean cd ..\error_tables - @echo Making clean in lib\error_tables + @echo Making clean in krb5\error_tables -$(MAKE) -$(MFLAGS) clean cd ..\FREE - @echo Making clean in lib\free + @echo Making clean in krb5\free -$(MAKE) -$(MFLAGS) clean cd ..\KEYTAB - @echo Making clean in lib\keytab + @echo Making clean in krb5\keytab -$(MAKE) -$(MFLAGS) clean cd ..\KRB - @echo Making clean in lib\krb + @echo Making clean in krb5\krb -$(MAKE) -$(MFLAGS) clean cd ..\OS - @echo Making clean in lib\os + @echo Making clean in krb5\os -$(MAKE) -$(MFLAGS) clean cd ..\POSIX - @echo Making clean in lib\posix + @echo Making clean in krb5\posix -$(MAKE) -$(MFLAGS) clean cd ..\RCACHE - @echo Making clean in lib\rcache + @echo Making clean in krb5\rcache -$(MAKE) -$(MFLAGS) clean cd .. @echo Making clean locally diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 8aa3684..64ce1a4 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + Thu Nov 14 20:57:55 1996 Theodore Y. Ts'o <tytso@mit.edu> * asn1_k_encode.c (asn1_encode_principal_name): Be liberal about diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 034566e..91afd6f 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,7 +1,9 @@ CFLAGS=$(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYDIR=asn.1 +##DOSOBJFILE=..\asn1.lst +##WIN16##LIBNAME=..\krb5.lib EHDRDIR=$(BUILDTOP)/include/krb5/asn.1 @@ -35,7 +37,12 @@ OBJS= \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -47,4 +54,4 @@ clean-mac:: $(RM) $(OBJS) clean-windows:: - $(RM) *.obj + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 56cea92..f2b4d65 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,7 +1,15 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * ccbase.c, ccdefault.c: + DLL export basic ccache functions + Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command - line. It's set in the windows.in prologue for all Makefiles anyway. + line. It's set in the windows.in prologue for all + Makefiles anyway. Wed Feb 7 00:23:18 1996 Theodore Y. Ts'o <tytso@dcl> diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index c95b6f7..5661182 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=ccache +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib MAC_SUBDIRS = file stdio @@ -22,11 +24,19 @@ SRCS= $(srcdir)/ccbase.c \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) - cd FILE - @echo Making in ccache\file - -$(MAKE) -$(MFLAGS) - cd .. +all-windows:: subdirs $(OBJFILE) + +##DOSsubdirs:: file\file.lst +##DOSfile\file.lst:: +##DOS cd file +##DOS @echo Making in krb5\ccache\file +##DOS -$(MAKE) -$(MFLAGS) +##DOS cd .. + +##DOS$(OBJFILE): $(OBJS) file\file.lst +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE) shared: mkdir shared @@ -36,8 +46,9 @@ clean-unix:: clean-mac: clean-windows:: - cd FILE - @echo Making clean in ccache\file + cd file + @echo Making clean in krb5\ccache\file -$(MAKE) -$(MFLAGS) clean cd .. - @echo Making clean locally + @echo Making clean in krb5\ccache + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index 05a18d0..e8bff02 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -26,7 +26,6 @@ #include "k5-int.h" -extern krb5_cc_ops *krb5_cc_dfl_ops; struct krb5_cc_typelist { krb5_cc_ops *ops; @@ -39,10 +38,10 @@ static struct krb5_cc_typelist *cc_typehead = 0; * If override is set, replace any existing ccache with that type tag */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_cc_register(context, ops, override) krb5_context context; - krb5_cc_ops *ops; + krb5_cc_ops FAR *ops; krb5_boolean override; { struct krb5_cc_typelist *t; @@ -73,7 +72,7 @@ krb5_cc_register(context, ops, override) * particular cache type. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_cc_resolve (context, name, cache) krb5_context context; char *name; diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c index c5b8f4c..5e3cd53 100644 --- a/src/lib/krb5/ccache/ccdefault.c +++ b/src/lib/krb5/ccache/ccdefault.c @@ -26,10 +26,10 @@ #include "k5-int.h" -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_cc_default(context, ccache) krb5_context context; - krb5_ccache *ccache; + krb5_ccache FAR *ccache; { return krb5_cc_resolve(context, krb5_cc_default_name(context), ccache); } diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 8b568c1..43f4a70 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,16 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * configure.in: Test for chmod and fchmod (not on Windows) + + * fcc-proto.h, fcc_close.c, fcc_destry.c, fcc_eseq.c, fcc_gennew.c, + fcc_getnam.c, fcc_gprin.c, fcc_init.c, fcc_nseq.c, fcc_ops.c, + fcc_reslv.c, fcc_retrv.c, fcc_sflags.c, fcc_sseq.c, fcc_store.c: + Changed the calling conventions of the internal ccache + functions to comply with the new function calling + conventions of the ccache dispatch functions (win16/win32) + Thu Aug 15 16:46:00 1996 Tom Yu <tlyu@mit.edu> * fcc_retrv.c (flags_match): Add parens to def'n of flags_match to diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 48805c3..1c1c246 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. -##DOSLIBNAME=..\..\krb5.lib +##DOSMYNAME = ccache\file +##DOSOBJFILE = file.lst +##WIN16##LIBNAME=..\..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -25,7 +27,12 @@ SRCS = $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -35,3 +42,4 @@ clean-unix:: clean-mac:: clean-windows:: + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in index ee042a1..72b51d7 100644 --- a/src/lib/krb5/ccache/file/configure.in +++ b/src/lib/krb5/ccache/file/configure.in @@ -2,6 +2,7 @@ AC_INIT(configure.in) CONFIG_RULES AC_HAVE_HEADERS(unistd.h) AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK)) +AC_HAVE_FUNCS(fchmod chmod) V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h index 7e8f7c1..61b5cf3 100644 --- a/src/lib/krb5/ccache/file/fcc-proto.h +++ b/src/lib/krb5/ccache/file/fcc-proto.h @@ -127,7 +127,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); /* fcc_ops.c */ -extern krb5_cc_ops krb5_cc_file_ops; +KRB5_DLLIMP extern krb5_cc_ops krb5_cc_file_ops; krb5_error_code krb5_change_cache KRB5_PROTOTYPE((void)); diff --git a/src/lib/krb5/ccache/file/fcc_close.c b/src/lib/krb5/ccache/file/fcc_close.c index 71e52f5..6e7997a 100644 --- a/src/lib/krb5/ccache/file/fcc_close.c +++ b/src/lib/krb5/ccache/file/fcc_close.c @@ -35,7 +35,7 @@ * Closes the file cache, invalidates the id, and frees any resources * associated with the cache. */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_close(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c index 02deb72..37914e1 100644 --- a/src/lib/krb5/ccache/file/fcc_destry.c +++ b/src/lib/krb5/ccache/file/fcc_destry.c @@ -34,7 +34,7 @@ * Errors: * system errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_destroy(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c index 369d667..d6ce34e 100644 --- a/src/lib/krb5/ccache/file/fcc_eseq.c +++ b/src/lib/krb5/ccache/file/fcc_eseq.c @@ -40,7 +40,7 @@ * and invalidates the cursor (it must never be used after this call). */ /* ARGSUSED */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get(context, id, cursor) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c index 177e0e9..a76a192 100644 --- a/src/lib/krb5/ccache/file/fcc_gennew.c +++ b/src/lib/krb5/ccache/file/fcc_gennew.c @@ -53,7 +53,7 @@ extern krb5_cc_ops krb5_fcc_ops; * krb5_ccache. id is undefined. * system errors (from open) */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new (context, id) krb5_context context; krb5_ccache *id; @@ -111,8 +111,8 @@ krb5_fcc_generate_new (context, id) int errsave, cnt; /* Ignore user's umask, set mode = 0600 */ -#ifdef NOFCHMOD -#ifndef NOCHMOD +#ifndef HAVE_FCHMOD +#ifdef HAVE_CHMOD chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR); #endif #else diff --git a/src/lib/krb5/ccache/file/fcc_getnam.c b/src/lib/krb5/ccache/file/fcc_getnam.c index 5145359..6a7b955 100644 --- a/src/lib/krb5/ccache/file/fcc_getnam.c +++ b/src/lib/krb5/ccache/file/fcc_getnam.c @@ -35,7 +35,7 @@ * Returns: * The name of the file cred cache id. */ -KRB5_DLLIMP char * KRB5_CALLCONV +char * KRB5_CALLCONV krb5_fcc_get_name (context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_gprin.c b/src/lib/krb5/ccache/file/fcc_gprin.c index 97369db..72d6c77 100644 --- a/src/lib/krb5/ccache/file/fcc_gprin.c +++ b/src/lib/krb5/ccache/file/fcc_gprin.c @@ -40,7 +40,7 @@ * system errors * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal(context, id, princ) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c index 8f661ba..b3bf74d 100644 --- a/src/lib/krb5/ccache/file/fcc_init.c +++ b/src/lib/krb5/ccache/file/fcc_init.c @@ -40,7 +40,7 @@ * system errors * permission errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_initialize(context, id, princ) krb5_context context; krb5_ccache id; @@ -51,8 +51,8 @@ krb5_fcc_initialize(context, id, princ) MAYBE_OPEN(context, id, FCC_OPEN_AND_ERASE); -#ifdef NOFCHMOD -#ifndef NOCHMOD +#ifndef HAVE_FCHMOD +#ifdef HAVE_CHMOD reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE); #endif #else diff --git a/src/lib/krb5/ccache/file/fcc_nseq.c b/src/lib/krb5/ccache/file/fcc_nseq.c index 96650ac..92df329 100644 --- a/src/lib/krb5/ccache/file/fcc_nseq.c +++ b/src/lib/krb5/ccache/file/fcc_nseq.c @@ -48,7 +48,7 @@ * Errors: * system errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_next_cred(context, id, cursor, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_ops.c b/src/lib/krb5/ccache/file/fcc_ops.c index c9ff939..e873bed 100644 --- a/src/lib/krb5/ccache/file/fcc_ops.c +++ b/src/lib/krb5/ccache/file/fcc_ops.c @@ -64,7 +64,7 @@ krb5_change_cache (void) { return 0; } -unsigned int INTERFACE +KRB5_DLLIMP unsigned int KRB5_CALLCONV krb5_get_notification_message (void) { static unsigned int message = 0; @@ -80,7 +80,7 @@ krb5_change_cache () { return 0; } -unsigned int INTERFACE +unsigned int krb5_get_notification_message () { return 0; diff --git a/src/lib/krb5/ccache/file/fcc_reslv.c b/src/lib/krb5/ccache/file/fcc_reslv.c index 4b6d381..8ba7d78 100644 --- a/src/lib/krb5/ccache/file/fcc_reslv.c +++ b/src/lib/krb5/ccache/file/fcc_reslv.c @@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_fcc_ops; * krb5_ccache. id is undefined. * permission errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_resolve (context, id, residual) krb5_context context; krb5_ccache *id; diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c index ab0db7c..e12d06e 100644 --- a/src/lib/krb5/ccache/file/fcc_retrv.c +++ b/src/lib/krb5/ccache/file/fcc_retrv.c @@ -90,7 +90,7 @@ register const krb5_data *data1, *data2; * permission errors * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_retrieve(context, id, whichfields, mcreds, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_sflags.c b/src/lib/krb5/ccache/file/fcc_sflags.c index d74f2b0..9f9b601 100644 --- a/src/lib/krb5/ccache/file/fcc_sflags.c +++ b/src/lib/krb5/ccache/file/fcc_sflags.c @@ -39,7 +39,7 @@ * Effects: * Sets the operational flags of id to flags. */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags(context, id, flags) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_sseq.c b/src/lib/krb5/ccache/file/fcc_sseq.c index dac3894..8e215be 100644 --- a/src/lib/krb5/ccache/file/fcc_sseq.c +++ b/src/lib/krb5/ccache/file/fcc_sseq.c @@ -40,7 +40,7 @@ * KRB5_CC_NOMEM * system errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_start_seq_get(context, id, cursor) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_store.c b/src/lib/krb5/ccache/file/fcc_store.c index fec27ae..4915e4e 100644 --- a/src/lib/krb5/ccache/file/fcc_store.c +++ b/src/lib/krb5/ccache/file/fcc_store.c @@ -41,7 +41,7 @@ * system errors * storage failure errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_fcc_store(context, id, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc-proto.h b/src/lib/krb5/ccache/memory/mcc-proto.h index 6cc83f9..d41ad49 100644 --- a/src/lib/krb5/ccache/memory/mcc-proto.h +++ b/src/lib/krb5/ccache/memory/mcc-proto.h @@ -29,46 +29,46 @@ #define KRB5_MCC_PROTO__ /* mcc_close.c */ -krb5_error_code INTERFACE krb5_mcc_close +krb5_error_code KRB5_CALLCONV krb5_mcc_close PROTOTYPE((krb5_context, krb5_ccache id )); /* mcc_destry.c */ -krb5_error_code INTERFACE krb5_mcc_destroy +krb5_error_code KRB5_CALLCONV krb5_mcc_destroy PROTOTYPE((krb5_context, krb5_ccache id )); /* mcc_eseq.c */ -krb5_error_code INTERFACE krb5_mcc_end_seq_get +krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); /* mcc_gennew.c */ -krb5_error_code INTERFACE krb5_mcc_generate_new +krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new PROTOTYPE((krb5_context, krb5_ccache *id )); /* mcc_getnam.c */ -char * INTERFACE krb5_mcc_get_name +char * KRB5_CALLCONV krb5_mcc_get_name PROTOTYPE((krb5_context, krb5_ccache id )); /* mcc_gprin.c */ -krb5_error_code INTERFACE krb5_mcc_get_principal +krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); /* mcc_init.c */ -krb5_error_code INTERFACE krb5_mcc_initialize +krb5_error_code KRB5_CALLCONV krb5_mcc_initialize PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); /* mcc_nseq.c */ -krb5_error_code INTERFACE krb5_mcc_next_cred +krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , krb5_creds *creds )); /* mcc_reslv.c */ -krb5_error_code INTERFACE krb5_mcc_resolve +krb5_error_code KRB5_CALLCONV krb5_mcc_resolve PROTOTYPE((krb5_context, krb5_ccache *id , char *residual )); /* mcc_retrv.c */ -krb5_error_code INTERFACE krb5_mcc_retrieve +krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags whichfields , @@ -76,15 +76,15 @@ krb5_error_code INTERFACE krb5_mcc_retrieve krb5_creds *creds )); /* mcc_sseq.c */ -krb5_error_code INTERFACE krb5_mcc_start_seq_get +krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); /* mcc_store.c */ -krb5_error_code INTERFACE krb5_mcc_store +krb5_error_code KRB5_CALLCONV krb5_mcc_store PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); /* mcc_sflags.c */ -krb5_error_code INTERFACE krb5_mcc_set_flags +krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); /* mcc_ops.c */ diff --git a/src/lib/krb5/ccache/memory/mcc_close.c b/src/lib/krb5/ccache/memory/mcc_close.c index b40a9b3..514a4ad 100644 --- a/src/lib/krb5/ccache/memory/mcc_close.c +++ b/src/lib/krb5/ccache/memory/mcc_close.c @@ -35,7 +35,7 @@ * Closes the file cache, invalidates the id, and frees any resources * associated with the cache. */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_close(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_destry.c b/src/lib/krb5/ccache/memory/mcc_destry.c index 0c05052..e694678 100644 --- a/src/lib/krb5/ccache/memory/mcc_destry.c +++ b/src/lib/krb5/ccache/memory/mcc_destry.c @@ -52,7 +52,7 @@ krb5_mcc_free(context, id) * Errors: * none */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_destroy(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_eseq.c b/src/lib/krb5/ccache/memory/mcc_eseq.c index 907951b..c3d264c 100644 --- a/src/lib/krb5/ccache/memory/mcc_eseq.c +++ b/src/lib/krb5/ccache/memory/mcc_eseq.c @@ -40,7 +40,7 @@ * and invalidates the cursor (it must never be used after this call). */ /* ARGSUSED */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get(context, id, cursor) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_gennew.c b/src/lib/krb5/ccache/memory/mcc_gennew.c index 0e7dfa5..7624961 100644 --- a/src/lib/krb5/ccache/memory/mcc_gennew.c +++ b/src/lib/krb5/ccache/memory/mcc_gennew.c @@ -43,7 +43,7 @@ extern krb5_cc_ops krb5_mcc_ops; * krb5_ccache. id is undefined. * system errors (from open) */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new (context, id) krb5_context context; krb5_ccache *id; diff --git a/src/lib/krb5/ccache/memory/mcc_getnam.c b/src/lib/krb5/ccache/memory/mcc_getnam.c index fdfcaa8..e86b083 100644 --- a/src/lib/krb5/ccache/memory/mcc_getnam.c +++ b/src/lib/krb5/ccache/memory/mcc_getnam.c @@ -35,7 +35,7 @@ * Returns: * The name of the file cred cache id. */ -char * INTERFACE +char * KRB5_CALLCONV krb5_mcc_get_name (context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_gprin.c b/src/lib/krb5/ccache/memory/mcc_gprin.c index 2cc55d3..81624d7 100644 --- a/src/lib/krb5/ccache/memory/mcc_gprin.c +++ b/src/lib/krb5/ccache/memory/mcc_gprin.c @@ -40,7 +40,7 @@ * system errors * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal(context, id, princ) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_init.c b/src/lib/krb5/ccache/memory/mcc_init.c index 8aac3f1..5f4a40a 100644 --- a/src/lib/krb5/ccache/memory/mcc_init.c +++ b/src/lib/krb5/ccache/memory/mcc_init.c @@ -40,7 +40,7 @@ */ void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id)); -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_initialize(context, id, princ) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_nseq.c b/src/lib/krb5/ccache/memory/mcc_nseq.c index 30ecdba..a68b9f9 100644 --- a/src/lib/krb5/ccache/memory/mcc_nseq.c +++ b/src/lib/krb5/ccache/memory/mcc_nseq.c @@ -46,7 +46,7 @@ * Errors: * system errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred(context, id, cursor, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_reslv.c b/src/lib/krb5/ccache/memory/mcc_reslv.c index 6146c6c..a2468d8 100644 --- a/src/lib/krb5/ccache/memory/mcc_reslv.c +++ b/src/lib/krb5/ccache/memory/mcc_reslv.c @@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_mcc_ops; * krb5_ccache. id is undefined. * permission errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_resolve (context, id, residual) krb5_context context; krb5_ccache *id; diff --git a/src/lib/krb5/ccache/memory/mcc_retrv.c b/src/lib/krb5/ccache/memory/mcc_retrv.c index bb07171..ae35101 100644 --- a/src/lib/krb5/ccache/memory/mcc_retrv.c +++ b/src/lib/krb5/ccache/memory/mcc_retrv.c @@ -86,7 +86,7 @@ register const krb5_data *data1, *data2; * permission errors * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve(context, id, whichfields, mcreds, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_sflags.c b/src/lib/krb5/ccache/memory/mcc_sflags.c index 1484ab8..a12c696 100644 --- a/src/lib/krb5/ccache/memory/mcc_sflags.c +++ b/src/lib/krb5/ccache/memory/mcc_sflags.c @@ -39,7 +39,7 @@ * Effects: * Sets the operational flags of id to flags. */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags(context, id, flags) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_sseq.c b/src/lib/krb5/ccache/memory/mcc_sseq.c index 5954de3..bb87e47 100644 --- a/src/lib/krb5/ccache/memory/mcc_sseq.c +++ b/src/lib/krb5/ccache/memory/mcc_sseq.c @@ -40,7 +40,7 @@ * KRB5_CC_NOMEM * system errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get(context, id, cursor) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/memory/mcc_store.c b/src/lib/krb5/ccache/memory/mcc_store.c index 8b2e22d..91a433f 100644 --- a/src/lib/krb5/ccache/memory/mcc_store.c +++ b/src/lib/krb5/ccache/memory/mcc_store.c @@ -23,7 +23,7 @@ * system errors * storage failure errors */ -krb5_error_code INTERFACE +krb5_error_code KRB5_CALLCONV krb5_mcc_store(context, id, creds) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c index 384e8eb..c834769 100644 --- a/src/lib/krb5/ccache/ser_cc.c +++ b/src/lib/krb5/ccache/ser_cc.c @@ -203,7 +203,7 @@ krb5_ccache_internalize(kcontext, argp, buffer, lenremain) /* * Register the ccache serializer. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_ccache_init(kcontext) krb5_context kcontext; { diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index ce88cc6..863749b 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * init_ets.c: dll export krb5_init_ets() + Fri Dec 13 14:55:43 1996 Theodore Y. Ts'o <tytso@mit.edu> * krb5_err.et: Added the error codes KRB5_APPL_EXPIRED and diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index 10ddf76..84fb64b 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=error_tables +##DOSOBJFILE=..\err_tbls.lst +##WIN16##LIBNAME=..\krb5.lib EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5 @@ -30,8 +32,12 @@ SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \ all-unix:: $(HDRS) shared $(OBJS) all-mac:: $(OBJS) +all-windows:: $(OBJFILE) -all-windows:: $(OBJS) +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared diff --git a/src/lib/krb5/error_tables/init_ets.c b/src/lib/krb5/error_tables/init_ets.c index 7a4e32f..9de65c5 100644 --- a/src/lib/krb5/error_tables/init_ets.c +++ b/src/lib/krb5/error_tables/init_ets.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_init_ets (context) krb5_context context; { diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index 6ad05dc..327124b 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,15 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * f_addr.c f_address.c f_ap_rep.c f_ap_req.c f_arep_enc.c + f_auth_cnt.c f_authdata.c f_authent.c f_chksum.c f_cred.c + f_cred_cnt.c f_cred_enc.c f_creds.c f_enc_kdc.c f_enc_tkt.c + f_error.c f_kdc_rp.c f_kdc_rq.c f_keyblock.c f_last_req.c + f_padata.c f_princ.c f_priv.c f_priv_enc.c f_pwd_data.c + f_pwd_seq.c f_safe.c f_tckt.c f_tckts.c f_tkt_auth.c + DLL export free routines in krb5.h + Fri Aug 2 14:03:44 1996 Barry Jaspan <bjaspan@DUN-DUN-NOODLES> * f_keyblock.c (krb5_free_keyblock_contents): added diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index 60b93b0..0384d53 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=free +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -77,7 +79,12 @@ SRCS= \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -87,5 +94,5 @@ clean-unix:: clean-mac:: clean-windows:: - + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c index d8f58b7..9faea10 100644 --- a/src/lib/krb5/free/f_addr.c +++ b/src/lib/krb5/free/f_addr.c @@ -25,10 +25,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_address(context, val) krb5_context context; - krb5_address *val; + krb5_address FAR *val; { if (val->contents) krb5_xfree(val->contents); diff --git a/src/lib/krb5/free/f_address.c b/src/lib/krb5/free/f_address.c index 7f3bfa6..7387eba 100644 --- a/src/lib/krb5/free/f_address.c +++ b/src/lib/krb5/free/f_address.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_addresses(context, val) krb5_context context; - krb5_address **val; + krb5_address FAR * FAR *val; { register krb5_address **temp; diff --git a/src/lib/krb5/free/f_ap_rep.c b/src/lib/krb5/free/f_ap_rep.c index 0301af1..50e6710 100644 --- a/src/lib/krb5/free/f_ap_rep.c +++ b/src/lib/krb5/free/f_ap_rep.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_ap_rep(context, val) krb5_context context; - register krb5_ap_rep *val; + register krb5_ap_rep FAR *val; { if (val->enc_part.ciphertext.data) krb5_xfree(val->enc_part.ciphertext.data); diff --git a/src/lib/krb5/free/f_ap_req.c b/src/lib/krb5/free/f_ap_req.c index 1b9a93a..8e63a6e 100644 --- a/src/lib/krb5/free/f_ap_req.c +++ b/src/lib/krb5/free/f_ap_req.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_ap_req(context, val) krb5_context context; - register krb5_ap_req *val; + register krb5_ap_req FAR *val; { if (val->ticket) krb5_free_ticket(context, val->ticket); diff --git a/src/lib/krb5/free/f_arep_enc.c b/src/lib/krb5/free/f_arep_enc.c index ec1d5ef..99eff9a 100644 --- a/src/lib/krb5/free/f_arep_enc.c +++ b/src/lib/krb5/free/f_arep_enc.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_ap_rep_enc_part(context, val) krb5_context context; - krb5_ap_rep_enc_part *val; + krb5_ap_rep_enc_part FAR *val; { if (val->subkey) krb5_free_keyblock(context, val->subkey); diff --git a/src/lib/krb5/free/f_auth_cnt.c b/src/lib/krb5/free/f_auth_cnt.c index d061f26..8b7a11a 100644 --- a/src/lib/krb5/free/f_auth_cnt.c +++ b/src/lib/krb5/free/f_auth_cnt.c @@ -27,10 +27,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_authenticator_contents(context, val) krb5_context context; - krb5_authenticator *val; + krb5_authenticator FAR *val; { if (val->checksum) krb5_free_checksum(context, val->checksum); diff --git a/src/lib/krb5/free/f_authdata.c b/src/lib/krb5/free/f_authdata.c index fba8dd3..f91a26b 100644 --- a/src/lib/krb5/free/f_authdata.c +++ b/src/lib/krb5/free/f_authdata.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_authdata(context, val) krb5_context context; -krb5_authdata **val; + krb5_authdata FAR * FAR *val; { register krb5_authdata **temp; diff --git a/src/lib/krb5/free/f_authent.c b/src/lib/krb5/free/f_authent.c index f4d1c06..898da74 100644 --- a/src/lib/krb5/free/f_authent.c +++ b/src/lib/krb5/free/f_authent.c @@ -27,10 +27,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_authenticator(context, val) krb5_context context; - krb5_authenticator *val; + krb5_authenticator FAR *val; { if (val->checksum) krb5_free_checksum(context, val->checksum); diff --git a/src/lib/krb5/free/f_chksum.c b/src/lib/krb5/free/f_chksum.c index beab745..ac2fd76 100644 --- a/src/lib/krb5/free/f_chksum.c +++ b/src/lib/krb5/free/f_chksum.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_checksum(context, val) krb5_context context; register krb5_checksum *val; diff --git a/src/lib/krb5/free/f_cred.c b/src/lib/krb5/free/f_cred.c index 7cc2a9a..b572aeb 100644 --- a/src/lib/krb5/free/f_cred.c +++ b/src/lib/krb5/free/f_cred.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_cred(context, val) krb5_context context; - register krb5_cred *val; + register krb5_cred FAR *val; { if (val->tickets) krb5_free_tickets(context, val->tickets); diff --git a/src/lib/krb5/free/f_cred_cnt.c b/src/lib/krb5/free/f_cred_cnt.c index 575b075..6f40499 100644 --- a/src/lib/krb5/free/f_cred_cnt.c +++ b/src/lib/krb5/free/f_cred_cnt.c @@ -31,10 +31,10 @@ * the credentials structures */ -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_cred_contents(context, val) krb5_context context; - krb5_creds *val; + krb5_creds FAR *val; { if (val->client) krb5_free_principal(context, val->client); diff --git a/src/lib/krb5/free/f_cred_enc.c b/src/lib/krb5/free/f_cred_enc.c index d14b3d8..24c06ea 100644 --- a/src/lib/krb5/free/f_cred_enc.c +++ b/src/lib/krb5/free/f_cred_enc.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_cred_enc_part(context, val) krb5_context context; - register krb5_cred_enc_part *val; + register krb5_cred_enc_part FAR *val; { register krb5_cred_info **temp; diff --git a/src/lib/krb5/free/f_creds.c b/src/lib/krb5/free/f_creds.c index 7d00afe..b47b4fd 100644 --- a/src/lib/krb5/free/f_creds.c +++ b/src/lib/krb5/free/f_creds.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_creds(context, val) krb5_context context; - krb5_creds *val; + krb5_creds FAR *val; { krb5_free_cred_contents(context, val); krb5_xfree(val); diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c index 1022376..b45d28a 100644 --- a/src/lib/krb5/free/f_enc_kdc.c +++ b/src/lib/krb5/free/f_enc_kdc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_enc_kdc_rep_part(context, val) krb5_context context; register krb5_enc_kdc_rep_part *val; diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c index 3c2aa3a..409ed5a 100644 --- a/src/lib/krb5/free/f_enc_tkt.c +++ b/src/lib/krb5/free/f_enc_tkt.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_enc_tkt_part(context, val) krb5_context context; - krb5_enc_tkt_part *val; + krb5_enc_tkt_part FAR *val; { if (val->session) krb5_free_keyblock(context, val->session); diff --git a/src/lib/krb5/free/f_error.c b/src/lib/krb5/free/f_error.c index a24a6c4..16b5c52 100644 --- a/src/lib/krb5/free/f_error.c +++ b/src/lib/krb5/free/f_error.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_error(context, val) krb5_context context; - register krb5_error *val; + register krb5_error FAR *val; { if (val->client) krb5_free_principal(context, val->client); diff --git a/src/lib/krb5/free/f_kdc_rp.c b/src/lib/krb5/free/f_kdc_rp.c index aba2fff..b424f36 100644 --- a/src/lib/krb5/free/f_kdc_rp.c +++ b/src/lib/krb5/free/f_kdc_rp.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_kdc_rep(context, val) krb5_context context; -krb5_kdc_rep *val; + krb5_kdc_rep FAR *val; { if (val->padata) krb5_free_pa_data(context, val->padata); diff --git a/src/lib/krb5/free/f_kdc_rq.c b/src/lib/krb5/free/f_kdc_rq.c index 2b1ad90..9116850 100644 --- a/src/lib/krb5/free/f_kdc_rq.c +++ b/src/lib/krb5/free/f_kdc_rq.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_kdc_req(context, val) krb5_context context; - krb5_kdc_req *val; + krb5_kdc_req FAR *val; { if (val->padata) krb5_free_pa_data(context, val->padata); diff --git a/src/lib/krb5/free/f_keyblock.c b/src/lib/krb5/free/f_keyblock.c index f3e13cf..8d6950e 100644 --- a/src/lib/krb5/free/f_keyblock.c +++ b/src/lib/krb5/free/f_keyblock.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_keyblock_contents(context, key) krb5_context context; - register krb5_keyblock *key; + register krb5_keyblock FAR *key; { if (key->contents) { memset(key->contents, 0, key->length); @@ -38,10 +38,10 @@ krb5_free_keyblock_contents(context, key) return; } -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_keyblock(context, val) krb5_context context; - register krb5_keyblock *val; + register krb5_keyblock FAR *val; { krb5_free_keyblock_contents(context, val); krb5_xfree(val); diff --git a/src/lib/krb5/free/f_last_req.c b/src/lib/krb5/free/f_last_req.c index 278b6f4..cb0959f 100644 --- a/src/lib/krb5/free/f_last_req.c +++ b/src/lib/krb5/free/f_last_req.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_last_req(context, val) krb5_context context; - krb5_last_req_entry **val; + krb5_last_req_entry FAR * FAR *val; { register krb5_last_req_entry **temp; diff --git a/src/lib/krb5/free/f_padata.c b/src/lib/krb5/free/f_padata.c index 9540014..332bf02 100644 --- a/src/lib/krb5/free/f_padata.c +++ b/src/lib/krb5/free/f_padata.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_pa_data(context, val) krb5_context context; - krb5_pa_data **val; + krb5_pa_data FAR * FAR *val; { register krb5_pa_data **temp; diff --git a/src/lib/krb5/free/f_princ.c b/src/lib/krb5/free/f_princ.c index 4ccf739..af1c07e 100644 --- a/src/lib/krb5/free/f_princ.c +++ b/src/lib/krb5/free/f_princ.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_principal(context, val) krb5_context context; krb5_principal val; diff --git a/src/lib/krb5/free/f_priv.c b/src/lib/krb5/free/f_priv.c index 0686142..f781ce6 100644 --- a/src/lib/krb5/free/f_priv.c +++ b/src/lib/krb5/free/f_priv.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_priv(context, val) krb5_context context; -register krb5_priv *val; + register krb5_priv FAR *val; { if (val->enc_part.ciphertext.data) krb5_xfree(val->enc_part.ciphertext.data); diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c index 8e25602..cc48e08 100644 --- a/src/lib/krb5/free/f_priv_enc.c +++ b/src/lib/krb5/free/f_priv_enc.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_priv_enc_part(context, val) krb5_context context; - register krb5_priv_enc_part *val; + register krb5_priv_enc_part FAR *val; { if (val->user_data.data) krb5_xfree(val->user_data.data); diff --git a/src/lib/krb5/free/f_pwd_data.c b/src/lib/krb5/free/f_pwd_data.c index 2a92336..386e004 100644 --- a/src/lib/krb5/free/f_pwd_data.c +++ b/src/lib/krb5/free/f_pwd_data.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_pwd_data(context, val) krb5_context context; -krb5_pwd_data *val; + krb5_pwd_data FAR *val; { if (val->element) krb5_free_pwd_sequences(context, val->element); diff --git a/src/lib/krb5/free/f_pwd_seq.c b/src/lib/krb5/free/f_pwd_seq.c index 436fb68..af1a969 100644 --- a/src/lib/krb5/free/f_pwd_seq.c +++ b/src/lib/krb5/free/f_pwd_seq.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_pwd_sequences(context, val) krb5_context context; - passwd_phrase_element **val; + passwd_phrase_element FAR * FAR *val; { if ((*val)->passwd) krb5_xfree((*val)->passwd); diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c index 11a3159..30a8650 100644 --- a/src/lib/krb5/free/f_safe.c +++ b/src/lib/krb5/free/f_safe.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_safe(context, val) krb5_context context; - register krb5_safe *val; + register krb5_safe FAR *val; { if (val->user_data.data) krb5_xfree(val->user_data.data); diff --git a/src/lib/krb5/free/f_tckt.c b/src/lib/krb5/free/f_tckt.c index 8344345..bfc8fbf 100644 --- a/src/lib/krb5/free/f_tckt.c +++ b/src/lib/krb5/free/f_tckt.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_ticket(context, val) krb5_context context; - krb5_ticket *val; + krb5_ticket FAR *val; { if (val->server) krb5_free_principal(context, val->server); diff --git a/src/lib/krb5/free/f_tckts.c b/src/lib/krb5/free/f_tckts.c index 1a1af1e..f211eff 100644 --- a/src/lib/krb5/free/f_tckts.c +++ b/src/lib/krb5/free/f_tckts.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_tickets(context, val) krb5_context context; - krb5_ticket **val; + krb5_ticket FAR * FAR *val; { register krb5_ticket **temp; diff --git a/src/lib/krb5/free/f_tgt_cred.c b/src/lib/krb5/free/f_tgt_cred.c index ddf7268..93fd3c1 100644 --- a/src/lib/krb5/free/f_tgt_cred.c +++ b/src/lib/krb5/free/f_tgt_cred.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_tgt_creds(context, tgts) krb5_context context; - krb5_creds **tgts; + krb5_creds FAR * FAR *tgts; { register krb5_creds **tgtpp; for (tgtpp = tgts; *tgtpp; tgtpp++) diff --git a/src/lib/krb5/free/f_tkt_auth.c b/src/lib/krb5/free/f_tkt_auth.c index 2ef99f4..8bfc9b9 100644 --- a/src/lib/krb5/free/f_tkt_auth.c +++ b/src/lib/krb5/free/f_tkt_auth.c @@ -26,10 +26,10 @@ #include "k5-int.h" -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_tkt_authent(context, val) krb5_context context; - krb5_tkt_authent *val; + krb5_tkt_authent FAR *val; { if (val->ticket) krb5_free_ticket(context, val->ticket); diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index e860ba5..85fbb79 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * ktadd.c,ktbase.c,ktdefault.c,ktfr_entry.c,ktremove.c,read_servi.c: + DLL export the keytab dispatch functions + Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 760fc4e..fa7acc8 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=keytab +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib MAC_SUBDIRS = file @@ -30,11 +32,19 @@ shared: all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) - cd file - @echo Making in keytab\file - -$(MAKE) -$(MFLAGS) - cd .. +all-windows:: subdirs $(OBJFILE) + +##DOSsubdirs:: file\file.lst +##DOSfile\file.lst:: +##DOS cd file +##DOS @echo Making in krb5\keytab\file +##DOS -$(MAKE) -$(MFLAGS) +##DOS cd .. + +##DOS$(OBJFILE): $(OBJS) file\file.lst +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE) clean-unix:: $(RM) shared/* @@ -42,8 +52,9 @@ clean-unix:: clean-mac:: clean-windows:: cd file - @echo Making clean in keytab\file + @echo Making clean in krb5\keytab\file -$(MAKE) -$(MFLAGS) clean cd .. - @echo Making clean locally + @echo Making clean in krb5\keytab + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index f14e2a0..7109cf7 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,12 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * ktf_add.c, ktf_close.c, ktf_g_ent.c, ktf_g_name.c, ktf_next.c, + ktf_remove.c, ktf_resolv.c, ktf_ssget.c, ktf_wreslv.c, ktfile.h + Change the functions declarations to include FAR pointers + and KRB5_CALLCONV so that they can be utilized by a DLL. + Tue Nov 19 17:06:59 1996 Barry Jaspan <bjaspan@mit.edu> * ktf_g_ent.c (krb5_ktfile_get_entry): return KRB5_KT_KVNONOTFOUND diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index 36291e9..4b27d33 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. -##DOSLIBNAME=..\..\krb5.lib +##DOSMYNAME=keytab\file +##DOSOBJFILE= file.lst +##WIN16##LIBNAME=..\..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -43,7 +45,12 @@ OBJS = \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -53,3 +60,4 @@ clean-unix:: clean-mac:: clean-windows:: + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c index aac429c..8979ad8 100644 --- a/src/lib/krb5/keytab/file/ktf_add.c +++ b/src/lib/krb5/keytab/file/ktf_add.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_add(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c index 93ee92e..a538aa7 100644 --- a/src/lib/krb5/keytab/file/ktf_close.c +++ b/src/lib/krb5/keytab/file/ktf_close.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_close(context, id) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c index 25ef4de..66f862e 100644 --- a/src/lib/krb5/keytab/file/ktf_endget.c +++ b/src/lib/krb5/keytab/file/ktf_endget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get(context, id, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c index e42dcdb..67050a8 100644 --- a/src/lib/krb5/keytab/file/ktf_g_ent.c +++ b/src/lib/krb5/keytab/file/ktf_g_ent.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry(context, id, principal, kvno, enctype, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c index fadb9bc..b0cd4d8 100644 --- a/src/lib/krb5/keytab/file/ktf_g_name.c +++ b/src/lib/krb5/keytab/file/ktf_g_name.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name(context, id, name, len) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c index 7b13ede..acabb7c 100644 --- a/src/lib/krb5/keytab/file/ktf_next.c +++ b/src/lib/krb5/keytab/file/ktf_next.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next(context, id, entry, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c index 644209f..3d9e627 100644 --- a/src/lib/krb5/keytab/file/ktf_remove.c +++ b/src/lib/krb5/keytab/file/ktf_remove.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_remove(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c index 415f3c5..93c06d0 100644 --- a/src/lib/krb5/keytab/file/ktf_resolv.c +++ b/src/lib/krb5/keytab/file/ktf_resolv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c index 1001b2e..b66c4ca 100644 --- a/src/lib/krb5/keytab/file/ktf_ssget.c +++ b/src/lib/krb5/keytab/file/ktf_ssget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get(context, id, cursorp) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c index 9df5922..e132293 100644 --- a/src/lib/krb5/keytab/file/ktf_wreslv.c +++ b/src/lib/krb5/keytab/file/ktf_wreslv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h index 0b2542c..155f246 100644 --- a/src/lib/krb5/keytab/file/ktfile.h +++ b/src/lib/krb5/keytab/file/ktfile.h @@ -62,27 +62,27 @@ typedef struct _krb5_ktfile_data { extern struct _krb5_kt_ops krb5_ktf_ops; extern struct _krb5_kt_ops krb5_ktf_writable_ops; -krb5_error_code krb5_ktfile_resolve +krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code krb5_ktfile_wresolve +krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code krb5_ktfile_get_name +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name PROTOTYPE((krb5_context, krb5_keytab, char *, int)); -krb5_error_code krb5_ktfile_close +krb5_error_code KRB5_CALLCONV krb5_ktfile_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code krb5_ktfile_get_entry +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_principal, @@ -90,29 +90,29 @@ krb5_error_code krb5_ktfile_get_entry krb5_enctype, krb5_keytab_entry *)); -krb5_error_code krb5_ktfile_start_seq_get +krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); -krb5_error_code krb5_ktfile_get_next +krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_kt_cursor *)); -krb5_error_code krb5_ktfile_end_get +krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); /* routines to be included on extended version (write routines) */ -krb5_error_code krb5_ktfile_add +krb5_error_code KRB5_CALLCONV krb5_ktfile_add PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code krb5_ktfile_remove +krb5_error_code KRB5_CALLCONV krb5_ktfile_remove PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c index 56d3102..ab805c9 100644 --- a/src/lib/krb5/keytab/ktadd.c +++ b/src/lib/krb5/keytab/ktadd.c @@ -26,11 +26,11 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_add_entry (context, id, entry) krb5_context context; krb5_keytab id; - krb5_keytab_entry *entry; + krb5_keytab_entry FAR *entry; { if (id->ops->add) return (*id->ops->add)(context, id, entry); diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index e78c3dc..3e821ed 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -39,10 +39,10 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl; * don't replace if it already exists; return an error instead. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_register(context, ops) krb5_context context; - krb5_kt_ops *ops; + krb5_kt_ops FAR *ops; { struct krb5_kt_typelist *t; for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next) @@ -68,11 +68,11 @@ krb5_kt_register(context, ops) * particular keytab type. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_resolve (context, name, ktid) krb5_context context; - const char *name; - krb5_keytab *ktid; + const char FAR *name; + krb5_keytab FAR *ktid; { struct krb5_kt_typelist *tlist; char *pfx, *resid, *cp; @@ -184,7 +184,7 @@ krb5_keytab_internalize(kcontext, argp, buffer, lenremain) return(kret); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_keytab_init(kcontext) krb5_context kcontext; { diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c index 1e34b76..6178d43 100644 --- a/src/lib/krb5/keytab/ktdefault.c +++ b/src/lib/krb5/keytab/ktdefault.c @@ -27,10 +27,10 @@ #include "k5-int.h" #include <stdio.h> -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_default(context, id) krb5_context context; - krb5_keytab *id; + krb5_keytab FAR *id; { char defname[BUFSIZ]; krb5_error_code retval; diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c index 5aaa775..92c3235 100644 --- a/src/lib/krb5/keytab/ktfr_entry.c +++ b/src/lib/krb5/keytab/ktfr_entry.c @@ -26,10 +26,10 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_free_entry (context, entry) krb5_context context; - krb5_keytab_entry *entry; + krb5_keytab_entry FAR *entry; { if (!entry) return 0; diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c index 377c4a0..6fc9dd3 100644 --- a/src/lib/krb5/keytab/ktremove.c +++ b/src/lib/krb5/keytab/ktremove.c @@ -26,11 +26,11 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_remove_entry (context, id, entry) krb5_context context; krb5_keytab id; - krb5_keytab_entry *entry; + krb5_keytab_entry FAR *entry; { if (id->ops->remove) return (*id->ops->remove)(context, id, entry); diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index a174434..b6f058e 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -40,14 +40,14 @@ * returns: Either KSUCCESS or error code. * errors: error code if not found or keyprocarg is invalid. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key) krb5_context context; krb5_pointer keyprocarg; krb5_principal principal; krb5_kvno vno; krb5_enctype enctype; - krb5_keyblock ** key; + krb5_keyblock FAR * FAR * key; { krb5_error_code kerror = KSUCCESS; char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */ diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 025691f..1d6f06b 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,16 @@ +Sun Feb 2 20:57:15 1997 Richard Basch <basch@lehman.com> + + * serialize.c: Added FAR declarations to pointer arguments for + all functions declared as KRB5_DLLIMP. + +Thu Jan 30 21:44:37 1997 Richard Basch <basch@lehman.com> + + * crypto_glue.c: + Export more crypto-layer functions: + krb5_encrypt, krb5_decrypt, krb5_eblock_enctype, + krb5_process_key, krb5_finish_key, krb5_string_to_key, + krb5_init_random_key, krb5_finish_random_key, krb5_random_key + Mon Dec 23 17:20:03 1996 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (SRCS): Add brand.c to the SRCS line so that the @@ -16,6 +29,20 @@ Sat Dec 21 01:26:11 1996 Theodore Y. Ts'o <tytso@mit.edu> code, which is returned to the user if the timebomb should be activated. +Thu Nov 21 14:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * auth_con.c bld_pr_ext.c conv_princ.c copy_addrs.c copy_athctr.c + copy_auth.c copy_cksum.c copy_creds.c copy_data.c copy_key.c + copy_princ.c copy_tick.c cp_key_cnt.c decrypt_tk.c fwd_tgt.c + gc_via_tkt.c get_creds.c get_in_tkt.c in_tkt_ktb.c in_tkt_pwd.c + in_tkt_sky.c init_ctx.c mk_cred.c mk_error.c mk_priv.c mk_rep.c + mk_req.c mk_req_ext.c mk_safe.c parse.c princ_comp.c rd_cred.c + rd_error.c rd_priv.c rd_rep.c rd_req.c rd_safe.c recvauth.c + sendauth.c str_conv.c unparse.c valid_times.c + DLL export various functions (see lib/krb5.def for full list) + Thu Nov 21 13:54:01 1996 Ezra Peisach <epeisach@mit.edu> * recvauth.c (krb5_recvauth): If there is an error, and the server diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 2ec9e93..8ee61e8 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -2,7 +2,9 @@ CFLAGS = $(CCOPTS) $(DEFS) RUN_SETUP = @KRB5_RUN_ENV@ ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=krb +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -26,6 +28,7 @@ OBJS= addr_comp.$(OBJEXT) \ copy_princ.$(OBJEXT) \ copy_tick.$(OBJEXT) \ cp_key_cnt.$(OBJEXT) \ + crypto_glue.$(OBJEXT) \ decode_kdc.$(OBJEXT) \ decrypt_tk.$(OBJEXT) \ encode_kdc.$(OBJEXT) \ @@ -100,6 +103,7 @@ SRCS= $(srcdir)/addr_comp.c \ $(srcdir)/copy_princ.c \ $(srcdir)/copy_tick.c \ $(srcdir)/cp_key_cnt.c \ + $(srcdir)/crypto_glue.c \ $(srcdir)/decode_kdc.c \ $(srcdir)/decrypt_tk.c \ $(srcdir)/encode_kdc.c \ @@ -157,7 +161,12 @@ SRCS= $(srcdir)/addr_comp.c \ all-unix:: shared $(OBJS) all-mac:: shared $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -222,3 +231,4 @@ clean-unix:: clean-mac:: $(RM) shared/* clean-windows:: + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index ec89182..b258b0d 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -26,10 +26,10 @@ actx_copy_addr(context, inad, outad) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_init(context, auth_context) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context FAR * auth_context; { *auth_context = (krb5_auth_context)malloc(sizeof(struct _krb5_auth_context)); @@ -48,7 +48,7 @@ krb5_auth_con_init(context, auth_context) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_free(context, auth_context) krb5_context context; krb5_auth_context auth_context; @@ -172,18 +172,18 @@ krb5_auth_con_setports(context, auth_context, local_port, remote_port) * Once decrypted this key is no longer necessary and is then overwritten * with the session key sent by the client. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_setuseruserkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock * keyblock; + krb5_keyblock FAR * keyblock; { if (auth_context->keyblock) krb5_free_keyblock(context, auth_context->keyblock); return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock))); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; @@ -195,11 +195,11 @@ krb5_auth_con_getkey(context, auth_context, keyblock) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock ** keyblock; + krb5_keyblock FAR * FAR * keyblock; { if (auth_context->local_subkey) return krb5_copy_keyblock(context,auth_context->local_subkey,keyblock); @@ -207,11 +207,11 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getremotesubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock ** keyblock; + krb5_keyblock FAR * FAR * keyblock; { if (auth_context->remote_subkey) return krb5_copy_keyblock(context,auth_context->remote_subkey,keyblock); @@ -219,7 +219,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_set_req_cksumtype(context, auth_context, cksumtype) krb5_context context; krb5_auth_context auth_context; @@ -239,7 +239,7 @@ krb5_auth_con_set_safe_cksumtype(context, auth_context, cksumtype) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context auth_context; @@ -249,21 +249,21 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getauthenticator(context, auth_context, authenticator) krb5_context context; krb5_auth_context auth_context; - krb5_authenticator ** authenticator; + krb5_authenticator FAR * FAR * authenticator; { return (krb5_copy_authenticator(context, auth_context->authentp, authenticator)); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context auth_context; - krb5_int32 * seqnumber; + krb5_int32 FAR * seqnumber; { *seqnumber = auth_context->remote_seq_number; return 0; @@ -307,7 +307,7 @@ krb5_auth_con_getivector(context, auth_context, ivector) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_setflags(context, auth_context, flags) krb5_context context; krb5_auth_context auth_context; @@ -317,11 +317,11 @@ krb5_auth_con_setflags(context, auth_context, flags) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_getflags(context, auth_context, flags) krb5_context context; krb5_auth_context auth_context; - krb5_int32 * flags; + krb5_int32 FAR * flags; { *flags = auth_context->auth_context_flags; return 0; diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c index 85c62c5..8b20175 100644 --- a/src/lib/krb5/krb/bld_pr_ext.c +++ b/src/lib/krb5/krb/bld_pr_ext.c @@ -32,15 +32,15 @@ #include <varargs.h> #endif -krb5_error_code INTERFACE_C +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H -krb5_build_principal_ext(krb5_context context, krb5_principal * princ, int rlen, const char * realm, ...) +krb5_build_principal_ext(krb5_context context, krb5_principal FAR * princ, int rlen, const char FAR * realm, ...) #else krb5_build_principal_ext(context, princ, rlen, realm, va_alist) krb5_context context; - krb5_principal *princ; + krb5_principal FAR *princ; int rlen; - const char *realm; + const char FAR *realm; va_dcl #endif { diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index d78fea5..364c234 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H krb5_build_principal(krb5_context context, krb5_principal * princ, int rlen, const char * realm, ...) diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index d11fac3..6a72abc 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -102,13 +102,13 @@ static char *strnchr(s, c, n) /* XXX This calls for a new error code */ #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_524_conv_principal(context, princ, name, inst, realm) krb5_context context; const krb5_principal princ; - char *name; - char *inst; - char *realm; + char FAR *name; + char FAR *inst; + char FAR *realm; { const struct krb_convert *p; krb5_data *compo; @@ -170,13 +170,13 @@ krb5_524_conv_principal(context, princ, name, inst, realm) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_425_conv_principal(context, name, instance, realm, princ) krb5_context context; - const char *name; - const char *instance; - const char *realm; - krb5_principal *princ; + const char FAR *name; + const char FAR *instance; + const char FAR *realm; + krb5_principal FAR *princ; { const struct krb_convert *p; char buf[256]; /* V4 instances are limited to 40 characters */ diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 4d93ebf..596a126 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -26,11 +26,11 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_addr(context, inad, outad) krb5_context context; -const krb5_address *inad; -krb5_address **outad; + const krb5_address FAR *inad; + krb5_address FAR * FAR *outad; { krb5_address *tmpad; @@ -53,11 +53,11 @@ krb5_address **outad; /* * Copy an address array, with fresh allocation. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_addresses(context, inaddr, outaddr) krb5_context context; - krb5_address * const * inaddr; - krb5_address ***outaddr; + krb5_address FAR * const FAR * inaddr; + krb5_address FAR * FAR * FAR *outaddr; { krb5_error_code retval; krb5_address ** tempaddr; diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index d162fb2..e2bec67 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -26,11 +26,11 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_authenticator(context, authfrom, authto) krb5_context context; -const krb5_authenticator *authfrom; -krb5_authenticator **authto; + const krb5_authenticator FAR *authfrom; + krb5_authenticator FAR *FAR *authto; { krb5_error_code retval; krb5_authenticator *tempto; diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 759608c..7594b91 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -53,11 +53,11 @@ krb5_authdata **outad; /* * Copy an authdata array, with fresh allocation. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_authdata(context, inauthdat, outauthdat) krb5_context context; -krb5_authdata * const * inauthdat; -krb5_authdata ***outauthdat; + krb5_authdata FAR * const FAR * inauthdat; + krb5_authdata FAR * FAR * FAR *outauthdat; { krb5_error_code retval; krb5_authdata ** tempauthdat; diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index c0bf8a2..8adc82a 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -26,11 +26,11 @@ #include "k5-int.h" -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_checksum(context, ckfrom, ckto) krb5_context context; - const krb5_checksum *ckfrom; - krb5_checksum **ckto; + const krb5_checksum FAR *ckfrom; + krb5_checksum FAR * FAR *ckto; { krb5_checksum *tempto; diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 712ca38..a8fea11 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -30,7 +30,7 @@ * Copy credentials, allocating fresh storage where needed. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_creds(context, incred, outcred) krb5_context context; const krb5_creds *incred; diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index fb2e870..df4f783 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -29,11 +29,11 @@ /* * Copy a data structure, with fresh allocation. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_data(context, indata, outdata) krb5_context context; - const krb5_data *indata; - krb5_data **outdata; + const krb5_data FAR *indata; + krb5_data FAR * FAR *outdata; { krb5_data *tempdata; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index e71f399..39fcb7d 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -29,11 +29,11 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_keyblock(context, from, to) krb5_context context; - const krb5_keyblock *from; - krb5_keyblock **to; + const krb5_keyblock FAR *from; + krb5_keyblock FAR * FAR *to; { krb5_keyblock *new_key; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index 4dbf44e..2a4025e 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -29,11 +29,11 @@ /* * Copy a principal structure, with fresh allocation. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_principal(context, inprinc, outprinc) krb5_context context; krb5_const_principal inprinc; - krb5_principal *outprinc; + krb5_principal FAR *outprinc; { register krb5_principal tempprinc; register int i, nelems; diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index a4dbed4..9235db1 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -95,7 +95,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto) return 0; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_ticket(context, from, pto) krb5_context context; const krb5_ticket *from; diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index fd32cae..6cc6ef8 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -29,11 +29,11 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_copy_keyblock_contents(context, from, to) krb5_context context; - const krb5_keyblock *from; - krb5_keyblock *to; + const krb5_keyblock FAR *from; + krb5_keyblock FAR *to; { *to = *from; to->contents = (krb5_octet *)malloc(to->length); diff --git a/src/lib/krb5/krb/crypto_glue.c b/src/lib/krb5/krb/crypto_glue.c new file mode 100644 index 0000000..615adc6 --- /dev/null +++ b/src/lib/krb5/krb/crypto_glue.c @@ -0,0 +1,233 @@ +/* + * lib/krb5/krb/crypto_glue.c + * + * Copyright 1996 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * Exported routines: + * krb5_use_enctype() + * krb5_checksum_size() + * krb5_encrypt_size() + * krb5_calculate_checksum() + * krb5_verify_checksum() + * krb5_encrypt() + * krb5_decrypt() + * krb5_process_key() + * krb5_finish_key() + * krb5_string_to_key() + * krb5_init_random_key() + * krb5_finish_random_key() + * krb5_random_key() + * krb5_eblock_enctype() + * + * Internal library routines: + * is_coll_proof_cksum() + * is_keyed_cksum() + * valid_cksumtype() + * valid_enctype() + */ + +#include "k5-int.h" + + +KRB5_DLLIMP size_t KRB5_CALLCONV +krb5_encrypt_size(length, crypto) + krb5_const size_t length; + krb5_const krb5_cryptosystem_entry FAR * crypto; +{ + return krb5_roundup(length + crypto->pad_minimum, crypto->block_length); +} + +krb5_boolean KRB5_CALLCONV +valid_enctype(ktype) + krb5_const krb5_enctype ktype; +{ + return ((ktype<=krb5_max_enctype) && (ktype>0) && krb5_enctype_array[ktype]); +} + +krb5_boolean KRB5_CALLCONV +valid_cksumtype(cktype) + krb5_const krb5_cksumtype cktype; +{ + return ((cktype<=krb5_max_cksum) && (cktype>0) && krb5_cksumarray[cktype]); +} + +krb5_boolean KRB5_CALLCONV +is_coll_proof_cksum(cktype) + krb5_const krb5_cksumtype cktype; +{ + return(krb5_cksumarray[cktype]->is_collision_proof); +} + +krb5_boolean KRB5_CALLCONV +is_keyed_cksum(cktype) + krb5_const krb5_cksumtype cktype; +{ + return (krb5_cksumarray[cktype]->uses_key); +} + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_use_enctype(context, eblock, enctype) + krb5_context context; + krb5_encrypt_block FAR * eblock; + krb5_const krb5_enctype enctype; +{ + eblock->crypto_entry = krb5_enctype_array[(enctype)]->system; + return 0; +} + +KRB5_DLLIMP size_t KRB5_CALLCONV +krb5_checksum_size(context, cktype) + krb5_context context; + krb5_const krb5_cksumtype cktype; +{ + return krb5_cksumarray[cktype]->checksum_length; +} + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_calculate_checksum(context, cktype, in, in_length, seed, seed_length, outcksum) + krb5_context context; + krb5_const krb5_cksumtype cktype; + krb5_pointer in; + krb5_const size_t in_length; + krb5_const krb5_pointer seed; + krb5_const size_t seed_length; + krb5_checksum FAR *outcksum; +{ + return krb5_x(((*krb5_cksumarray[cktype]->sum_func)), + (in, in_length, seed, seed_length, outcksum)); +} + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_verify_checksum(context, cktype, cksum, in, in_length, seed, seed_length) + krb5_context context; + krb5_const krb5_cksumtype cktype; + krb5_const krb5_checksum FAR *cksum; + krb5_const krb5_pointer in; + krb5_const size_t in_length; + krb5_const krb5_pointer seed; + krb5_const size_t seed_length; +{ + return krb5_x((*krb5_cksumarray[cktype]->sum_verf_func), + (cksum, in, in_length, seed, seed_length)); +} + +KRB5_DLLIMP krb5_enctype KRB5_CALLCONV +krb5_eblock_enctype(context, eblock) + krb5_context context; + krb5_const krb5_encrypt_block FAR * eblock; +{ + return eblock->crypto_entry->proto_enctype; +} + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_encrypt(context, inptr, outptr, size, eblock, ivec) + krb5_context context; + krb5_const krb5_pointer inptr; + krb5_pointer outptr; + krb5_const size_t size; + krb5_encrypt_block FAR * eblock; + krb5_pointer ivec; +{ + return krb5_x(eblock->crypto_entry->encrypt_func, + (inptr, outptr, size, eblock, ivec)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_decrypt(context, inptr, outptr, size, eblock, ivec) + krb5_context context; + krb5_const krb5_pointer inptr; + krb5_pointer outptr; + krb5_const size_t size; + krb5_encrypt_block FAR * eblock; + krb5_pointer ivec; +{ + return krb5_x(eblock->crypto_entry->decrypt_func, + (inptr, outptr, size, eblock, ivec)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_process_key(context, eblock, key) + krb5_context context; + krb5_encrypt_block FAR * eblock; + krb5_const krb5_keyblock FAR * key; +{ + return krb5_x(eblock->crypto_entry->process_key, + (eblock, key)); +} + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_finish_key(context, eblock) + krb5_context context; + krb5_encrypt_block FAR * eblock; +{ + return krb5_x(eblock->crypto_entry->finish_key,(eblock)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_string_to_key(context, eblock, keyblock, data, princ) + krb5_context context; + krb5_const krb5_encrypt_block FAR * eblock; + krb5_keyblock FAR * keyblock; + krb5_const krb5_data FAR * data; + krb5_const krb5_data FAR * princ; +{ + return krb5_x(eblock->crypto_entry->string_to_key, + (eblock, keyblock, data, princ)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_init_random_key(context, eblock, keyblock, ptr) + krb5_context context; + krb5_const krb5_encrypt_block FAR * eblock; + krb5_const krb5_keyblock FAR * keyblock; + krb5_pointer FAR * ptr; +{ + return krb5_x(eblock->crypto_entry->init_random_key, + (eblock, keyblock, ptr)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_finish_random_key(context, eblock, ptr) + krb5_context context; + krb5_const krb5_encrypt_block FAR * eblock; + krb5_pointer FAR * ptr; +{ + return krb5_x(eblock->crypto_entry->finish_random_key, + (eblock, ptr)); +} + + +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV +krb5_random_key(context, eblock, ptr, keyblock) + krb5_context context; + krb5_const krb5_encrypt_block FAR * eblock; + krb5_pointer ptr; + krb5_keyblock FAR * FAR * keyblock; +{ + return krb5_x(eblock->crypto_entry->random_key, + (eblock, ptr, keyblock)); +} + + diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index f8850b1..354a3f2 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -35,11 +35,11 @@ */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part(context, srv_key, ticket) krb5_context context; - const krb5_keyblock *srv_key; - register krb5_ticket *ticket; + const krb5_keyblock FAR *srv_key; + register krb5_ticket FAR *ticket; { krb5_enc_tkt_part *dec_tkt_part; krb5_encrypt_block eblock; diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index 6203b78..cb1fb28 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -57,7 +57,7 @@ krb5_encrypt_tkt_part(context, srv_key, dec_ticket) #define cleanup_scratch() { (void) memset(scratch->data, 0, scratch->length); \ krb5_free_data(context, scratch); } - krb5_use_enctype(kdc_context, &eblock, srv_key->enctype); + krb5_use_enctype(context, &eblock, srv_key->enctype); dec_ticket->enc_part.ciphertext.length = krb5_encrypt_size(scratch->length, eblock.crypto_entry); diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c index 6e10ad2..ed95b75 100644 --- a/src/lib/krb5/krb/fwd_tgt.c +++ b/src/lib/krb5/krb/fwd_tgt.c @@ -29,17 +29,17 @@ #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK) /* Get a TGT for use at the remote host */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fwd_tgt_creds(context, auth_context, rhost, client, server, cc, forwardable, outbuf) krb5_context context; krb5_auth_context auth_context; - char *rhost; + char FAR *rhost; krb5_principal client; krb5_principal server; krb5_ccache cc; int forwardable; /* Should forwarded TGT also be forwardable? */ - krb5_data *outbuf; + krb5_data FAR *outbuf; { krb5_replay_data replaydata; krb5_data * scratch = 0; @@ -143,6 +143,3 @@ errout: krb5_free_cred_contents(context, &tgt); return retval; } - - - diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index 0ee9197..2ea4fc8 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -98,7 +98,7 @@ cleanup: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_via_tkt (context, tkt, kdcoptions, address, in_cred, out_cred) krb5_context context; krb5_creds * tkt; diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index 4ff62f1..3e2885d 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -87,13 +87,13 @@ krb5_get_credentials_core(context, options, ccache, in_creds, out_creds, return 0; } -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_credentials(context, options, ccache, in_creds, out_creds) krb5_context context; const krb5_flags options; krb5_ccache ccache; - krb5_creds *in_creds; - krb5_creds **out_creds; + krb5_creds FAR *in_creds; + krb5_creds FAR * FAR *out_creds; { krb5_error_code retval; krb5_creds mcreds; @@ -195,7 +195,7 @@ krb5_get_credentials_val_renew_core(context, options, ccache, return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_get_credentials_validate(context, options, ccache, in_creds, out_creds) krb5_context context; const krb5_flags options; @@ -208,7 +208,7 @@ krb5_get_credentials_validate(context, options, ccache, in_creds, out_creds) INT_GC_VALIDATE)); } -krb5_error_code INTERFACE +krb5_error_code krb5_get_credentials_renew(context, options, ccache, in_creds, out_creds) krb5_context context; const krb5_flags options; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 048a56c..8d42b2d 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -361,21 +361,21 @@ make_preauth_list(context, ptypes, ret_list) #define MAX_IN_TKT_LOOPS 16 -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_in_tkt(context, options, addrs, ktypes, ptypes, key_proc, keyseed, decrypt_proc, decryptarg, creds, ccache, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address * const * addrs; - krb5_enctype * ktypes; - krb5_preauthtype * ptypes; + krb5_address FAR * const FAR * addrs; + krb5_enctype FAR * ktypes; + krb5_preauthtype FAR * ptypes; git_key_proc key_proc; krb5_const_pointer keyseed; git_decrypt_proc decrypt_proc; krb5_const_pointer decryptarg; - krb5_creds * creds; + krb5_creds FAR * creds; krb5_ccache ccache; - krb5_kdc_rep ** ret_as_reply; + krb5_kdc_rep FAR * FAR * ret_as_reply; { krb5_error_code retval; krb5_timestamp time_now; diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index 257ecce..0c901c1 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -105,18 +105,18 @@ cleanup: returns system errors, encryption errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_keytab(context, options, addrs, ktypes, pre_auth_types, keytab, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address * const * addrs; - krb5_enctype * ktypes; - krb5_preauthtype * pre_auth_types; + krb5_address FAR * const FAR * addrs; + krb5_enctype FAR * ktypes; + krb5_preauthtype FAR * pre_auth_types; const krb5_keytab keytab; krb5_ccache ccache; - krb5_creds * creds; - krb5_kdc_rep ** ret_as_reply; + krb5_creds FAR * creds; + krb5_kdc_rep FAR *FAR * ret_as_reply; { struct keytab_keyproc_arg arg; diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 52ef240..7373f62 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -97,18 +97,18 @@ pwd_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_password(context, options, addrs, ktypes, pre_auth_types, password, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address * const * addrs; - krb5_enctype * ktypes; - krb5_preauthtype * pre_auth_types; - const char * password; + krb5_address FAR * const FAR * addrs; + krb5_enctype FAR * ktypes; + krb5_preauthtype FAR * pre_auth_types; + const char FAR * password; krb5_ccache ccache; - krb5_creds * creds; - krb5_kdc_rep ** ret_as_reply; + krb5_creds FAR * creds; + krb5_kdc_rep FAR * FAR * ret_as_reply; { krb5_error_code retval; krb5_data data; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 9e4bea0..3c7a0cd 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -94,18 +94,18 @@ skey_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_skey(context, options, addrs, ktypes, pre_auth_types, key, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address * const * addrs; - krb5_enctype * ktypes; - krb5_preauthtype * pre_auth_types; - const krb5_keyblock * key; + krb5_address FAR * const FAR * addrs; + krb5_enctype FAR * ktypes; + krb5_preauthtype FAR * pre_auth_types; + const krb5_keyblock FAR * key; krb5_ccache ccache; - krb5_creds * creds; - krb5_kdc_rep ** ret_as_reply; + krb5_creds FAR * creds; + krb5_kdc_rep FAR * FAR * ret_as_reply; { if (key) diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 9daa7f8..fe725af 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -31,7 +31,7 @@ extern krb5_error_code krb5_vercheck(); #endif -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_init_context(context) krb5_context *context; { @@ -139,7 +139,7 @@ cleanup: return retval; } -void +KRB5_DLLIMP void KRB5_CALLCONV krb5_free_context(ctx) krb5_context ctx; { diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index 11c6a1d..7640e7a 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -198,14 +198,14 @@ cleanup: * This functions takes as input an array of krb5_credentials, and * outputs an encoded KRB_CRED message suitable for krb5_rd_cred */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_creds ** ppcreds; - krb5_data ** ppdata; - krb5_replay_data * outdata; + krb5_creds FAR * FAR * ppcreds; + krb5_data FAR * FAR * ppdata; + krb5_replay_data FAR * outdata; { krb5_address * premote_fulladdr = NULL; krb5_address * plocal_fulladdr = NULL; @@ -346,13 +346,13 @@ error: /* * A convenience function that calls krb5_mk_ncred. */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_creds * pcreds; - krb5_data ** ppdata; - krb5_replay_data * outdata; + krb5_creds FAR * pcreds; + krb5_data FAR * FAR * ppdata; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_creds **ppcreds; diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 292ffea..77e502f 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -34,11 +34,11 @@ returns system errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_error(context, dec_err, enc_err) krb5_context context; - const krb5_error *dec_err; - krb5_data *enc_err; + const krb5_error FAR *dec_err; + krb5_data FAR *enc_err; { krb5_error_code retval; krb5_data *new_enc_err; diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index dabfd8d..7986e18 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -133,13 +133,13 @@ clean_scratch: } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_priv(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data * userdata; - krb5_data * outbuf; - krb5_replay_data * outdata; + const krb5_data FAR * userdata; + krb5_data FAR * outbuf; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index b1c17b6..4578428 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -36,11 +36,11 @@ returns system errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_rep(context, auth_context, outbuf) krb5_context context; krb5_auth_context auth_context; - krb5_data * outbuf; + krb5_data FAR * outbuf; { krb5_error_code retval; krb5_enctype enctype; diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index e793b95..a454a57 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -46,17 +46,17 @@ returns system errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data, ccache, outbuf) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context FAR * auth_context; const krb5_flags ap_req_options; - char * service; - char * hostname; - krb5_data * in_data; + char FAR * service; + char FAR * hostname; + krb5_data FAR * in_data; krb5_ccache ccache; - krb5_data * outbuf; + krb5_data FAR * outbuf; { krb5_error_code retval; krb5_principal server; diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 733dd31..3bec52e 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -67,15 +67,15 @@ krb5_generate_authenticator PROTOTYPE((krb5_context, const krb5_checksum *, krb5_keyblock *, krb5_int32, krb5_authdata ** )); -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, outbuf) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context FAR * auth_context; const krb5_flags ap_req_options; - krb5_data * in_data; - krb5_creds * in_creds; - krb5_data * outbuf; + krb5_data FAR * in_data; + krb5_creds FAR * in_creds; + krb5_data FAR * outbuf; { krb5_error_code retval; krb5_checksum checksum; diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index dfa253a..1a44a75 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -119,13 +119,13 @@ cleanup_scratch: return retval; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_mk_safe(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data * userdata; - krb5_data * outbuf; - krb5_replay_data * outdata; + const krb5_data FAR * userdata; + krb5_data FAR * outbuf; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index 0b41a20..3b2305f 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -60,11 +60,11 @@ * May the fleas of a thousand camels infest the ISO, they who think * that arbitrarily large multi-component names are a Good Thing..... */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_parse_name(context, name, nprincipal) krb5_context context; - const char *name; - krb5_principal *nprincipal; + const char FAR *name; + krb5_principal FAR *nprincipal; { register const char *cp; register char *q; diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 35c5847..635d22c 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2) return TRUE; } -krb5_boolean +KRB5_DLLIMP krb5_boolean KRB5_CALLCONV krb5_principal_compare(context, princ1, princ2) krb5_context context; krb5_const_principal princ1; diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index 874960b..05eb7d7 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -225,13 +225,13 @@ cleanup_cred: * This functions takes as input an KRB_CRED message, validates it, and * outputs the nonce and an array of the forwarded credentials. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_data * pcreddata; - krb5_creds *** pppcreds; - krb5_replay_data * outdata; + krb5_data FAR * pcreddata; + krb5_creds FAR * FAR * FAR * pppcreds; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index bf07539..7f8e422 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -36,11 +36,11 @@ * returns system errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_error(context, enc_errbuf, dec_error) krb5_context context; - const krb5_data *enc_errbuf; - krb5_error **dec_error; + const krb5_data FAR *enc_errbuf; + krb5_error FAR * FAR *dec_error; { if (!krb5_is_krb_error(enc_errbuf)) return KRB5KRB_AP_ERR_MSG_TYPE; diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 7acb6f3..e6c0fe3 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -170,13 +170,13 @@ cleanup_privmsg:; return retval; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data * inbuf; - krb5_data * outbuf; - krb5_replay_data * outdata; + const krb5_data FAR * inbuf; + krb5_data FAR * outbuf; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c index 13e8363..d4d559d 100644 --- a/src/lib/krb5/krb/rd_rep.c +++ b/src/lib/krb5/krb/rd_rep.c @@ -38,12 +38,12 @@ * returns system errors, encryption errors, replay errors */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_rep(context, auth_context, inbuf, repl) krb5_context context; krb5_auth_context auth_context; - const krb5_data * inbuf; - krb5_ap_rep_enc_part **repl; + const krb5_data FAR * inbuf; + krb5_ap_rep_enc_part FAR * FAR *repl; { krb5_error_code retval; krb5_ap_rep * reply; diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index e46b3bd..7fbe172 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -42,16 +42,16 @@ * returns system errors, encryption errors, replay errors */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_req(context, auth_context, inbuf, server, keytab, ap_req_options, ticket) krb5_context context; - krb5_auth_context * auth_context; - const krb5_data * inbuf; + krb5_auth_context FAR * auth_context; + const krb5_data FAR * inbuf; krb5_const_principal server; /* XXX do we really need this */ krb5_keytab keytab; - krb5_flags * ap_req_options; - krb5_ticket ** ticket; + krb5_flags FAR * ap_req_options; + krb5_ticket FAR *FAR * ticket; { krb5_error_code retval; krb5_ap_req * request; diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 7298605..9f23ff3 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -147,13 +147,13 @@ cleanup: return retval; } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data * inbuf; - krb5_data * outbuf; - krb5_replay_data * outdata; + const krb5_data FAR * inbuf; + krb5_data FAR * outbuf; + krb5_replay_data FAR * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index d5e7b5f..5bde73a 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -34,20 +34,20 @@ static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_recvauth(context, auth_context, /* IN */ fd, appl_version, server, flags, keytab, /* OUT */ ticket) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context FAR * auth_context; krb5_pointer fd; - char * appl_version; + char FAR * appl_version; krb5_principal server; krb5_int32 flags; krb5_keytab keytab; - krb5_ticket ** ticket; + krb5_ticket FAR * FAR * ticket; { krb5_auth_context new_auth_context; krb5_flags ap_option; diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index d77afdc..54a9ac0 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -35,7 +35,7 @@ static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_sendauth(context, auth_context, /* IN */ fd, appl_version, client, server, ap_req_options, in_data, @@ -45,18 +45,18 @@ krb5_sendauth(context, auth_context, /* OUT */ error, rep_result, out_creds) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context FAR * auth_context; krb5_pointer fd; - char * appl_version; + char FAR * appl_version; krb5_principal client; krb5_principal server; krb5_flags ap_req_options; - krb5_data * in_data; - krb5_creds * in_creds; + krb5_data FAR * in_data; + krb5_creds FAR * in_creds; krb5_ccache ccache; - krb5_error ** error; - krb5_ap_rep_enc_part ** rep_result; - krb5_creds ** out_creds; + krb5_error FAR * FAR * error; + krb5_ap_rep_enc_part FAR * FAR * rep_result; + krb5_creds FAR * FAR * out_creds; { krb5_octet result; krb5_creds creds; diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c index 8be618a..5705b71 100644 --- a/src/lib/krb5/krb/ser_actx.c +++ b/src/lib/krb5/krb/ser_actx.c @@ -541,7 +541,7 @@ krb5_auth_context_internalize(kcontext, argp, buffer, lenremain) /* * Register the auth_context serializer. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_auth_context_init(kcontext) krb5_context kcontext; { diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c index 2bdb1ad..13392a7 100644 --- a/src/lib/krb5/krb/ser_ctx.c +++ b/src/lib/krb5/krb/ser_ctx.c @@ -633,7 +633,7 @@ krb5_oscontext_internalize(kcontext, argp, buffer, lenremain) /* * Register the context serializers. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_context_init(kcontext) krb5_context kcontext; { diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c index 392caf4..084ecb6 100644 --- a/src/lib/krb5/krb/serialize.c +++ b/src/lib/krb5/krb/serialize.c @@ -91,7 +91,7 @@ krb5_register_serializer(kcontext, entry) * krb5_size_opaque() - Determine the size necessary to serialize a given * piece of opaque data. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_size_opaque(kcontext, odtype, arg, sizep) krb5_context kcontext; krb5_magic odtype; @@ -111,13 +111,13 @@ krb5_size_opaque(kcontext, odtype, arg, sizep) /* * krb5_externalize_opaque() - Externalize a piece of opaque data. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_externalize_opaque(kcontext, odtype, arg, bufpp, sizep) krb5_context kcontext; krb5_magic odtype; krb5_pointer arg; - krb5_octet **bufpp; - size_t *sizep; + krb5_octet FAR * FAR *bufpp; + size_t FAR *sizep; { krb5_error_code kret; krb5_ser_handle shandle; @@ -172,13 +172,13 @@ krb5_externalize_data(kcontext, arg, bufpp, sizep) * krb5_internalize_opaque() - Convert external representation into a data * structure. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep) krb5_context kcontext; krb5_magic odtype; - krb5_pointer *argp; - krb5_octet **bufpp; - size_t *sizep; + krb5_pointer FAR *argp; + krb5_octet FAR * FAR *bufpp; + size_t FAR *sizep; { krb5_error_code kret; krb5_ser_handle shandle; @@ -195,11 +195,11 @@ krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep) * krb5_ser_pack_int32() - Pack a 4-byte integer if space is availble. * Update buffer pointer and remaining space. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_pack_int32(iarg, bufp, remainp) krb5_int32 iarg; - krb5_octet **bufp; - size_t *remainp; + krb5_octet FAR * FAR *bufp; + size_t FAR *remainp; { if (*remainp >= sizeof(krb5_int32)) { (*bufp)[0] = (krb5_octet) ((iarg >> 24) & 0xff); @@ -217,12 +217,12 @@ krb5_ser_pack_int32(iarg, bufp, remainp) /* * krb5_ser_pack_bytes() - Pack a string of bytes. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_pack_bytes(ostring, osize, bufp, remainp) - krb5_octet *ostring; + krb5_octet FAR *ostring; size_t osize; - krb5_octet **bufp; - size_t *remainp; + krb5_octet FAR * FAR *bufp; + size_t FAR *remainp; { if (*remainp >= osize) { memcpy(*bufp, ostring, osize); @@ -237,11 +237,11 @@ krb5_ser_pack_bytes(ostring, osize, bufp, remainp) /* * krb5_ser_unpack_int32() - Unpack a 4-byte integer if it's there. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int32(intp, bufp, remainp) - krb5_int32 *intp; - krb5_octet **bufp; - size_t *remainp; + krb5_int32 FAR *intp; + krb5_octet FAR * FAR *bufp; + size_t FAR *remainp; { if (*remainp >= sizeof(krb5_int32)) { *intp = (((krb5_int32) ((unsigned char) (*bufp)[0]) << 24) | @@ -259,12 +259,12 @@ krb5_ser_unpack_int32(intp, bufp, remainp) /* * krb5_ser_unpack_bytes() - Unpack a byte string if it's there. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes(istring, isize, bufp, remainp) - krb5_octet *istring; + krb5_octet FAR *istring; size_t isize; - krb5_octet **bufp; - size_t *remainp; + krb5_octet FAR * FAR *bufp; + size_t FAR *remainp; { if (*remainp >= isize) { memcpy(istring, *bufp, isize); diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c index 76a79a8..d8b2e6d 100644 --- a/src/lib/krb5/krb/str_conv.c +++ b/src/lib/krb5/krb/str_conv.c @@ -367,10 +367,10 @@ strptime(buf, format, tm) * * These routines return 0 for success, EINVAL for invalid entry. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_string_to_enctype(string, enctypep) - char * string; - krb5_enctype * enctypep; + char FAR * string; + krb5_enctype FAR * enctypep; { int i; int found; @@ -386,10 +386,10 @@ krb5_string_to_enctype(string, enctypep) return((found) ? 0 : EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_string_to_salttype(string, salttypep) - char * string; - krb5_int32 * salttypep; + char FAR * string; + krb5_int32 FAR * salttypep; { int i; int found; @@ -405,10 +405,10 @@ krb5_string_to_salttype(string, salttypep) return((found) ? 0 : EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_string_to_cksumtype(string, cksumtypep) - char * string; - krb5_cksumtype * cksumtypep; + char FAR * string; + krb5_cksumtype FAR * cksumtypep; { int i; int found; @@ -424,10 +424,10 @@ krb5_string_to_cksumtype(string, cksumtypep) return((found) ? 0 : EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_string_to_timestamp(string, timestampp) - char * string; - krb5_timestamp * timestampp; + char FAR * string; + krb5_timestamp FAR * timestampp; { int i; int found; @@ -454,10 +454,10 @@ krb5_string_to_timestamp(string, timestampp) return((found) ? 0 : EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_string_to_deltat(string, deltatp) - char * string; - krb5_deltat * deltatp; + char FAR * string; + krb5_deltat FAR * deltatp; { int i; int found; @@ -502,10 +502,10 @@ krb5_string_to_deltat(string, deltatp) * These routines return 0 for success, EINVAL for invalid parameter, ENOMEM * if the supplied buffer/length will not contain the output. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_enctype_to_string(enctype, buffer, buflen) krb5_enctype enctype; - char * buffer; + char FAR * buffer; size_t buflen; { int i; @@ -529,10 +529,10 @@ krb5_enctype_to_string(enctype, buffer, buflen) return(EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_salttype_to_string(salttype, buffer, buflen) krb5_int32 salttype; - char * buffer; + char FAR * buffer; size_t buflen; { int i; @@ -556,10 +556,10 @@ krb5_salttype_to_string(salttype, buffer, buflen) return(EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_cksumtype_to_string(cksumtype, buffer, buflen) krb5_cksumtype cksumtype; - char * buffer; + char FAR * buffer; size_t buflen; { int i; @@ -583,10 +583,10 @@ krb5_cksumtype_to_string(cksumtype, buffer, buflen) return(EINVAL); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_timestamp_to_string(timestamp, buffer, buflen) krb5_timestamp timestamp; - char * buffer; + char FAR * buffer; size_t buflen; { #if HAVE_STRFTIME @@ -605,12 +605,12 @@ krb5_timestamp_to_string(timestamp, buffer, buflen) #endif /* HAVE_STRFTIME */ } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad) krb5_timestamp timestamp; - char * buffer; + char FAR * buffer; size_t buflen; - char * pad; + char FAR * pad; { struct tm *tmp; size_t i; @@ -640,10 +640,10 @@ krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad) return((ndone) ? 0 : ENOMEM); } -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_deltat_to_string(deltat, buffer, buflen) krb5_deltat deltat; - char * buffer; + char FAR * buffer; size_t buflen; { int days, hours, minutes, seconds; diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 7247d9a..1f0c791 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -54,12 +54,12 @@ #define REALM_SEP '@' #define COMPONENT_SEP '/' -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_unparse_name_ext(context, principal, name, size) krb5_context context; krb5_const_principal principal; - register char **name; - int *size; + register char FAR * FAR *name; + int FAR *size; { register char *cp, *q; register int i,j; @@ -185,7 +185,7 @@ krb5_unparse_name_ext(context, principal, name, size) return 0; } -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_unparse_name(context, principal, name) krb5_context context; krb5_const_principal principal; diff --git a/src/lib/krb5/krb/valid_times.c b/src/lib/krb5/krb/valid_times.c index b1e26ce..ed377d1 100644 --- a/src/lib/krb5/krb/valid_times.c +++ b/src/lib/krb5/krb/valid_times.c @@ -33,7 +33,8 @@ * field in a krb5_ticket. */ -krb5_error_code krb5_validate_times(context, times) +krb5_error_code +krb5_validate_times(context, times) krb5_context context; krb5_ticket_times * times; { diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index a1d63cf..bd9bb29 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,13 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * ccdefname.c, def_realm.c, free_hstrl.c, genaddrs.c, hst_realm.c, + init_os_ctx.c, ktdefname.c, localaddr.c, sn2princ.c, timeofday.c, + ustime.c + DLL export several more common functions (see lib/krb5.def + for the full list of functions exported) + Wed Nov 13 02:53:31 1996 Tom Yu <tlyu@mit.edu> * osconfig.c: Add warning re: global variables. diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 72c7e04..236ed80 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -2,8 +2,10 @@ CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib ##DOSDBFLAGS= +##DOSMYNAME=os +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -90,10 +92,13 @@ SRCS= \ $(srcdir)/write_msg.c all-unix:: shared $(OBJS) - all-mac:: $(OBJS) +all-windows:: $(OBJFILE) -all-windows:: $(OBJS) +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -155,4 +160,4 @@ clean-unix:: $(RM) shared/* clean-mac:: clean-windows:: - + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index 1db1706..639fc66 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -83,7 +83,7 @@ OSErr err; #endif -char * +KRB5_DLLIMP char FAR * KRB5_CALLCONV krb5_cc_default_name(context) krb5_context context; { diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c index 053a604..3c2e4a9 100644 --- a/src/lib/krb5/os/def_realm.c +++ b/src/lib/krb5/os/def_realm.c @@ -44,10 +44,10 @@ extern char *krb5_config_file; /* extern so can be set at load/runtime */ -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_default_realm(context, lrealm) krb5_context context; - char **lrealm; + char FAR * FAR *lrealm; { char *realm; char *cp; @@ -79,7 +79,7 @@ krb5_get_default_realm(context, lrealm) return(0); } -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_set_default_realm(context, lrealm) krb5_context context; const char *lrealm; diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c index f112041..63bd3b3 100644 --- a/src/lib/krb5/os/free_hstrl.c +++ b/src/lib/krb5/os/free_hstrl.c @@ -31,10 +31,10 @@ Frees the storage taken by a realm list returned by krb5_get_local_realm. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_free_host_realm(context, realmlist) krb5_context context; - char * const *realmlist; + char FAR * const FAR *realmlist; { /* same format, so why duplicate code? */ return krb5_free_krbhst(context, realmlist); diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c index 3260662..b8e6774 100644 --- a/src/lib/krb5/os/genaddrs.c +++ b/src/lib/krb5/os/genaddrs.c @@ -32,12 +32,12 @@ #include <netinet/in.h> #endif -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_genaddrs(context, auth_context, infd, flags) - krb5_context context; - krb5_auth_context auth_context; - int infd; - int flags; + krb5_context context; + krb5_auth_context auth_context; + int infd; + int flags; { krb5_error_code retval; krb5_address * laddr; diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index b93ed37..6ff814a 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -77,11 +77,11 @@ #define MAXHOSTNAMELEN 64 #endif -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_host_realm(context, host, realmsp) krb5_context context; - const char *host; - char ***realmsp; + const char FAR *host; + char FAR * FAR * FAR *realmsp; { char **retrealms; char *default_realm, *realm, *cp; diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 5f8d48f..9b74a38 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -195,7 +195,7 @@ krb5_os_init_context(ctx) return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_set_config_files(ctx, filenames) krb5_context ctx; const char **filenames; @@ -214,7 +214,7 @@ krb5_set_config_files(ctx, filenames) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_secure_config_files(ctx) krb5_context ctx; { diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c index 29eb54f..c645635 100644 --- a/src/lib/krb5/os/ktdefname.c +++ b/src/lib/krb5/os/ktdefname.c @@ -30,10 +30,10 @@ extern char *krb5_defkeyname; -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_default_name(context, name, namesize) krb5_context context; - char *name; + char FAR *name; int namesize; { char *cp = 0; diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c index e93e450..cb204b5 100644 --- a/src/lib/krb5/os/localaddr.c +++ b/src/lib/krb5/os/localaddr.c @@ -26,10 +26,10 @@ #include "k5-int.h" -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_os_localaddr(context, addr) krb5_context context; - krb5_address ***addr; + krb5_address FAR * FAR * FAR *addr; { return krb5_crypto_os_localaddr(addr); } diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c index 75f52ac..1cb1337 100644 --- a/src/lib/krb5/os/sn2princ.c +++ b/src/lib/krb5/os/sn2princ.c @@ -32,13 +32,13 @@ #include <sys/param.h> #endif -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_sname_to_principal(context, hostname, sname, type, ret_princ) krb5_context context; - const char * hostname; - const char * sname; + const char FAR * hostname; + const char FAR * sname; krb5_int32 type; - krb5_principal * ret_princ; + krb5_principal FAR * ret_princ; { struct hostent *hp; char **hrealms, *realm, *remote_host; diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c index 72adc44..131406f 100644 --- a/src/lib/krb5/os/timeofday.c +++ b/src/lib/krb5/os/timeofday.c @@ -39,10 +39,10 @@ extern int errno; #endif -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_timeofday(context, timeret) krb5_context context; - register krb5_int32 *timeret; + register krb5_int32 FAR *timeret; { krb5_os_context os_ctx = context->os_context; timetype tval; diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c index ee75353..2c8b7d4 100644 --- a/src/lib/krb5/os/ustime.c +++ b/src/lib/krb5/os/ustime.c @@ -30,10 +30,11 @@ #include "k5-int.h" -krb5_error_code INTERFACE +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_us_timeofday(context, seconds, microseconds) krb5_context context; - krb5_int32 *seconds, *microseconds; + krb5_int32 FAR *seconds; + krb5_int32 FAR *microseconds; { krb5_os_context os_ctx = context->os_context; krb5_int32 sec, usec; diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index e94ad00..76d7a62 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,12 @@ +Tue Feb 4 15:54:11 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: Only build sscanf for Win16 + * sscanf.c: Export sscanf in Windows DLL + +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + Mon Jun 10 21:51:35 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * syslog.c: Change _WINDOWS to _MSDOS, and add check for _WIN32. diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index c056c0c..f1475ed 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=posix +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -13,7 +15,15 @@ OBJS = setenv.$(OBJEXT) @LIBOBJS@ all-unix:: shared $(OBJS) all-mac: $(OBJS) -all-windows:: syslog.obj sscanf.obj +all-windows:: $(OBJFILE) + +##WIN16##$(OBJFILE): syslog.obj sscanf.obj +##WIN16## $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) + +##WIN32##$(OBJFILE): syslog.obj +##WIN32## $(RM) $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared @@ -23,5 +33,5 @@ clean-unix:: clean-mac:: clean-windows:: - + $(RM) $(OBJFILE) diff --git a/src/lib/krb5/posix/sscanf.c b/src/lib/krb5/posix/sscanf.c index 3dbc415..9a96ff9 100644 --- a/src/lib/krb5/posix/sscanf.c +++ b/src/lib/krb5/posix/sscanf.c @@ -49,6 +49,8 @@ #include <stdarg.h> #include <string.h> +#include "k5-int.h" + #if 0 #if __STDC__ #include <stdarg.h> @@ -104,7 +106,7 @@ static u_char *__sccl(char *tab, u_char *fmt); /* * sscanf */ -int +KRB5_DLLIMP int KRB5_CALLCONV_C sscanf(char *str, char const *fmt0, ...) { va_list ap; diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index b5554fd..1a0d6c9 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> + + * Makefile.in: win32 build + + * rc_dfl.c, rc_dfl.h: Win32/DLL calling conventions for rcache + functions. (Most rcache routines are still not exported + pending an API review). + Mon Nov 18 15:25:51 1996 Theodore Y. Ts'o <tytso@mit.edu> * rc_dfl.c: Apply jik's fix to allow the expunging of the replay diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 0225fca..078ed18 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=..\krb5.lib +##DOSMYNAME=rcache +##DOSOBJFILE=..\$(MYNAME).lst +##WIN16##LIBNAME=..\krb5.lib .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -25,13 +27,18 @@ SRCS= \ all-unix:: shared $(OBJS) all-mac:: $(OBJS) -all-windows:: $(OBJS) +all-windows:: $(OBJFILE) + +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE) shared: mkdir shared clean-mac:: clean-windows:: - + $(RM) $(OBJFILE) clean-unix:: $(RM) shared/* diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index 9eede53..57679f3 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -170,14 +170,16 @@ static int rc_store(context, id, rep) return CMP_HOHUM; } -char * krb5_rc_dfl_get_name(context, id) +char * KRB5_CALLCONV +krb5_rc_dfl_get_name(context, id) krb5_context context; krb5_rcache id; { return ((struct dfl_data *) (id->data))->name; } -krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_get_span(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat *lifespan; @@ -186,7 +188,8 @@ krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan) return 0; } -krb5_error_code krb5_rc_dfl_init(context, id, lifespan) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_init(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat lifespan; @@ -232,7 +235,8 @@ krb5_error_code krb5_rc_dfl_close_no_free(context, id) return 0; } -krb5_error_code krb5_rc_dfl_close(context, id) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_close(context, id) krb5_context context; krb5_rcache id; { @@ -241,7 +245,8 @@ krb5_error_code krb5_rc_dfl_close(context, id) return 0; } -krb5_error_code krb5_rc_dfl_destroy(context, id) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_destroy(context, id) krb5_context context; krb5_rcache id; { @@ -252,7 +257,8 @@ krb5_rcache id; return krb5_rc_dfl_close(context, id); } -krb5_error_code krb5_rc_dfl_resolve(context, id, name) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_resolve(context, id, name) krb5_context context; krb5_rcache id; char *name; @@ -385,7 +391,8 @@ errout: -krb5_error_code krb5_rc_dfl_recover(context, id) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_recover(context, id) krb5_context context; krb5_rcache id; { @@ -497,7 +504,8 @@ krb5_rc_io_store (context, t, rep) return ret; } -krb5_error_code krb5_rc_dfl_store(context, id, rep) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_store(context, id, rep) krb5_context context; krb5_rcache id; krb5_donot_replay *rep; @@ -533,7 +541,8 @@ krb5_donot_replay *rep; return 0; } -krb5_error_code krb5_rc_dfl_expunge(context, id) +krb5_error_code KRB5_CALLCONV +krb5_rc_dfl_expunge(context, id) krb5_context context; krb5_rcache id; { diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index 6529b6d..aaa5e82 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -15,34 +15,34 @@ extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */ -krb5_error_code krb5_rc_dfl_init +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat)); -krb5_error_code krb5_rc_dfl_recover +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code krb5_rc_dfl_destroy +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code krb5_rc_dfl_close +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code krb5_rc_dfl_store +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store PROTOTYPE((krb5_context, krb5_rcache, krb5_donot_replay *)); -krb5_error_code krb5_rc_dfl_expunge +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code krb5_rc_dfl_get_span +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat *)); -char * krb5_rc_dfl_get_name +char * KRB5_CALLCONV krb5_rc_dfl_get_name PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code krb5_rc_dfl_resolve +krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve PROTOTYPE((krb5_context, krb5_rcache, char *)); diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c index 4ebfbe0..f70dfbf 100644 --- a/src/lib/krb5/rcache/ser_rc.c +++ b/src/lib/krb5/rcache/ser_rc.c @@ -208,7 +208,7 @@ krb5_rcache_internalize(kcontext, argp, buffer, lenremain) /* * Register the rcache serializer. */ -krb5_error_code +KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_rcache_init(kcontext) krb5_context kcontext; { |