diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
| commit | 530043377ee6f39b9ca95c13f6260602e6fe7674 (patch) | |
| tree | 28fd4b42c486d7097c4cd537d90042bb5fda3852 /src/lib | |
| parent | e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (diff) | |
Fix Windows build
Repair the Windows build. Tested with the prepare-on-Unix method.
Some specific changes include:
* Removed the IPC finalizer (no longer used after r20787) from
ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
chain for the pingtest build in ccapi/test. Also updated pingtest
to use the k5_ipc_stream interfaces since cci_stream is gone.
* Reverted the apparently non-functional r20277.
* klist -V prints just "Kerberos for Windows", since it has no access
to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be
addressed correctly.
* krb5, telnet, gssftp, and NIM are removed from the build.
* Some files had CRLFs; these were replaced with LFs and the
svn:eol-style property set on the files. Otherwise the CRLFs became
CRCRLFs after the zip transfer.
* Windows does not have opendir/readdir, so added Windows code to
prof_parse.c for includedir. Probable fodder for a libkrb5support
portability shim.
ticket: 6826
target_version: 1.9
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
52 files changed, 460 insertions, 310 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 55e9b0f37..07954f89b 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -35,10 +35,8 @@ clean-windows:: ##WIN32##CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib ##WIN32##PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib ##WIN32##KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \ -##WIN32## $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ -##WIN32## des425\$(OUTPRE)des425.lib +##WIN32## $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib ##WIN32##GLIBS = gssapi\$(OUTPRE)gssapi.lib -##WIN32##K4LIBS = krb4\$(OUTPRE)krb4.lib ##WIN32##SDEF = k5sprt32.def @@ -46,7 +44,6 @@ clean-windows:: ##WIN32##PDEF = xpprof32.def ##WIN32##KDEF = krb5_32.def ##WIN32##GDEF = gssapi32.def -##WIN32##K4DEF = krb4_32.def @@ -60,7 +57,6 @@ clean-windows:: ##WIN32##S_GLUE=$(OUTPRE)support_glue.obj ##WIN32##K5_GLUE=$(OUTPRE)k5_glue.obj -##WIN32##K4_GLUE=$(OUTPRE)k4_glue.obj ##WIN32##GSS_GLUE=$(OUTPRE)gss_glue.obj ##WIN32##COMERR_GLUE=$(OUTPRE)comerr_glue.obj ##WIN32##PROF_GLUE=$(OUTPRE)prof_glue.obj @@ -70,7 +66,6 @@ clean-windows:: ##WIN32##PGLUE=$(PROF_GLUE) ##WIN32##KGLUE=$(K5_GLUE) ##WIN32##GGLUE=$(GSS_GLUE) -##WIN32##K4GLUE=$(K4_GLUE) ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY @@ -79,7 +74,6 @@ clean-windows:: ##WIN32##PRES=$(PLIB:.lib=.res) ##WIN32##KRES=$(KLIB:.lib=.res) ##WIN32##GRES=$(GLIB:.lib=.res) -##WIN32##K4RES=$(K4LIB:.lib=.res) ##WIN32##$(SRES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DSUPPORT_LIB -fo $@ -r $** @@ -89,8 +83,6 @@ clean-windows:: ##WIN32## $(RC) $(RCFLAGS) -DPROF_LIB -fo $@ -r $** ##WIN32##$(KRES): $(KRB5RC) ##WIN32## $(RC) $(RCFLAGS) -DKRB5_LIB -fo $@ -r $** -##WIN32##$(K4RES): $(VERSIONRC) -##WIN32## $(RC) $(RCFLAGS) -DKRB4_LIB -fo $@ -r $** ##WIN32##$(GRES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DGSSAPI_LIB -fo $@ -r $** ##WIN32##$(KRB5RC): $(VERSIONRC) @@ -98,7 +90,7 @@ clean-windows:: ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES) ##WIN32## link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \ ##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB) -##WIN32## $(_VC_MANIFEST_EMBED_DLL) +##WIN32## $(_VC_MANIFEST_EMBED_DLL) ##WIN32##$(SDEF): ..\util\support\libkrb5support.exports ##WIN32## echo EXPORTS > $(SDEF).new ##WIN32## type ..\util\support\libkrb5support.exports >> $(SDEF).new @@ -125,15 +117,8 @@ clean-windows:: ##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) $(SCLIB) ##WIN32## $(_VC_MANIFEST_EMBED_DLL) -##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) -##WIN32## link $(WINDLLFLAGS) -def:$(K4DEF) -out:$*.dll \ -##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) $(SCLIB) -##WIN32## $(_VC_MANIFEST_EMBED_DLL) - ##WIN32##$(K5_GLUE): win_glue.c ##WIN32## $(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $** -##WIN32##$(K4_GLUE): win_glue.c -##WIN32## $(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $** ##WIN32##$(GSS_GLUE): win_glue.c ##WIN32## $(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $** ##WIN32##$(COMERR_GLUE): win_glue.c @@ -145,7 +130,6 @@ clean-windows:: ##WIN32### Build Convenience ##WIN32##comerr.lib: $(CLIB) -##WIN32##krb4.lib: $(K4LIB) ##WIN32##krb5.lib: $(KLIB) ##WIN32##gssapi.lib: $(GLIB) ##WIN32##profile.lib: $(PLIB) @@ -157,12 +141,6 @@ clean-windows:: ##WIN32## @echo Making in lib\krb5 ##WIN32## cd ..\krb5 ##WIN32## $(MAKE) -$(MFLAGS) -##WIN32## @echo Making in lib\des425 -##WIN32## cd ..\des425 -##WIN32## $(MAKE) -$(MFLAGS) -##WIN32## @echo Making in lib\krb4 -##WIN32## cd ..\krb4 -##WIN32## $(MAKE) -$(MFLAGS) ##WIN32## @echo Making in lib\gssapi ##WIN32## cd ..\gssapi ##WIN32## $(MAKE) -$(MFLAGS) @@ -170,7 +148,7 @@ clean-windows:: ##WIN32## cd .. ##WIN32##all-windows:: lib-windows -##WIN32##lib-windows:: krb5.lib gssapi.lib krb4.lib +##WIN32##lib-windows:: krb5.lib gssapi.lib ##WIN32##clean-windows:: ##WIN32## @echo Making clean in lib\crypto @@ -179,12 +157,6 @@ clean-windows:: ##WIN32## @echo Making clean in lib\krb5 ##WIN32## cd ..\krb5 ##WIN32## $(MAKE) -$(MFLAGS) clean -##WIN32## @echo Making clean in lib\des425 -##WIN32## cd ..\des425 -##WIN32## $(MAKE) -$(MFLAGS) clean -##WIN32## @echo Making clean in lib\krb4 -##WIN32## cd ..\krb4 -##WIN32## $(MAKE) -$(MFLAGS) clean ##WIN32## @echo Making clean in lib\gssapi ##WIN32## cd ..\gssapi ##WIN32## $(MAKE) -$(MFLAGS) clean diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index a1d0eb747..12098d60c 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,6 +1,6 @@ mydir=lib/crypto BUILDTOP=$(REL)..$(S).. -SUBDIRS= krb @CRYPTO_IMPL@ crypto_tests +SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) @@ -19,32 +19,32 @@ LIBFINIFUNC=cryptoint_cleanup_library RELDIR=crypto STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST \ - @CRYPTO_IMPL@/enc_provider/OBJS.ST \ - @CRYPTO_IMPL@/hash_provider/OBJS.ST \ + $(CRYPTO_IMPL)/enc_provider/OBJS.ST \ + $(CRYPTO_IMPL)/hash_provider/OBJS.ST \ krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \ krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST \ - krb/prng/@PRNG_ALG@/OBJS.ST \ - @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST \ - @CRYPTO_IMPL@/sha1/OBJS.ST \ - @CRYPTO_IMPL@/sha2/OBJS.ST \ + krb/prng/$(PRNG_ALG)/OBJS.ST \ + $(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST \ + $(CRYPTO_IMPL)/sha1/OBJS.ST \ + $(CRYPTO_IMPL)/sha2/OBJS.ST \ krb/arcfour/OBJS.ST \ - @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \ - @CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST \ - @CRYPTO_IMPL@/OBJS.ST + $(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST \ + $(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST \ + $(CRYPTO_IMPL)/OBJS.ST SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST \ - @CRYPTO_IMPL@/enc_provider/OBJS.ST \ - @CRYPTO_IMPL@/hash_provider/OBJS.ST \ + $(CRYPTO_IMPL)/enc_provider/OBJS.ST \ + $(CRYPTO_IMPL)/hash_provider/OBJS.ST \ krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \ krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST \ - krb/prng/@PRNG_ALG@/OBJS.ST \ - @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST \ - @CRYPTO_IMPL@/sha1/OBJS.ST \ - @CRYPTO_IMPL@/sha2/OBJS.ST \ + krb/prng/$(PRNG_ALG)/OBJS.ST \ + $(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST \ + $(CRYPTO_IMPL)/sha1/OBJS.ST \ + $(CRYPTO_IMPL)/sha2/OBJS.ST \ krb/arcfour/OBJS.ST \ - @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \ - @CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST \ - @CRYPTO_IMPL@/OBJS.ST + $(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST \ + $(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST \ + $(CRYPTO_IMPL)/OBJS.ST # No dependencies. Record places to find this shared object if the target # link editor and loader support it. @@ -58,7 +58,9 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ SHLIB_RDIRS=$(KRB5_LIBDIR) -##DOS##LIBOBJS = $(OBJS) +##DOS##LIBNAME=$(OUTPRE)crypto.lib +##DOS##OBJFILEDEP=$(OUTPRE)crc32.lst $(OUTPRE)rand2key.lst $(OUTPRE)yarrow.lst $(OUTPRE)prng.lst $(OUTPRE)prf.lst $(OUTPRE)checksum.lst $(OUTPRE)krb.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)arcfour.lst $(OUTPRE)dk.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst +##DOS##OBJFILELIST=@$(OUTPRE)crc32.lst @$(OUTPRE)rand2key.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)prng.lst @$(OUTPRE)prf.lst @$(OUTPRE)checksum.lst @$(OUTPRE)krb.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)dk.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst all-unix:: all-liblinks install-unix:: install-libs @@ -76,8 +78,8 @@ all-windows:: cd krb @echo Making in crypto\krb $(MAKE) -$(MFLAGS) - cd ..\@CRYPTO_IMPL@ - @echo Making in crypto\@CRYPTO_IMPL@ + cd ..\$(CRYPTO_IMPL) + @echo Making in crypto\$(CRYPTO_IMPL) $(MAKE) -$(MFLAGS) cd ..\crypto_tests @echo Making in crypto\crypto_tests @@ -88,8 +90,8 @@ clean-windows:: cd krb @echo Making in clean crypto\krb $(MAKE) -$(MFLAGS) clean - cd ..\@CRYPTO_IMPL@ - @echo Making clean in crypto\@CRYPTO_IMPL@ + cd ..\$(CRYPTO_IMPL) + @echo Making clean in crypto\$(CRYPTO_IMPL) $(MAKE) -$(MFLAGS) clean cd ..\crypto_tests @echo Making clean in crypto\crypto_tests diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in index 240d2895b..603c57cd0 100644 --- a/src/lib/crypto/builtin/Makefile.in +++ b/src/lib/crypto/builtin/Makefile.in @@ -20,11 +20,9 @@ DEFS= EXTRADEPSRCS= $(srcdir)/t_cf2.c -##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst $(OUTPRE)camellia.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst $(OUTPRE)camellia.lst +##DOS##BUILDTOP = ..\..\.. +##DOS##PREFIXDIR = builtin +##DOS##OBJFILE = ..\$(OUTPRE)builtin.lst STLIBOBJS=\ hmac.o \ @@ -78,91 +76,97 @@ clean:: all-windows:: - cd ..\des - @echo Making in crypto\des + cd des + @echo Making in crypto\builtin\des $(MAKE) -$(MFLAGS) cd ..\md4 - @echo Making in crypto\md4 + @echo Making in crypto\builtin\md4 $(MAKE) -$(MFLAGS) cd ..\md5 - @echo Making in crypto\md5 + @echo Making in crypto\builtin\md5 $(MAKE) -$(MFLAGS) cd ..\sha1 - @echo Making in crypto\sha1 + @echo Making in crypto\builtin\sha1 $(MAKE) -$(MFLAGS) - cd ..\sh2a - @echo Making in crypto\sha2 + cd ..\sha2 + @echo Making in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) cd ..\hash_provider - @echo Making in crypto\hash_provider + @echo Making in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) cd ..\enc_provider - @echo Making in crypto\enc_provider + @echo Making in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) cd ..\aes - @echo Making in crypto\aes + @echo Making in crypto\builtin\aes $(MAKE) -$(MFLAGS) cd ..\camellia - @echo Making in crypto\camellia + @echo Making in crypto\builtin\camellia $(MAKE) -$(MFLAGS) cd .. + @echo Making in crypto\builtin clean-windows:: - cd ..\des - @echo Making clean in crypto\des + cd des + @echo Making clean in crypto\builtin\des $(MAKE) -$(MFLAGS) clean cd ..\md4 - @echo Making clean in crypto\md4 + @echo Making clean in crypto\builtin\md4 $(MAKE) -$(MFLAGS) clean cd ..\md5 - @echo Making clean in crypto\md5 + @echo Making clean in crypto\builtin\md5 $(MAKE) -$(MFLAGS) clean cd ..\sha1 - @echo Making clean in crypto\sha1 + @echo Making clean in crypto\builtin\sha1 $(MAKE) -$(MFLAGS) clean cd ..\sha2 - @echo Making clean in crypto\sha2 + @echo Making clean in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) clean cd ..\hash_provider - @echo Making clean in crypto\hash_provider + @echo Making clean in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) clean cd ..\enc_provider - @echo Making clean in crypto\enc_provider + @echo Making clean in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) clean cd ..\aes - @echo Making clean in crypto\aes + @echo Making clean in crypto\builtin\aes $(MAKE) -$(MFLAGS) clean cd ..\camellia - @echo Making clean in crypto\camellia + @echo Making clean in crypto\builtin\camellia $(MAKE) -$(MFLAGS) clean cd .. + @echo Making clean in crypto\builtin check-windows:: - cd ..\des - @echo Making check in crypto\des + cd des + @echo Making check in crypto\builtin\des $(MAKE) -$(MFLAGS) check cd ..\md4 - @echo Making check in crypto\md4 + @echo Making check in crypto\builtin\md4 $(MAKE) -$(MFLAGS) check cd ..\md5 - @echo Making check in crypto\md5 + @echo Making check in crypto\builtin\md5 $(MAKE) -$(MFLAGS) check cd ..\sha1 - @echo Making check in crypto\sha1 + @echo Making check in crypto\builtin\sha1 + $(MAKE) -$(MFLAGS) check + cd ..\sha2 + @echo Making check in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) check cd ..\hash_provider - @echo Making check in crypto\hash_provider + @echo Making check in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) check cd ..\enc_provider - @echo Making check in crypto\enc_provider + @echo Making check in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) check cd ..\aes - @echo Making check in crypto\aes + @echo Making check in crypto\builtin\aes $(MAKE) -$(MFLAGS) check cd ..\camellia - @echo Making check in crypto\camellia + @echo Making check in crypto\builtin\camellia $(MAKE) -$(MFLAGS) check cd .. + @echo Making check in crypto\builtin @lib_frag@ diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in index 260cc97cc..64f73a379 100644 --- a/src/lib/crypto/builtin/aes/Makefile.in +++ b/src/lib/crypto/builtin/aes/Makefile.in @@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../.. DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=aes -##DOS##OBJFILE=..\$(OUTPRE)aes.lst +##DOS##PREFIXDIR = builtin\aes +##DOS##OBJFILE = ..\..\$(OUTPRE)aes.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in index d848defd8..2ad3e73f6 100644 --- a/src/lib/crypto/builtin/camellia/Makefile.in +++ b/src/lib/crypto/builtin/camellia/Makefile.in @@ -7,8 +7,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \ DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=camellia -##DOS##OBJFILE=..\$(OUTPRE)camellia.lst +##DOS##PREFIXDIR = builtin\camellia +##DOS##OBJFILE = ..\..\$(OUTPRE)camellia.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in index 325fdc262..5001d48bf 100644 --- a/src/lib/crypto/builtin/des/Makefile.in +++ b/src/lib/crypto/builtin/des/Makefile.in @@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=des -##DOS##OBJFILE=..\$(OUTPRE)des.lst +##DOS##PREFIXDIR = builtin\des +##DOS##OBJFILE = ..\..\$(OUTPRE)des.lst RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in index aadec6e6a..80bfc60bd 100644 --- a/src/lib/crypto/builtin/enc_provider/Makefile.in +++ b/src/lib/crypto/builtin/enc_provider/Makefile.in @@ -10,8 +10,8 @@ LOCALINCLUDES = -I$(srcdir)/../des \ DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=enc_provider -##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst +##DOS##PREFIXDIR = builtin\enc_provider +##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/enc_provider/camellia.c b/src/lib/crypto/builtin/enc_provider/camellia.c index 566f2d78f..337a3104d 100644 --- a/src/lib/crypto/builtin/enc_provider/camellia.c +++ b/src/lib/crypto/builtin/enc_provider/camellia.c @@ -358,9 +358,11 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data, } const struct krb5_enc_provider krb5int_enc_camellia128 = { + 0 }; const struct krb5_enc_provider krb5int_enc_camellia256 = { + 0 }; #endif /* CAMELLIA */ diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in index 36ec412c5..e91901ee5 100644 --- a/src/lib/crypto/builtin/hash_provider/Makefile.in +++ b/src/lib/crypto/builtin/hash_provider/Makefile.in @@ -5,8 +5,8 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=hash_provider -##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst +##DOS##PREFIXDIR = builtin\hash_provider +##DOS##OBJFILE = ..\..\$(OUTPRE)hash_provider.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in index 561927a1e..00ec64315 100644 --- a/src/lib/crypto/builtin/md4/Makefile.in +++ b/src/lib/crypto/builtin/md4/Makefile.in @@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir) DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md4 -##DOS##OBJFILE=..\$(OUTPRE)md4.lst +##DOS##PREFIXDIR = builtin\md4 +##DOS##OBJFILE = ..\..\$(OUTPRE)md4.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in index 6a1f52fa6..840bb62b9 100644 --- a/src/lib/crypto/builtin/md5/Makefile.in +++ b/src/lib/crypto/builtin/md5/Makefile.in @@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md5 -##DOS##OBJFILE=..\$(OUTPRE)md5.lst +##DOS##PREFIXDIR = builtin\md5 +##DOS##OBJFILE = ..\..\$(OUTPRE)md5.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in index ec51713a1..719f63370 100644 --- a/src/lib/crypto/builtin/sha1/Makefile.in +++ b/src/lib/crypto/builtin/sha1/Makefile.in @@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha1 -##DOS##OBJFILE=..\$(OUTPRE)sha1.lst +##DOS##PREFIXDIR = builtin\sha1 +##DOS##OBJFILE = ..\..\$(OUTPRE)sha1.lst RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in index 535d7eeb8..3b854ec29 100644 --- a/src/lib/crypto/builtin/sha2/Makefile.in +++ b/src/lib/crypto/builtin/sha2/Makefile.in @@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha2 -##DOS##OBJFILE=..\$(OUTPRE)sha2.lst +##DOS##PREFIXDIR = builtin\sha2 +##DOS##OBJFILE = ..\..\$(OUTPRE)sha2.lst RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in index 06b1745e9..17e1683d6 100644 --- a/src/lib/crypto/crypto_tests/Makefile.in +++ b/src/lib/crypto/crypto_tests/Makefile.in @@ -1,15 +1,16 @@ mydir=lib/crypto/crypto_tests BUILDTOP=$(REL)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider \ - -I$(srcdir)/../@CRYPTO_IMPL@/hash_provider -I$(srcdir)/../krb/keyhash_provider \ - -I$(srcdir)/../krb/dk -I$(srcdir)/../@CRYPTO_IMPL@/ \ - -I$(srcdir)/../krb/prng \ - -I$(srcdir)/../krb/prng/@PRNG_ALG@ \ - -I$(srcdir)/../krb/crc32 -I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw \ - -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/des \ - -I$(srcdir)/../@CRYPTO_IMPL@/arcfour -I$(srcdir)/../@CRYPTO_IMPL@/sha1 \ - -I$(srcdir)/../@CRYPTO_IMPL@/md5 -I$(srcdir)/../@CRYPTO_IMPL@/md4 \ - -I$(srcdir)/../@CRYPTO_IMPL@/camellia +LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \ + -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \ + -I$(srcdir)/../krb/keyhash_provider -I$(srcdir)/../krb/dk \ + -I$(srcdir)/../$(CRYPTO_IMPL) -I$(srcdir)/../krb/prng \ + -I$(srcdir)/../krb/prng/$(PRNG_ALG) -I$(srcdir)/../krb/crc32 \ + -I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw \ + -I$(srcdir)/../$(CRYPTO_IMPL)/aes -I$(srcdir)/../$(CRYPTO_IMPL)/des \ + -I$(srcdir)/../$(CRYPTO_IMPL)/arcfour \ + -I$(srcdir)/../$(CRYPTO_IMPL)/sha1 \ + -I$(srcdir)/../$(CRYPTO_IMPL)/md5 -I$(srcdir)/../$(CRYPTO_IMPL)/md4 \ + -I$(srcdir)/../$(CRYPTO_IMPL)/camellia RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -39,13 +40,7 @@ EXTRADEPSRCS=\ $(srcdir)/t_fork.c \ $(srcdir)/ytest.c -##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst - -##DOS##LIBOBJS = $(OBJS) +##DOS##BUILDTOP = ..\..\.. # NOTE: The t_cksum known checksum values are primarily for regression # testing. They are not derived a priori, but are known to produce @@ -63,7 +58,7 @@ check-unix:: t_nfold t_encrypt t_decrypt t_prf t_prng t_cmac t_hmac \ $(RUN_SETUP) $(VALGRIND) ./t_encrypt $(RUN_SETUP) $(VALGRIND) ./t_decrypt $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output - if [ @PRNG_ALG@ = yarrow ]; then \ + if [ $(PRNG_ALG) = yarrow ]; then \ diff t_prng.output $(srcdir)/t_prng.expected; \ fi $(RUN_SETUP) $(VALGRIND) ./t_cmac diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in index 94b06c4ee..7536bf80b 100644 --- a/src/lib/crypto/krb/Makefile.in +++ b/src/lib/crypto/krb/Makefile.in @@ -2,25 +2,25 @@ mydir=lib/crypto/krb BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS= arcfour checksum crc32 dk \ prf rand2key old raw prng -LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider -I$(srcdir)/dk \ - -I$(srcdir)/../@CRYPTO_IMPL@/hash_provider \ - -I$(srcdir)/prf -I$(srcdir)/rand2key \ +LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \ + -I$(srcdir)/dk -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \ + -I$(srcdir)/prf -I$(srcdir)/rand2key \ -I$(srcdir)/old -I$(srcdir)/raw \ - -I$(srcdir)/prng \ - -I$(srcdir)/prng/@PRNG_ALG@ \ - -I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des \ - -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/arcfour \ - -I$(srcdir)/../@CRYPTO_IMPL@/camellia \ - -I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@ + -I$(srcdir)/prng \ + -I$(srcdir)/prng/$(PRNG_ALG) \ + -I$(srcdir)/../$(CRYPTO_IMPL) \ + -I$(srcdir)/../$(CRYPTO_IMPL)/des \ + -I$(srcdir)/../$(CRYPTO_IMPL)/aes -I$(srcdir)/arcfour \ + -I$(srcdir)/../$(CRYPTO_IMPL)/camellia \ + -I$(srcdir)/../$(CRYPTO_IMPL)/sha1 \ + -I$(srcdir)/../$(CRYPTO_IMPL) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= -##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)cksum.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)cksum.lst $(OUTPRE)aes.lst +##DOS##BUILDTOP = ..\..\.. +##DOS##PREFIXDIR = krb +##DOS##OBJFILE = ..\$(OUTPRE)krb.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -67,7 +67,7 @@ STLIBOBJS=\ OBJS=\ $(OUTPRE)aead.$(OBJEXT) \ $(OUTPRE)block_size.$(OBJEXT) \ - $(OUTPRE)cf2$(OBJEXT) \ + $(OUTPRE)cf2.$(OBJEXT) \ $(OUTPRE)checksum_length.$(OBJEXT) \ $(OUTPRE)cksumtype_to_string.$(OBJEXT) \ $(OUTPRE)cksumtypes.$(OBJEXT) \ @@ -83,7 +83,7 @@ OBJS=\ $(OUTPRE)encrypt_length.$(OBJEXT) \ $(OUTPRE)enctype_util.$(OBJEXT) \ $(OUTPRE)etypes.$(OBJEXT) \ - $(OUTPRE)key.$(OBJECT) \ + $(OUTPRE)key.$(OBJEXT) \ $(OUTPRE)keyblocks.$(OBJEXT) \ $(OUTPRE)keyed_cksum.$(OBJEXT) \ $(OUTPRE)keyed_checksum_types.$(OBJEXT) \ @@ -98,6 +98,7 @@ OBJS=\ $(OUTPRE)random_to_key.$(OBJEXT) \ $(OUTPRE)state.$(OBJEXT) \ $(OUTPRE)string_to_cksumtype.$(OBJEXT) \ + $(OUTPRE)string_to_key.$(OBJEXT) \ $(OUTPRE)valid_cksumtype.$(OBJEXT) \ $(OUTPRE)verify_checksum.$(OBJEXT) \ $(OUTPRE)verify_checksum_iov.$(OBJEXT) @@ -143,11 +144,11 @@ SRCS=\ STOBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \ dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \ - old/OBJS.ST raw/OBJS.ST prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST OBJS.ST + old/OBJS.ST raw/OBJS.ST prng/$(PRNG_ALG)/OBJS.ST prng/OBJS.ST OBJS.ST SUBDIROBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \ dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \ - old/OBJS.ST raw/OBJS.ST prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST + old/OBJS.ST raw/OBJS.ST prng/$(PRNG_ALG)/OBJS.ST prng/OBJS.ST ##DOS##LIBOBJS = $(OBJS) @@ -160,93 +161,96 @@ clean-unix:: clean-libobjs all-windows:: cd arcfour - @echo Making in crypto\arcfour + @echo Making in crypto\krb\arcfour $(MAKE) -$(MFLAGS) cd ..\crc32 - @echo Making in crypto\crc32 + @echo Making in crypto\krb\crc32 $(MAKE) -$(MFLAGS) cd ..\checksum - @echo Making in crypto\checksum + @echo Making in crypto\krb\checksum $(MAKE) -$(MFLAGS) cd ..\dk - @echo Making in crypto\dk + @echo Making in crypto\krb\dk $(MAKE) -$(MFLAGS) cd ..\prf - @echo Making in crypto\prf + @echo Making in crypto\krb\prf $(MAKE) -$(MFLAGS) cd ..\rand2key - @echo Making in crypto\rand2key + @echo Making in crypto\krb\rand2key $(MAKE) -$(MFLAGS) cd ..\old - @echo Making in crypto\old + @echo Making in crypto\krb\old $(MAKE) -$(MFLAGS) cd ..\raw - @echo Making in crypto\raw + @echo Making in crypto\krb\raw $(MAKE) -$(MFLAGS) cd ..\prng - @echo Making in crypto\prng + @echo Making in crypto\krb\prng $(MAKE) -$(MFLAGS) cd .. + @echo Making in crypto\krb clean-windows:: cd arcfour - @echo Making in clean crypto\arcfour + @echo Making in clean crypto\krb\arcfour $(MAKE) -$(MFLAGS) clean cd ..\crc32 - @echo Making in clean crypto\crc32 + @echo Making in clean crypto\krb\crc32 $(MAKE) -$(MFLAGS) clean cd ..\checksum - @echo Making clean in crypto\checksum + @echo Making clean in crypto\krb\checksum $(MAKE) -$(MFLAGS) clean cd ..\dk - @echo Making clean in crypto\dk + @echo Making clean in crypto\krb\dk $(MAKE) -$(MFLAGS) clean cd ..\prf - @echo Making clean in crypto\prf + @echo Making clean in crypto\krb\prf $(MAKE) -$(MFLAGS) clean cd ..\rand2key - @echo Making clean in crypto\rand2key + @echo Making clean in crypto\krb\rand2key $(MAKE) -$(MFLAGS) clean cd ..\old - @echo Making clean in crypto\old + @echo Making clean in crypto\krb\old $(MAKE) -$(MFLAGS) clean cd ..\raw - @echo Making clean in crypto\raw + @echo Making clean in crypto\krb\raw $(MAKE) -$(MFLAGS) clean cd ..\prng - @echo Making clean in crypto\prng + @echo Making clean in crypto\krb\prng $(MAKE) -$(MFLAGS) clean cd .. + @echo Making clean in crypto\krb check-windows:: cd arcfour - @echo Making in check crypto\arcfour + @echo Making in check crypto\krb\arcfour $(MAKE) -$(MFLAGS) check cd ..\crc32 - @echo Making in check crypto\crc32 + @echo Making in check crypto\krb\crc32 $(MAKE) -$(MFLAGS) check cd ..\checksum - @echo Making check in crypto\checksum + @echo Making check in crypto\krb\checksum $(MAKE) -$(MFLAGS) check cd ..\dk - @echo Making check in crypto\dk + @echo Making check in crypto\krb\dk $(MAKE) -$(MFLAGS) check cd ..\prf - @echo Making check in crypto\prf + @echo Making check in crypto\krb\prf $(MAKE) -$(MFLAGS) check cd ..\rand2key - @echo Making check in crypto\rand2key + @echo Making check in crypto\krb\rand2key $(MAKE) -$(MFLAGS) check cd ..\old - @echo Making check in crypto\old + @echo Making check in crypto\krb\old $(MAKE) -$(MFLAGS) check cd ..\raw - @echo Making check in crypto\raw + @echo Making check in crypto\krb\raw $(MAKE) -$(MFLAGS) check cd ..\prng - @echo Making check in crypto\prng + @echo Making check in crypto\krb\prng $(MAKE) -$(MFLAGS) check cd .. + @echo Making check in crypto\krb @lib_frag@ diff --git a/src/lib/crypto/krb/arcfour/Makefile.in b/src/lib/crypto/krb/arcfour/Makefile.in index bd234faff..f3f0a9bb0 100644 --- a/src/lib/crypto/krb/arcfour/Makefile.in +++ b/src/lib/crypto/krb/arcfour/Makefile.in @@ -1,12 +1,12 @@ mydir=lib/crypto/krb/arcfour BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ \ - -I$(srcdir)/../../@CRYPTO_IMPL@/md4 +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/md4 DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=arcfour -##DOS##OBJFILE=..\$(OUTPRE)arcfour.lst +##DOS##PREFIXDIR = krb\arcfour +##DOS##OBJFILE = ..\..\$(OUTPRE)arcfour.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/checksum/Makefile.in b/src/lib/crypto/krb/checksum/Makefile.in index 826afd189..65a8cbcf4 100644 --- a/src/lib/crypto/krb/checksum/Makefile.in +++ b/src/lib/crypto/krb/checksum/Makefile.in @@ -4,15 +4,15 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../arcfour DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=checksum -##DOS##OBJFILE=..\$(OUTPRE)cksum.lst +##DOS##PREFIXDIR = krb\checksum +##DOS##OBJFILE = ..\..\$(OUTPRE)checksum.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) STLIBOBJS= cbc.o cmac.o confounder.o hmac_md5.o unkeyed.o -OBJS= $(OUTPRE)cbc.$(OBJEXT) $(OUTPRE)cmac.$(OBJECT) \ +OBJS= $(OUTPRE)cbc.$(OBJEXT) $(OUTPRE)cmac.$(OBJEXT) \ $(OUTPRE)confounder.$(OBJEXT) $(OUTPRE)hmac_md5.$(OBJEXT) \ $(OUTPRE)unkeyed.$(OBJEXT) diff --git a/src/lib/crypto/krb/crc32/Makefile.in b/src/lib/crypto/krb/crc32/Makefile.in index b34f3aa72..d46c73962 100644 --- a/src/lib/crypto/krb/crc32/Makefile.in +++ b/src/lib/crypto/krb/crc32/Makefile.in @@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=crc32 -##DOS##OBJFILE=..\$(OUTPRE)crc32.lst +##DOS##PREFIXDIR = krb\crc32 +##DOS##OBJFILE = ..\..\$(OUTPRE)crc32.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/dk/Makefile.in b/src/lib/crypto/krb/dk/Makefile.in index cd804bc6d..0a710110c 100644 --- a/src/lib/crypto/krb/dk/Makefile.in +++ b/src/lib/crypto/krb/dk/Makefile.in @@ -1,11 +1,11 @@ mydir=lib/crypto/krb/dk BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=dk -##DOS##OBJFILE=..\$(OUTPRE)dk.lst +##DOS##PREFIXDIR = krb\dk +##DOS##OBJFILE = ..\..\$(OUTPRE)dk.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/old/Makefile.in b/src/lib/crypto/krb/old/Makefile.in index cc3c7f602..0f21070cf 100644 --- a/src/lib/crypto/krb/old/Makefile.in +++ b/src/lib/crypto/krb/old/Makefile.in @@ -1,11 +1,11 @@ mydir=lib/crypto/krb/old BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir)/.. -I$(srcdir) +LOCALINCLUDES = -I$(srcdir)/../../$(CRYPTO_IMPL)/des -I$(srcdir)/.. -I$(srcdir) DEFS= -##DOS##BUILDTOP = ..\..\.. -##DOS##PREFIXDIR=old -##DOS##OBJFILE=..\$(OUTPRE)old.lst +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR = krb\old +##DOS##OBJFILE = ..\..\$(OUTPRE)old.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/prf/Makefile.in b/src/lib/crypto/krb/prf/Makefile.in index a0e1ad6b1..c2f412d8e 100644 --- a/src/lib/crypto/krb/prf/Makefile.in +++ b/src/lib/crypto/krb/prf/Makefile.in @@ -2,14 +2,14 @@ mydir=lib/crypto/krb/prf BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/.. \ -I$(srcdir)/../dk \ - -I$(srcdir)/../../@CRYPTO_IMPL@ \ - -I$(srcdir)/../../@CRYPTO_IMPL@/md5 \ - -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 + -I$(srcdir)/../../$(CRYPTO_IMPL) \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/md5 \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/sha1 DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=prf -##DOS##OBJFILE=..\$(OUTPRE)prf.lst +##DOS##PREFIXDIR = krb\prf +##DOS##OBJFILE = ..\..\$(OUTPRE)prf.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/prng/Makefile.in b/src/lib/crypto/krb/prng/Makefile.in index 76a9388b8..cef3710cf 100644 --- a/src/lib/crypto/krb/prng/Makefile.in +++ b/src/lib/crypto/krb/prng/Makefile.in @@ -1,16 +1,19 @@ mydir=lib/crypto/krb/prng BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -SUBDIRS= @PRNG_ALG@ -LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../@CRYPTO_IMPL@/enc_provider \ - -I$(srcdir)/../../@CRYPTO_IMPL@/hash_provider \ - -I$(srcdir)/@PRNG_ALG@ \ - -I$(srcdir)/../../@CRYPTO_IMPL@/ \ - -I$(srcdir)/../../@CRYPTO_IMPL@/aes \ - -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../../@CRYPTO_IMPL@/sha2 +SUBDIRS= $(PRNG_ALG) +LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../$(CRYPTO_IMPL)/enc_provider \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/hash_provider \ + -I$(srcdir)/$(PRNG_ALG) \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/ \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/aes \ + -I$(srcdir)/../../$(CRYPTO_IMPL)/sha1 -I$(srcdir)/../../$(CRYPTO_IMPL)/sha2 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR = krb\prng +##DOS##OBJFILE = ..\..\$(OUTPRE)prng.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -24,9 +27,11 @@ OBJS=\ SRCS=\ $(srcdir)/prng.c -STOBJLISTS= OBJS.ST @PRNG_ALG@/OBJS.ST +##DOS##LIBOBJS = $(OBJS) -SUBDIROBJLISTS= @PRNG_ALG@/OBJS.ST +STOBJLISTS= OBJS.ST $(PRNG_ALG)/OBJS.ST + +SUBDIROBJLISTS= $(PRNG_ALG)/OBJS.ST all-unix:: all-libobjs @@ -36,6 +41,27 @@ depend:: $(SRCS) clean-unix:: clean-libobjs +all-windows:: + cd yarrow + @echo Making in crypto\krb\prng\yarrow + $(MAKE) -$(MFLAGS) + cd .. + @echo Making in crypto\krb\prng + +clean-windows:: + cd yarrow + @echo Making clean in crypto\krb\prng\yarrow + $(MAKE) -$(MFLAGS) clean + cd .. + @echo Making clean in crypto\krb\prng + +check-windows:: + cd yarrow + @echo Making check in crypto\krb\prng\yarrow + $(MAKE) -$(MFLAGS) check + cd .. + @echo Making check in crypto\krb\prng + @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/krb/prng/fortuna/Makefile.in b/src/lib/crypto/krb/prng/fortuna/Makefile.in index fd66e08c3..367eb0174 100644 --- a/src/lib/crypto/krb/prng/fortuna/Makefile.in +++ b/src/lib/crypto/krb/prng/fortuna/Makefile.in @@ -1,10 +1,10 @@ mydir=lib/crypto/krb/prng/fortuna BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(srcdir)/../../../@CRYPTO_IMPL@ \ - -I$(srcdir)/../../../@CRYPTO_IMPL@/sha2 \ - -I$(srcdir)/../../../@CRYPTO_IMPL@/aes \ - -I$(srcdir)/../../../@CRYPTO_IMPL@/enc_provider + -I$(srcdir)/../../../$(CRYPTO_IMPL) \ + -I$(srcdir)/../../../$(CRYPTO_IMPL)/sha2 \ + -I$(srcdir)/../../../$(CRYPTO_IMPL)/aes \ + -I$(srcdir)/../../../$(CRYPTO_IMPL)/enc_provider DEFS= RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in index 04fbd1957..d6d29b932 100644 --- a/src/lib/crypto/krb/prng/nss/Makefile.in +++ b/src/lib/crypto/krb/prng/nss/Makefile.in @@ -2,7 +2,7 @@ mydir=lib/crypto/krb/prng/nss BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(srcdir)/../../../@CRYPTO_IMPL@ $(CRYPTO_IMPL_CFLAGS) + -I$(srcdir)/../../../$(CRYPTO_IMPL) $(CRYPTO_IMPL_CFLAGS) DEFS= PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/crypto/krb/prng/yarrow/Makefile.in b/src/lib/crypto/krb/prng/yarrow/Makefile.in index 40dd85aa0..93d6bc44c 100644 --- a/src/lib/crypto/krb/prng/yarrow/Makefile.in +++ b/src/lib/crypto/krb/prng/yarrow/Makefile.in @@ -1,14 +1,14 @@ mydir=lib/crypto/krb/prng/yarrow BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(srcdir)/../../../@CRYPTO_IMPL@ \ - -I$(srcdir)/../../../@CRYPTO_IMPL@/sha1 \ - -I$(srcdir)/../../../@CRYPTO_IMPL@/enc_provider + -I$(srcdir)/../../../$(CRYPTO_IMPL) \ + -I$(srcdir)/../../../$(CRYPTO_IMPL)/sha1 \ + -I$(srcdir)/../../../$(CRYPTO_IMPL)/enc_provider DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=yarrow -##DOS##OBJFILE=..\$(OUTPRE)yarrow.lst +##DOS##BUILDTOP = ..\..\..\..\.. +##DOS##PREFIXDIR = krb\prng\yarrow +##DOS##OBJFILE = ..\..\..\$(OUTPRE)yarrow.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/rand2key/Makefile.in b/src/lib/crypto/krb/rand2key/Makefile.in index adde89b94..f6975d7d9 100644 --- a/src/lib/crypto/krb/rand2key/Makefile.in +++ b/src/lib/crypto/krb/rand2key/Makefile.in @@ -1,11 +1,11 @@ mydir=lib/crypto/krb/rand2key BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../@CRYPTO_IMPL@/des +LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../$(CRYPTO_IMPL)/des DEFS= ##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=rand2key -##DOS##OBJFILE=..\$(OUTPRE)rand2key.lst +##DOS##PREFIXDIR = krb\rand2key +##DOS##OBJFILE= ..\..\$(OUTPRE)rand2key.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/krb/raw/Makefile.in b/src/lib/crypto/krb/raw/Makefile.in index 147b1d52e..a9c3b09d8 100644 --- a/src/lib/crypto/krb/raw/Makefile.in +++ b/src/lib/crypto/krb/raw/Makefile.in @@ -1,11 +1,11 @@ mydir=lib/crypto/krb/raw BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) DEFS= -##DOS##BUILDTOP = ..\..\.. -##DOS##PREFIXDIR=raw -##DOS##OBJFILE=..\$(OUTPRE)raw.lst +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR = krb\raw +##DOS##OBJFILE = ..\..\$(OUTPRE)raw.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index e4a0d58d0..65482c915 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -45,7 +45,7 @@ include_xom=@include_xom@ ##DOS##include_stdint=rem ##DOS##include_inttypes=rem ##DOS##include_xom=rem -gssapi.h: gssapi.hin $(BUILDTOP)/include/autoconf.h +gssapi.h: gssapi.hin @echo "Creating gssapi.h" ; \ h=gss$$$$; $(RM) $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c index efc68073d..fbb7a48a1 100644 --- a/src/lib/gssapi/krb5/copy_ccache.c +++ b/src/lib/gssapi/krb5/copy_ccache.c @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #include "gssapiP_krb5.h" -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_copy_ccache(OM_uint32 *minor_status, gss_cred_id_t *cred_handle, const gss_OID desired_object, diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c index 07f0c9727..636fc04db 100644 --- a/src/lib/gssapi/krb5/get_tkt_flags.c +++ b/src/lib/gssapi/krb5/get_tkt_flags.c @@ -27,7 +27,7 @@ * $Id$ */ -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_get_tkt_flags(OM_uint32 *minor_status, const gss_ctx_id_t context_handle, const gss_OID desired_object, diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index 1cb1c1062..a0e60be5e 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -1003,7 +1003,7 @@ kg_compose_deleg_cred(OM_uint32 *minor_status, #define GSS_KRB5_GET_TKT_FLAGS_OID_LENGTH 11 #define GSS_KRB5_GET_TKT_FLAGS_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x01" -OM_uint32 KRB5_CALLCONV gss_krb5int_get_tkt_flags +OM_uint32 gss_krb5int_get_tkt_flags (OM_uint32 *minor_status, const gss_ctx_id_t context_handle, const gss_OID desired_object, @@ -1012,7 +1012,7 @@ OM_uint32 KRB5_CALLCONV gss_krb5int_get_tkt_flags #define GSS_KRB5_COPY_CCACHE_OID_LENGTH 11 #define GSS_KRB5_COPY_CCACHE_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x02" -OM_uint32 KRB5_CALLCONV gss_krb5int_copy_ccache +OM_uint32 gss_krb5int_copy_ccache (OM_uint32 *minor_status, gss_cred_id_t *cred_handle, const gss_OID desired_oid, @@ -1026,11 +1026,9 @@ struct krb5_gss_ccache_name_req { const char **out_name; }; -OM_uint32 KRB5_CALLCONV gss_krb5int_ccache_name - (OM_uint32 *minor_status, - const gss_OID, - const gss_OID, - const gss_buffer_t); +OM_uint32 +gss_krb5int_ccache_name(OM_uint32 *minor_status, const gss_OID, const gss_OID, + const gss_buffer_t); #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11 #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" @@ -1046,7 +1044,7 @@ struct krb5_gss_set_allowable_enctypes_req { krb5_enctype *ktypes; }; -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_set_allowable_enctypes(OM_uint32 *minor_status, gss_cred_id_t *cred, const gss_OID desired_oid, @@ -1118,7 +1116,7 @@ struct krb5_gss_import_cred_req { krb5_keytab keytab; }; -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_import_cred(OM_uint32 *minor_status, gss_cred_id_t *cred, const gss_OID desired_oid, diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index 25534e56b..50d4e36dd 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -590,10 +590,12 @@ static struct { {GSS_KRB5_FREE_LUCID_SEC_CONTEXT_OID_LENGTH, GSS_KRB5_FREE_LUCID_SEC_CONTEXT_OID}, gss_krb5int_free_lucid_sec_context }, +#ifndef _WIN32 { {GSS_KRB5_USE_KDC_CONTEXT_OID_LENGTH, GSS_KRB5_USE_KDC_CONTEXT_OID}, krb5int_gss_use_kdc_context }, +#endif }; static OM_uint32 diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c index eb9dd83ca..bc3b7c7f9 100644 --- a/src/lib/gssapi/krb5/krb5_gss_glue.c +++ b/src/lib/gssapi/krb5/krb5_gss_glue.c @@ -298,6 +298,7 @@ krb5_gss_register_acceptor_identity(const char *keytab) return major_status; } +#ifndef _WIN32 krb5_error_code krb5_gss_use_kdc_context(void) { @@ -327,6 +328,7 @@ krb5_gss_use_kdc_context(void) return ret; } +#endif /* * This API should go away and be replaced with an accessor diff --git a/src/lib/gssapi/krb5/lucid_context.c b/src/lib/gssapi/krb5/lucid_context.c index b1454cf71..6fe069bda 100644 --- a/src/lib/gssapi/krb5/lucid_context.c +++ b/src/lib/gssapi/krb5/lucid_context.c @@ -60,10 +60,10 @@ make_external_lucid_ctx_v1( * Exported routines */ -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_export_lucid_sec_context( OM_uint32 *minor_status, - gss_ctx_id_t context_handle, + const gss_ctx_id_t context_handle, const gss_OID desired_object, gss_buffer_set_t *data_set) { diff --git a/src/lib/gssapi/krb5/set_allowable_enctypes.c b/src/lib/gssapi/krb5/set_allowable_enctypes.c index de1c5a4db..0daf8b135 100644 --- a/src/lib/gssapi/krb5/set_allowable_enctypes.c +++ b/src/lib/gssapi/krb5/set_allowable_enctypes.c @@ -59,7 +59,7 @@ #endif #include "gssapi_krb5.h" -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_set_allowable_enctypes(OM_uint32 *minor_status, gss_cred_id_t *cred_handle, const gss_OID desired_oid, diff --git a/src/lib/gssapi/krb5/set_ccache.c b/src/lib/gssapi/krb5/set_ccache.c index 7d52608df..4b6c89065 100644 --- a/src/lib/gssapi/krb5/set_ccache.c +++ b/src/lib/gssapi/krb5/set_ccache.c @@ -31,7 +31,7 @@ #include <string.h> #include "gssapiP_krb5.h" -OM_uint32 KRB5_CALLCONV +OM_uint32 gss_krb5int_ccache_name(OM_uint32 *minor_status, const gss_OID desired_mech, const gss_OID desired_object, diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c index d23f32664..5f863e38b 100644 --- a/src/lib/gssapi/mechglue/g_mechattr.c +++ b/src/lib/gssapi/mechglue/g_mechattr.c @@ -91,7 +91,8 @@ testMechAttrsKnown(gss_const_OID_set critical, return 1; } -OM_uint32 gss_indicate_mechs_by_attrs( +OM_uint32 KRB5_CALLCONV +gss_indicate_mechs_by_attrs( OM_uint32 *minor, gss_const_OID_set desired_mech_attrs, gss_const_OID_set except_mech_attrs, @@ -154,7 +155,8 @@ cleanup: return status; } -OM_uint32 gss_inquire_attrs_for_mech( +OM_uint32 KRB5_CALLCONV +gss_inquire_attrs_for_mech( OM_uint32 *minor, gss_const_OID mech_oid, gss_OID_set *mech_attrs, @@ -213,7 +215,8 @@ OM_uint32 gss_inquire_attrs_for_mech( return GSS_S_COMPLETE; } -OM_uint32 gss_display_mech_attr( +OM_uint32 KRB5_CALLCONV +gss_display_mech_attr( OM_uint32 *minor, gss_const_OID mech_attr, gss_buffer_t name, diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c index a68aca9ed..f87febfb2 100644 --- a/src/lib/gssapi/mechglue/g_oid_ops.c +++ b/src/lib/gssapi/mechglue/g_oid_ops.c @@ -100,7 +100,7 @@ gss_str_to_oid(minor_status, oid_str, oid) return status; } -OM_uint32 KRB5_CALLCONV +OM_uint32 gssint_copy_oid_set( OM_uint32 *minor_status, const gss_OID_set_desc * const oidset, diff --git a/src/lib/gssapi/mechglue/g_store_cred.c b/src/lib/gssapi/mechglue/g_store_cred.c index 3b286ecd4..f7de1d613 100644 --- a/src/lib/gssapi/mechglue/g_store_cred.c +++ b/src/lib/gssapi/mechglue/g_store_cred.c @@ -53,14 +53,15 @@ val_store_cred_args( } -OM_uint32 gss_store_cred(minor_status, - input_cred_handle, - cred_usage, - desired_mech, - overwrite_cred, - default_cred, - elements_stored, - cred_usage_stored) +OM_uint32 KRB5_CALLCONV +gss_store_cred(minor_status, + input_cred_handle, + cred_usage, + desired_mech, + overwrite_cred, + default_cred, + elements_stored, + cred_usage_stored) OM_uint32 *minor_status; gss_cred_id_t input_cred_handle; diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h index 63d89c771..3524ceae4 100644 --- a/src/lib/gssapi/mechglue/mglueP.h +++ b/src/lib/gssapi/mechglue/mglueP.h @@ -727,18 +727,6 @@ gssint_userok( int * /* user_ok */ ); -OM_uint32 -gss_store_cred( - OM_uint32 *, /* minor_status */ - const gss_cred_id_t, /* input_cred_handle */ - gss_cred_usage_t, /* cred_usage */ - const gss_OID, /* desired_mech */ - OM_uint32, /* overwrite_cred */ - OM_uint32, /* default_cred */ - gss_OID_set *, /* elements_stored */ - gss_cred_usage_t * /* cred_usage_stored */ -); - int gssint_get_der_length( unsigned char **, /* buf */ diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h index 50f05678d..3c2edbbdd 100644 --- a/src/lib/gssapi/spnego/gssapiP_spnego.h +++ b/src/lib/gssapi/spnego/gssapiP_spnego.h @@ -13,7 +13,6 @@ extern "C" { #endif #include <gssapi/gssapi.h> -#include <syslog.h> #define SEC_CONTEXT_TOKEN 1 #define SPNEGO_SIZE_OF_INT 4 diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 519050a14..784714669 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -61,8 +61,6 @@ */ /* #pragma ident "@(#)spnego_mech.c 1.7 04/09/28 SMI" */ -#include <sys/param.h> -#include <unistd.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -2417,7 +2415,7 @@ spnego_gss_complete_auth_token( OM_uint32 spnego_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status, const gss_cred_id_t impersonator_cred_handle, - gss_name_t desired_name, + const gss_name_t desired_name, OM_uint32 time_req, gss_OID_set desired_mechs, gss_cred_usage_t cred_usage, diff --git a/src/lib/gssapi32.def b/src/lib/gssapi32.def index fa36f51ed..96dbae421 100644 --- a/src/lib/gssapi32.def +++ b/src/lib/gssapi32.def @@ -97,3 +97,74 @@ EXPORTS gss_mech_set_krb5_both @43 DATA GSS_KRB5_NT_PRINCIPAL_NAME @8 DATA gss_mech_krb5_wrong @41 DATA + +; Added in krb5 1.7-1.9 + gss_acquire_cred_impersonate_name + gss_acquire_cred_with_password + gss_add_buffer_set_member + gss_add_cred_impersonate_name + gss_complete_auth_token + gss_create_empty_buffer_set + gss_delete_name_attribute + gss_display_mech_attr + gss_display_name_ext + gss_export_name_composite + gss_get_name_attribute + gss_indicate_mechs_by_attrs + gss_inquire_attrs_for_mech + gss_inquire_cred_by_oid + gss_inquire_mech_for_saslname + gss_inquire_name + gss_inquire_saslname_for_mech + gss_inquire_sec_context_by_oid + gsskrb5_extract_authtime_from_sec_context + gsskrb5_extract_authz_data_from_sec_context + gss_krb5_import_cred + gss_krb5_set_cred_rcache + gss_map_name_to_any + gss_pseudo_random + gss_release_any_name_mapping + gss_release_buffer_set + gss_release_iov_buffer + gss_set_cred_option + gss_set_name_attribute + gss_set_neg_mechs + gss_set_sec_context_option + gss_store_cred + gss_unwrap_aead + gss_unwrap_iov + gss_wrap_aead + gss_wrap_iov + gss_wrap_iov_length + + GSS_C_INQ_SSPI_SESSION_KEY DATA + GSS_C_MA_AUTH_INIT DATA + GSS_C_MA_AUTH_INIT_ANON DATA + GSS_C_MA_AUTH_INIT_INIT DATA + GSS_C_MA_AUTH_TARG DATA + GSS_C_MA_AUTH_TARG_ANON DATA + GSS_C_MA_AUTH_TARG_INIT DATA + GSS_C_MA_CBINDINGS DATA + GSS_C_MA_COMPRESS DATA + GSS_C_MA_CONF_PROT DATA + GSS_C_MA_CTX_TRANS DATA + GSS_C_MA_DELEG_CRED DATA + GSS_C_MA_DEPRECATED DATA + GSS_C_MA_INTEG_PROT DATA + GSS_C_MA_ITOK_FRAMED DATA + GSS_C_MA_MECH_COMPOSITE DATA + GSS_C_MA_MECH_CONCRETE DATA + GSS_C_MA_MECH_GLUE DATA + GSS_C_MA_MECH_NEGO DATA + GSS_C_MA_MECH_PSEUDO DATA + GSS_C_MA_MIC DATA + GSS_C_MA_NOT_DFLT_MECH DATA + GSS_C_MA_NOT_MECH DATA + GSS_C_MA_OOS_DET DATA + GSS_C_MA_PFS DATA + GSS_C_MA_PROT_READY DATA + GSS_C_MA_REPLAY_DET DATA + GSS_C_MA_WRAP DATA + gss_mech_iakerb DATA + gss_nt_exported_name DATA + gss_nt_service_name_v2 DATA diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 7aeb6bfe5..af5c65928 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -1242,7 +1242,7 @@ krb5_error_code decode_krb5_iakerb_finished cleanup(free); } -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5int_get_authdata_containee_types(krb5_context context, const krb5_authdata *authdata, unsigned int *num, diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c index 8c6677e25..677a1971e 100644 --- a/src/lib/krb5/keytab/kt_file.c +++ b/src/lib/krb5/keytab/kt_file.c @@ -159,7 +159,7 @@ krb5_ktfileint_find_slot(krb5_context, krb5_keytab, krb5_int32 *, * initialized with file keytab routines. */ -static krb5_error_code +static krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve(krb5_context context, const char *name, krb5_keytab *id_out) { diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 0737a2e53..d4db454d4 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -115,6 +115,7 @@ STLIBOBJS= \ OBJS= $(OUTPRE)addr_comp.$(OBJEXT) \ $(OUTPRE)addr_order.$(OBJEXT) \ $(OUTPRE)addr_srch.$(OBJEXT) \ + $(OUTPRE)allow_weak.$(OBJEXT) \ $(OUTPRE)appdefault.$(OBJEXT) \ $(OUTPRE)auth_con.$(OBJEXT) \ $(OUTPRE)authdata.$(OBJEXT) \ diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index 5efb37105..65c87667d 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -601,7 +601,7 @@ krb5_auth_con_get_subkey_enctype(krb5_context context, return 0; } -krb5_error_code KRB5_CALLCONV +krb5_error_code krb5_auth_con_get_authdata_context(krb5_context context, krb5_auth_context auth_context, krb5_authdata_context *ad_context) @@ -610,7 +610,7 @@ krb5_auth_con_get_authdata_context(krb5_context context, return 0; } -krb5_error_code KRB5_CALLCONV +krb5_error_code krb5_auth_con_set_authdata_context(krb5_context context, krb5_auth_context auth_context, krb5_authdata_context ad_context) diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index ac2859860..8fb22c6ed 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -1143,7 +1143,7 @@ krb5_tkt_creds_free(krb5_context context, krb5_tkt_creds_context ctx) free(ctx); } -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_tkt_creds_get(krb5_context context, krb5_tkt_creds_context ctx) { krb5_error_code code; diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c index 6a8cdd522..476a513bb 100644 --- a/src/lib/krb5/krb/kfree.c +++ b/src/lib/krb5/krb/kfree.c @@ -808,7 +808,8 @@ krb5_free_etype_list(krb5_context context, free(etypes); } } -void krb5_free_fast_req(krb5_context context, krb5_fast_req *val) +void KRB5_CALLCONV +krb5_free_fast_req(krb5_context context, krb5_fast_req *val) { if (val == NULL) return; @@ -816,7 +817,8 @@ void krb5_free_fast_req(krb5_context context, krb5_fast_req *val) free(val); } -void krb5_free_fast_armor(krb5_context context, krb5_fast_armor *val) +void KRB5_CALLCONV +krb5_free_fast_armor(krb5_context context, krb5_fast_armor *val) { if (val == NULL) return; @@ -824,7 +826,8 @@ void krb5_free_fast_armor(krb5_context context, krb5_fast_armor *val) free(val); } -void krb5_free_fast_response(krb5_context context, krb5_fast_response *val) +void KRB5_CALLCONV +krb5_free_fast_response(krb5_context context, krb5_fast_response *val) { if (!val) return; @@ -834,8 +837,8 @@ void krb5_free_fast_response(krb5_context context, krb5_fast_response *val) free(val); } -void krb5_free_fast_finished -(krb5_context context, krb5_fast_finished *val) +void KRB5_CALLCONV +krb5_free_fast_finished(krb5_context context, krb5_fast_finished *val) { if (!val) return; @@ -844,7 +847,8 @@ void krb5_free_fast_finished free(val); } -void krb5_free_typed_data(krb5_context context, krb5_typed_data **in) +void +krb5_free_typed_data(krb5_context context, krb5_typed_data **in) { int i = 0; if (in == NULL) return; @@ -857,8 +861,8 @@ void krb5_free_typed_data(krb5_context context, krb5_typed_data **in) free(in); } -void krb5_free_fast_armored_req(krb5_context context, - krb5_fast_armored_req *val) +void KRB5_CALLCONV +krb5_free_fast_armored_req(krb5_context context, krb5_fast_armored_req *val) { if (val == NULL) return; diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index 96a022f4d..5c4e21d6a 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -371,7 +371,7 @@ krb5_get_fallback_host_realm(krb5_context context, * Common code for krb5_get_host_realm and krb5_get_fallback_host_realm * to do basic sanity checks on supplied hostname. */ -krb5_error_code KRB5_CALLCONV +krb5_error_code krb5int_clean_hostname(krb5_context context, const char *host, char *local_host, size_t lhsize) { diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def index 569c9ff17..a7e236e25 100644 --- a/src/lib/krb5_32.def +++ b/src/lib/krb5_32.def @@ -12,7 +12,6 @@ ; PRIVATE - Private entrypoint. It should not be called by anything other ; than gssapi32.dll or krb4_32.dll. ; GSSAPI - Private entrypoint used by gssapi32.dll. -; KRB4 - Private entrypoint used by krb4_32.dll. ; KRB5_CALLCONV_WRONG - entrypoint that should have used KRB5_CALLCONV, but ; did not due to developer error @@ -258,17 +257,6 @@ EXPORTS krb5int_accessor @267 ; INTERNAL (to end all internals) -; Temporary exports (DO NOT USE) -; DO NOT USE -- Currently required for krb4_32.dll -; des_ecb_encrypt @3 ; PRIVATE KRB4 -; des_new_random_key @6 ; PRIVATE KRB4 -; des_key_sched @5 ; PRIVATE KRB4 -; des_pcbc_encrypt @7 ; PRIVATE KRB4 -; des_quad_cksum @8 ; PRIVATE KRB4 -; des_string_to_key @9 ; PRIVATE KRB4 -; des_init_random_number_generator @4 ; PRIVATE KRB4 -; afs_string_to_key @1 ; PRIVATE KRB4 - ; DO NOT USE -- Currently required to implement gssapi32.dll decode_krb5_ap_req @2 ; PRIVATE GSSAPI k5-int.h KRB5_CALLCONV_WRONG krb5_externalize_opaque @114 ; PRIVATE GSSAPI k5-int.h @@ -300,7 +288,7 @@ EXPORTS krb5_free_error_message @134 krb5_clear_error_message @94 -; new in 1.7 +; new in 1.7-1.9 krb5_rd_rep_dce krb5_mk_rep_dce krb5_c_padding_length @@ -309,3 +297,111 @@ EXPORTS krb5_c_decrypt_iov krb5_c_make_checksum_iov krb5_c_verify_checksum_iov + krb5_allow_weak_crypto + krb5_anonymous_principal + krb5_anonymous_realm + krb5_auth_con_getkey_k + krb5_auth_con_getrecvsubkey_k + krb5_auth_con_getsendsubkey_k + krb5_auth_con_setrecvsubkey_k + krb5_auth_con_setsendsubkey_k + krb5_build_principal_alloc_va + krb5_c_crypto_length_iov + krb5_c_free_state + krb5_c_fx_cf2_simple + krb5_c_init_state + krb5_c_keylengths + krb5_c_random_add_entropy + krb5_c_random_os_entropy + krb5_c_random_to_key + krb5_cc_dup + krb5_cc_get_config + krb5_cc_set_config + krb5_copy_error_message + krb5_decode_authdata_container + krb5_encode_authdata_container + krb5_enctype_to_name + krb5_get_fallback_host_realm + krb5_get_init_creds_opt_get_fast_flags + krb5_get_init_creds_opt_set_anonymous + krb5_get_init_creds_opt_set_canonicalize + krb5_get_init_creds_opt_set_expire_callback + krb5_get_init_creds_opt_set_fast_ccache + krb5_get_init_creds_opt_set_fast_ccache_name + krb5_get_init_creds_opt_set_fast_flags + krb5_get_init_creds_opt_set_out_ccache + krb5_init_creds_free + krb5_init_creds_get + krb5_init_creds_get_creds + krb5_init_creds_get_error + krb5_init_creds_get_times + krb5_init_creds_init + krb5_init_creds_set_keytab + krb5_init_creds_set_password + krb5_init_creds_set_service + krb5_init_creds_step + krb5_is_config_principal + krb5_k_create_key + krb5_k_decrypt + krb5_k_decrypt_iov + krb5_k_encrypt + krb5_k_encrypt_iov + krb5_k_free_key + krb5_k_key_enctype + krb5_k_key_keyblock + krb5_k_make_checksum + krb5_k_make_checksum_iov + krb5_k_prf + krb5_k_reference_key + krb5_k_verify_checksum + krb5_k_verify_checksum_iov + krb5_make_authdata_kdc_issued + krb5_merge_authdata + krb5_pac_add_buffer + krb5_pac_free + krb5_pac_get_buffer + krb5_pac_get_types + krb5_pac_init + krb5_pac_parse + krb5_pac_verify + krb5_parse_name_flags + krb5_principal_compare_any_realm + krb5_principal_compare_flags + krb5_tkt_creds_free + krb5_tkt_creds_get + krb5_tkt_creds_get_creds + krb5_tkt_creds_get_times + krb5_tkt_creds_init + krb5_tkt_creds_step + krb5_unparse_name_flags + krb5_unparse_name_flags_ext + krb5_verify_authdata_kdc_issued + +; More internal symbols used by gssapi + decode_krb5_error ; PRIVATE GSSAPI + decode_krb5_iakerb_finished ; PRIVATE GSSAPI + decode_krb5_iakerb_header ; PRIVATE GSSAPI + encode_krb5_iakerb_finished ; PRIVATE GSSAPI + encode_krb5_iakerb_header ; PRIVATE GSSAPI + encode_krb5_ticket ; PRIVATE GSSAPI + krb5_auth_con_get_authdata_context ; PRIVATE GSSAPI + krb5_auth_con_set_authdata_context ; PRIVATE GSSAPI + krb5_authdata_context_copy ; PRIVATE GSSAPI + krb5_authdata_context_free ; PRIVATE GSSAPI + krb5_authdata_context_init ; PRIVATE GSSAPI + krb5_authdata_delete_attribute ; PRIVATE GSSAPI + krb5_authdata_export_attributes ; PRIVATE GSSAPI + krb5_authdata_export_authdata ; PRIVATE GSSAPI + krb5_authdata_export_internal ; PRIVATE GSSAPI + krb5_authdata_free_internal ; PRIVATE GSSAPI + krb5_authdata_get_attribute ; PRIVATE GSSAPI + krb5_authdata_get_attribute_types ; PRIVATE GSSAPI + krb5_authdata_import_attributes ; PRIVATE GSSAPI + krb5_authdata_set_attribute ; PRIVATE GSSAPI + krb5_free_iakerb_finished ; PRIVATE GSSAPI + krb5_free_iakerb_header ; PRIVATE GSSAPI + krb5_get_credentials_for_user ; PRIVATE GSSAPI + krb5_get_credentials_for_proxy ; PRIVATE GSSAPI + krb5_sendto_kdc ; PRIVATE GSSAPI + krb5int_copy_data_contents_add0 ; PRIVATE GSSAPI + krb5int_free_data_list ; PRIVATE GSSAPI diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c index b18178e1c..3d6dd7206 100644 --- a/src/lib/win_glue.c +++ b/src/lib/win_glue.c @@ -1,12 +1,5 @@ -#ifdef KRB4 -#include <kerberosIV/krb.h> -#endif #include "k5-int.h" -#ifdef KRB4 -#include <kerberosIV/krb_err.h> -#include <kerberosIV/kadm_err.h> -#endif #ifdef KRB5 #include "krb5_err.h" #include "kv5m_err.h" @@ -374,24 +367,13 @@ control(int mode) profile_library_finalizer(); break; } -#elif defined KRB4 - switch (mode){ - case DLL_STARTUP: - add_error_table(&et_krb_error_table); - add_error_table(&et_kadm_error_table); - break; - case DLL_SHUTDOWN: - remove_error_table(&et_krb_error_table); - remove_error_table(&et_kadm_error_table); - break; - } #elif defined GSSAPI switch (mode) { case DLL_STARTUP: - gssint_lib_init__auxinit(); + gssint_mechglue_init__auxinit(); break; case DLL_SHUTDOWN: - gssint_lib_fini(); + gssint_mechglue_fini(); break; } #elif defined COMERR |