Mac Beta 1 submission

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6749 dc483132-0cff-0310-8789-dd5450dbe970

13 files changed, 52 insertions, 5 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 89f798626..07a00ad8b 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep  6 12:00:00 1995  James Mattly  <mattly@fusion.com>
+	* gssapiP_generic.h:  changed a path bearing include for MACINTOSH
+	* gssapi_generic.h:  changed a path bearing include for MACINTOSH
+	* util_cannonhost.h:  changed a path bearing include for MACINTOSH
+	* utl_nohash_validate.h:  changed a path bearing include for MACINTOSH,
+		also we don't have limits.h
+
 
 Thu Aug 31 11:43:59 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* gssapi.h - Update to V2 API.  Also use autoconf.h if USE_AUTOCONF_H
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index ab7eddf97..80fd082f3 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -28,7 +28,9 @@
 
 #include "gssapi_err_generic.h"
 #include <errno.h>
+#ifndef _MACINTOSH
 #include <sys/types.h>
+#endif
 
 /** helper macros **/
 
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index 9073840de..462414de6 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -23,7 +23,11 @@
 #ifndef _GSSAPI_GENERIC_H_
 #define _GSSAPI_GENERIC_H_
 
+#ifndef _MACINTOSH
 #include <gssapi/gssapi.h>
+#else
+#include <gssapi.h>
+#endif
 
 extern const gss_OID_desc FAR * const gss_nt_user_name;
 extern const gss_OID_desc FAR * const gss_nt_machine_uid_name;
diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index 712d0ee07..896b950b1 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -24,7 +24,9 @@
 #define NEED_SOCKETS
 #include "gssapiP_generic.h"
 
+#ifndef _MACINTOSH
 #include <sys/types.h>
+#endif
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index eaa83d34d..4cd94cafd 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -26,8 +26,10 @@
 
 #include "gssapiP_generic.h"
 
+#ifndef _MACINTOSH
 #include <sys/types.h>
 #include <limits.h>
+#endif
 
 /* functions for each type */
 
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 79444319c..d541e3f27 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,13 @@
+Wed Sep  6 12:00:00 1995  James Mattly  <mattly@fusion.com>
+
+	* gssapi_krb5.h:  changed a path bearing include for MACINTOSH
+
+	* accept_sec_context.c:  changed a path bearing include for MACINTOSH
+
+	* k5seal.c:  changed a path bearing include for MACINTOSH
+
+	* k5unseal.c:  changed a path bearing include for MACINTOSH
+	
 Sat Sep  9 00:16:34 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* krb5_gss_glue.c (gss_delete_sec_context): Add extra indirection
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 55b0eb6b7..725a67dc7 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -21,7 +21,11 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifndef _MACINTOSH
+#include <krb5/rsa-md5.h>
+#else
 #include "rsa-md5.h"
+#endif
 #include <memory.h>
 
 OM_uint32
@@ -248,7 +252,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
 
    /* fill in the encryption descriptors */
 
-   krb5_use_enctype(context, &ctx->enc.eblock, ENCTYPE_DES_CBC_RAW);
+   krb5_use_cstype(context, &ctx->enc.eblock, ETYPE_RAW_DES_CBC);
    ctx->enc.processed = 0;
    if (code = krb5_copy_keyblock(context, ctx->subkey, &ctx->enc.key))
       return(code); 
@@ -256,7 +260,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
       /*SUPPRESS 113*/
       ctx->enc.key->contents[i] ^= 0xf0;
 
-   krb5_use_enctype(context, &ctx->seq.eblock, ENCTYPE_DES_CBC_RAW);
+   krb5_use_cstype(context, &ctx->seq.eblock, ETYPE_RAW_DES_CBC);
    ctx->seq.processed = 0;
    ctx->seq.key = ctx->subkey;
 
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index dc109f158..6d6a1a32f 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -35,7 +35,11 @@
 #endif
 
 /* this must be after "krb5.h", since krb5 #defines xfree(), too */
+#ifndef _MACINTOSH
 #include "../generic/gssapiP_generic.h"
+#else
+#include "gssapiP_generic.h"
+#endif
 #include "gssapi_krb5.h"
 #include "gssapi_err_krb5.h"
 
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index ef8477291..450081d97 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -23,7 +23,11 @@
 #ifndef _GSSAPI_KRB5_H_
 #define _GSSAPI_KRB5_H_
 
+#ifndef _MACINTOSH
 #include <gssapi/gssapi_generic.h>
+#else
+#include <gssapi_generic.h>
+#endif
 #include "krb5.h"
 
 extern const gss_OID_desc * const gss_mech_krb5;
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index bcd999ae7..41c12dbf5 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -294,7 +294,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
 
       /* the encryption key is the session key XOR 0xf0f0f0f0f0f0f0f0 */
 
-      krb5_use_enctype(context, &ctx->enc.eblock, ENCTYPE_DES_CBC_RAW);
+      krb5_use_cstype(context, &ctx->enc.eblock, ETYPE_RAW_DES_CBC);
       ctx->enc.processed = 0;
       if (code = krb5_copy_keyblock(context, ctx->subkey, &ctx->enc.key))
 	 return(code); 
@@ -302,7 +302,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
 	 /*SUPPRESS 113*/
 	 ctx->enc.key->contents[i] ^= 0xf0;
 
-      krb5_use_enctype(context, &ctx->seq.eblock, ENCTYPE_DES_CBC_RAW);
+      krb5_use_cstype(context, &ctx->seq.eblock, ETYPE_RAW_DES_CBC);
       ctx->seq.processed = 0;
       ctx->seq.key = ctx->subkey;
 
diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index 38770173e..cbf4ae700 100644
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -21,7 +21,11 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifndef _MACINTOSH
+#include <krb5/rsa-md5.h>
+#else
 #include "rsa-md5.h"
+#endif
 
 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 a50c4cb21..350bcb8af 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -22,7 +22,11 @@
 
 #include "gssapiP_krb5.h"
 #include <memory.h>
+#ifndef _MACINTOSH
+#include <krb5/rsa-md5.h>
+#else
 #include "rsa-md5.h"
+#endif
 
 /* message_buffer is an input if SIGN, output if SEAL, and ignored if DEL_CTX
    conf_state is only valid if SEAL.
diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
index ed60922d5..8792b8bd9 100644
--- a/src/lib/gssapi/krb5/util_seed.c
+++ b/src/lib/gssapi/krb5/util_seed.c
@@ -45,7 +45,7 @@ kg_make_seed(key, seed)
    for (i=0; i<ed.key->length; i++)
       ed.key->contents[i] = key->contents[key->length - 1 - i];
 
-   krb5_use_enctype(kg_context, &ed.eblock, ENCTYPE_DES_CBC_RAW);
+   krb5_use_cstype(kg_context, &ed.eblock, ETYPE_RAW_DES_CBC);
    ed.processed = 0;
 
    code = kg_encrypt(&ed, NULL, zeros, seed, 16);