diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-27 19:53:11 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-27 19:53:11 +0000 |
| commit | 3d2e877565152e07b6362c43a24f215a2be9b80d (patch) | |
| tree | 3518fa437187bc797110228696ba2de833a31b18 | |
| parent | 653f5bb02d576d4545188ccc165d1333b20b6bc9 (diff) | |
| download | krb5-3d2e877565152e07b6362c43a24f215a2be9b80d.tar.gz krb5-3d2e877565152e07b6362c43a24f215a2be9b80d.tar.xz krb5-3d2e877565152e07b6362c43a24f215a2be9b80d.zip | |
Find rsa-md5.h in the correct place. Use k5-int.h
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6352 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/gssapiP_krb5.h | 11 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5seal.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/k5unseal.c | 2 |
6 files changed, 12 insertions, 14 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 0cf43359c1..117bb16630 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,4 +1,11 @@ +Thu Jul 27 15:26:27 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Add -I$(srcdir)/../../crypto/md5 to get rsa-md5.h. + * accept_sec_context.c - Include "rsa-md5.h" instead of <krb5/...>. + * gssapiP_krb5.h - Replace k5-specific includes with k5-int.h + * k5[un]seal.c - Include "rsa-md5.h" instead of <krb5/...>. + + Fri Jul 7 16:23:17 EDT 1995 Paul Park (pjpark@mit.edu) * Makefile.in - Remove LDFLAGS, it's set by configure. diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 76e1bc774f..0f52e7c19d 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,4 +1,4 @@ -CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic +CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic -I$(srcdir)/../../crypto/md5 ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\gssapi.$(LIBEXT) diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index c78bf3574d..f0317944cc 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -21,7 +21,7 @@ */ #include "gssapiP_krb5.h" -#include <krb5/rsa-md5.h> +#include "rsa-md5.h" #include <memory.h> OM_uint32 diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index 9c46f489a4..6c14f692f2 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -23,16 +23,7 @@ #ifndef _GSSAPIP_KRB5_H_ #define _GSSAPIP_KRB5_H_ -#include "krb5.h" -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#ifdef TIME_WITH_SYS_TIME -#include <time.h> -#endif -#else -#include <time.h> -#endif -#include "los-proto.h" +#include "k5-int.h" #include <memory.h> /* work around sunos braindamage */ diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c index acb37196e8..17d93b2513 100644 --- a/src/lib/gssapi/krb5/k5seal.c +++ b/src/lib/gssapi/krb5/k5seal.c @@ -21,7 +21,7 @@ */ #include "gssapiP_krb5.h" -#include <krb5/rsa-md5.h> +#include "rsa-md5.h" static krb5_error_code make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token, diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c index 054b5eac77..40fe9eed10 100644 --- a/src/lib/gssapi/krb5/k5unseal.c +++ b/src/lib/gssapi/krb5/k5unseal.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" #include <memory.h> -#include <krb5/rsa-md5.h> +#include "rsa-md5.h" /* message_buffer is an input if SIGN, output if SEAL, and ignored if DEL_CTX conf_state is only valid if SEAL. |