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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 0cf43359c1c85d6487bb808b0bea63b9e062d799..117bb1663018243959db1462d6b5f0ff77f0f164 100644 (file)
--- 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 76e1bc774f7fa68271cc1a2fc50ee1d560d92919..0f52e7c19d40f6a41bc2aa040e495f5a788fa58c 100644 (file)
--- 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 c78bf3574db176be7fbfa6e915ef9c0a0b1d0553..f0317944ccffa60564cd26364a8ff46cbf9bc0ca 100644 (file)
--- 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 9c46f489a45c79e7100aa6af6db07d44864a1d8e..6c14f692f21cd18c1d30c183bd81be512aaaf945 100644 (file)
--- 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 acb37196e873027e489a1a485b543ca7a4eab556..17d93b2513689ead8d6388341bc7f767e1e47310 100644 (file)
--- 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 054b5eac7708b0531c7f760d888145dff27440ae..40fe9eed10747dedce06202acddc0a517ca62931 100644 (file)
--- 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.