Various fixes to Windows build of krb4 library. Fix up KRB5_CALLCONV

on some new krb4 library functions.  Fix up library generation to
refer to des425.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8f4618294ecbe782ee8f2f3cab94f2e77eb168eb..6fb06da16f92e62576dc4b543ade4e23ef1fbc45 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-10  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (lib/krb4/krb_err_txt.c): Replace $(S) with "/" to
+       avoid breakage on Windows.
+
 2003-02-07  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Add rules for generating lib/krb4/krb_err_txt.c for

diff --git a/src/Makefile.in b/src/Makefile.in
index be9a1db7efea21af0476707f49c8c13e9eefd712..35bb244ba560a79276cec2fc071c238a43dd7110 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -500,9 +500,9 @@ $(GG)gssapi_err_generic.c: $(AC) $(GG)gssapi_err_generic.et
 $(GK)gssapi_err_krb5.c: $(AC) $(GK)gssapi_err_krb5.et
        $(AWK) -f $(AC) outfile=$@ $(GK)gssapi_err_krb5.et
 
-lib$(S)krb4$(S)krb_err_txt.c: lib$(S)krb4$(S)krb_err.et
-       $(AWK) -f lib$(S)krb4$(S)et_errtxt.awk outfile=$@ \
-               lib$(S)krb4$(S)krb_err.et
+lib/krb4/krb_err_txt.c: lib/krb4/krb_err.et
+       $(AWK) -f lib/krb4/et_errtxt.awk outfile=$@ \
+               lib/krb4/krb_err.et
 
 KRBHDEP = $(INC)krb5.hin $(INC)krb5_err.h $(INC)kdb5_err.h \
        $(INC)kv5m_err.h $(INC)asn1_err.h

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 3f2be016dd6e933e48331a8d2807b616265f2963..7f0061d9b4f8b551e1ab0b2908e40dce2616ee88 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-10  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (K4LIBS): Add des425.lib.
+
 2003-01-17  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5_32.def: Export krb5_rc_close, krb5_free_enc_tkt_part, and

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 01a43511dba15bc2cc39e636790080bb37850f24..83624ef6b1e31218cc1aa2efec0deedcccde13e9 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -40,7 +40,7 @@ KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \
        $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \
        des425\$(OUTPRE)des425.lib
 GLIBS = gssapi\$(OUTPRE)gssapi.lib
-K4LIBS = krb4\$(OUTPRE)krb4.lib
+K4LIBS = krb4\$(OUTPRE)krb4.lib des425\$(OUTPRE)des425.lib
 
 CDEF = comerr32.def
 PDEF = xpprof32.def

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index fbef40e2635c262eceb9102535cc2821b3b2a97b..e71a890ae82d3e320e4b297b893dd06388d732c4 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,11 @@
 2003-02-10  Tom Yu  <tlyu@mit.edu>
 
+       * password_to_key.c (mit_passwd_to_key, krb5_passwd_to_key) 
+       (afs_passwd_to_key): Fix to have KRB5_CALLCONV.
+
+       * krb4int.h (mit_passwd_to_key, krb5_passwd_to_key):
+       (afs_passwd_to_key): Fix prototypes to have KRB5_CALLCONV.
+
        * CCache-glue.c (krb4int_save_credentials_addr): Renamed from
        krb_save_credentials().
        (krb_save_credentials): Implement in terms of

diff --git a/src/lib/krb4/krb4int.h b/src/lib/krb4/krb4int.h
index 0a09378cfc57e591927193c3580684c3847fe59a..9857b4cae7af9fa626a236e74fcaba43b3d72870 100644 (file)
--- a/src/lib/krb4/krb4int.h
+++ b/src/lib/krb4/krb4int.h
@@ -72,12 +72,12 @@ const char * month_sname(int);
 
 /* password_to_key.c */
 key_proc_type *krb_get_keyprocs (key_proc_type keyproc);
-int mit_passwd_to_key(char *user, char *instance, char *realm, 
-                      char *passwd, C_Block key);
-int krb5_passwd_to_key(char *user, char *instance, char *realm,
-                      char *passwd, C_Block key);
-int afs_passwd_to_key(char *user, char *instance, char *realm,
-                      char *passwd, C_Block key);
+int KRB5_CALLCONV mit_passwd_to_key(char *user, char *instance, char *realm, 
+                                   char *passwd, C_Block key);
+int KRB5_CALLCONV krb5_passwd_to_key(char *user, char *instance, char *realm,
+                                    char *passwd, C_Block key);
+int KRB5_CALLCONV afs_passwd_to_key(char *user, char *instance, char *realm,
+                                   char *passwd, C_Block key);
 
 /* rd_preauth.c */
 #ifdef KRB_DB_DEFS

diff --git a/src/lib/krb4/password_to_key.c b/src/lib/krb4/password_to_key.c
index ee040fc5174aa8c187b57d54f8a0ee83d3005bad..adde3b9fd4beb6d34d39ee60083d5da4d201f693 100644 (file)
--- a/src/lib/krb4/password_to_key.c
+++ b/src/lib/krb4/password_to_key.c
@@ -72,8 +72,13 @@ key_proc_type *krb_get_keyprocs (key_proc_type keyproc)
     }
 }
 
-int mit_passwd_to_key(char *user, char *instance, char *realm,
-                      char *passwd, C_Block key)
+int KRB5_CALLCONV
+mit_passwd_to_key(
+    char       *user,
+    char       *instance,
+    char       *realm,
+    char       *passwd,
+    C_Block    key)
 {
 #pragma unused(user)
 #pragma unused(instance)
@@ -92,8 +97,13 @@ int mit_passwd_to_key(char *user, char *instance, char *realm,
 }
 
 /* So we can use a v4 kinit against a v5 kdc with no krb4 salted key */
-int krb5_passwd_to_key(char *user, char *instance, char *realm,
-                      char *passwd, C_Block key)
+int KRB5_CALLCONV
+krb5_passwd_to_key(
+    char       *user,
+    char       *instance,
+    char       *realm,
+    char       *passwd,
+    C_Block    key)
 {
     if (user && instance && realm && passwd) {
         unsigned int len = MAX_K_NAME_SZ + strlen(passwd) + 1;
@@ -109,8 +119,13 @@ int krb5_passwd_to_key(char *user, char *instance, char *realm,
     return -1;
 }
 
-int afs_passwd_to_key(char *user, char *instance, char *realm,
-                      char *passwd, C_Block key)
+int KRB5_CALLCONV
+afs_passwd_to_key(
+    char       *user,
+    char       *instance,
+    char       *realm,
+    char       *passwd,
+    C_Block    key)
 {
 #pragma unused(user)
 #pragma unused(instance)