* Removed all narrow types and references to wide.h and narrow.h

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

11 files changed, 12 insertions, 31 deletions

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index fb9ebd6a9..431586bf5 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 25 16:54:40 1995  Chris Provenzano (proven@mit.edu)
+
+        * Removed all narrow types and references to wide.h and narrow.h
+
 Fri Nov 18 16:20:10 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* destest.c (main): Add magic numbers to keyblock structure.
diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index cc5762a35..ac922ae19 100644
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -103,10 +103,6 @@ typedef struct {
 }       sbox_out;
 #endif	/*BITS32*/
 
-
-/* widen prototypes, if needed */
-#include <krb5/widen.h>
-
 /* cbc_cksum.c */
 extern krb5_error_code mit_des_cbc_checksum
     PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum * ));
@@ -194,7 +190,4 @@ extern unsigned long swap_long_bytes_bit_number PROTOTYPE((unsigned long ));
 extern void test_set PROTOTYPE((FILE *, const char *, int, const char *, int));
 #endif
 
-/* and back to normal... */
-#include <krb5/narrow.h>
-
 #endif	/*DES_INTERNAL_DEFS*/
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 91c2d9651..526effdb5 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 25 16:54:40 1995  Chris Provenzano (proven@mit.edu)
+
+        * Removed all narrow types and references to wide.h and narrow.h
+
 Sun Jan 22 18:26:32 1995  John Gilmore  (gnu at toad.com)
 
 	* acquire_cred.c (acquire_accept_cred):  Add context arg when
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index c6e2dc47b..56dce2f12 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -24,7 +24,6 @@
 #include <krb5/rsa-md5.h>
 #include <memory.h>
 
-#include <krb5/widen.h>
 static krb5_error_code 
 rd_req_keyproc(context, keyprocarg, server, kvno, keyblock)
      krb5_context context;
@@ -32,7 +31,6 @@ rd_req_keyproc(context, keyprocarg, server, kvno, keyblock)
      krb5_principal server;
      krb5_kvno kvno;
      krb5_keyblock **keyblock;
-#include <krb5/narrow.h>
 {
    krb5_error_code code;
    krb5_keytab_entry ktentry;
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index ea7c50abe..6a4d7b6f7 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 25 16:54:40 1995  Chris Provenzano (proven@mit.edu)
+
+	* Removed all narrow types and references to wide.h and narrow.h
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 2cb128c8b..de17523ce 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -65,14 +65,11 @@ extern krb5_deltat krb5_clockskew;
 
 /* some typedef's for the function args to make things look a bit cleaner */
 
-/* widen this prototype if need be */
-#include <krb5/widen.h>
 typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context,
 						   const krb5_keytype,
 						   krb5_keyblock **,
 						   krb5_const_pointer,
 						   krb5_pa_data **));
-#include <krb5/narrow.h>
 
 typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context,
 						       const krb5_keyblock *,
diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 2258f89ce..9bbb033e7 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -40,7 +40,6 @@ extern char *krb5_default_pwd_prompt1;
  * key-producing procedure for use by krb5_get_in_tkt_with_password.
  */
 
-#include <krb5/widen.h>
 static krb5_error_code
 pwd_keyproc(context, type, key, keyseed, padata)
     krb5_context context;
@@ -48,7 +47,6 @@ pwd_keyproc(context, type, key, keyseed, padata)
     krb5_keyblock ** key;
     krb5_const_pointer keyseed;
     krb5_pa_data ** padata;
-#include <krb5/narrow.h>
 {
     krb5_data salt;
     krb5_error_code retval;
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 26b194723..cc9a89bc3 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -40,15 +40,12 @@ struct skey_keyproc_arg {
  * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch
  * from system area.
  */
-#include <krb5/widen.h>
-static krb5_error_code
 skey_keyproc(context, type, key, keyseed, padata)
     krb5_context context;
     const krb5_keytype type;
     krb5_keyblock ** key;
     krb5_const_pointer keyseed;
     krb5_pa_data ** padata;
-#include <krb5/narrow.h>
 {
     krb5_keyblock *realkey;
     const struct skey_keyproc_arg *arg;
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 9a264a3df..84fd4ccf2 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -27,8 +27,6 @@
 
 #ifndef KRB5_INT_FUNC_PROTO__
 #define KRB5_INT_FUNC_PROTO__
-/* widen prototypes, if needed */
-#include <krb5/widen.h>
 
 krb5_error_code krb5_tgtname
     PROTOTYPE((krb5_context context,
@@ -42,8 +40,6 @@ krb5_error_code krb5_get_cred_via_tgt
 	       const krb5_enctype,
 	       const krb5_cksumtype,
 	       krb5_creds * ));
-/* and back to normal... */
-#include <krb5/narrow.h>
 
 #endif /* KRB5_INT_FUNC_PROTO__ */
 
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 5ec3758cf..6b2d08518 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -54,14 +54,10 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-/* widen prototypes, if needed */
-#include <krb5/widen.h>
 typedef krb5_error_code (*rdreq_key_proc) PROTOTYPE((krb5_pointer, 
 						     krb5_principal,
 						     krb5_kvno,
 						     krb5_keyblock **));
-/* and back to normal... */
-#include <krb5/narrow.h>
 
 krb5_error_code
 krb5_rd_req(context, inbuf, server, sender_addr, fetchfrom, keyproc, 
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 463970763..cad8f99b8 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -62,18 +62,12 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-/* widen prototypes, if needed */
-#include <krb5/widen.h>
-
 static krb5_error_code decrypt_authenticator
 	PROTOTYPE((krb5_context, const krb5_ap_req *, krb5_authenticator **));
 typedef krb5_error_code (*rdreq_key_proc)
 	PROTOTYPE((krb5_context, krb5_pointer, krb5_principal,
 		   krb5_kvno, krb5_keyblock **));
 
-/* and back to normal... */
-#include <krb5/narrow.h>
-
 extern krb5_deltat krb5_clockskew;
 #define in_clock_skew(date) (abs((date)-currenttime) < krb5_clockskew)