From: Ben Kaduk <kaduk@mit.edu>
Date: Tue, 4 Dec 2012 20:51:20 +0000 (-0500)
Subject: Build fixes for windows
X-Git-Tag: krb5-1.12-alpha1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef68e4dab824ef62dded1edb662d292ccad8984;p=thirdparty%2Fkrb5.git

Build fixes for windows

Add entries to OBJS and SRCS as well as STLIBOBJS.

Use KRB5_CALLCONV at function definition as well as declaration.

Declare missing variable in _WIN32-conditional code.

ticket: 7479 (new)
tags: pullup
target_version: 1.11
---

diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index b65559ba11..4ef9b85eb5 100644
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -88,6 +88,7 @@ OBJS=\
 	$(OUTPRE)checksum_length.$(OBJEXT)	\
 	$(OUTPRE)cksumtype_to_string.$(OBJEXT)	\
 	$(OUTPRE)cksumtypes.$(OBJEXT)		\
+	$(OUTPRE)cmac.$(OBJEXT)			\
 	$(OUTPRE)coll_proof_cksum.$(OBJEXT)	\
 	$(OUTPRE)combine_keys.$(OBJEXT)		\
 	$(OUTPRE)crc32.$(OBJEXT)		\
@@ -149,6 +150,7 @@ SRCS=\
 	$(srcdir)/checksum_length.c	\
 	$(srcdir)/cksumtype_to_string.c	\
 	$(srcdir)/cksumtypes.c		\
+	$(srcdir)/cmac.c		\
 	$(srcdir)/coll_proof_cksum.c	\
 	$(srcdir)/combine_keys.c	\
 	$(srcdir)/crc32.c		\
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 62c59eaf53..a7303b6fdb 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -1330,7 +1330,7 @@ static void
 loadConfigFromRegistry(HKEY hBaseKey, const char *keyPath)
 {
 	HKEY hConfigKey;
-	DWORD iSubKey, nSubKeys, maxSubKeyNameLen;
+	DWORD iSubKey, nSubKeys, maxSubKeyNameLen, modTypeLen;
 	char *oidStr = NULL, *oid = NULL, *sharedLib = NULL, *kernMod = NULL;
 	char *modOptions = NULL, *modType = NULL;
 	DWORD oidStrLen = 0, oidLen = 0, sharedLibLen = 0, kernModLen = 0;
diff --git a/src/lib/krb5/krb/preauth_otp.c b/src/lib/krb5/krb/preauth_otp.c
index 27157c5266..082897857a 100644
--- a/src/lib/krb5/krb/preauth_otp.c
+++ b/src/lib/krb5/krb/preauth_otp.c
@@ -1174,7 +1174,7 @@ clpreauth_otp_initvt(krb5_context context, int maj_ver, int min_ver,
     return 0;
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_responder_otp_get_challenge(krb5_context ctx,
                                  krb5_responder_context rctx,
                                  krb5_responder_otp_challenge **chl)
@@ -1197,7 +1197,7 @@ krb5_responder_otp_get_challenge(krb5_context ctx,
     return 0;
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_responder_otp_set_answer(krb5_context ctx, krb5_responder_context rctx,
                               size_t ti, const char *value, const char *pin)
 {
@@ -1256,7 +1256,7 @@ error:
     return ENOMEM;
 }
 
-void
+void KRB5_CALLCONV
 krb5_responder_otp_challenge_free(krb5_context ctx,
                                   krb5_responder_context rctx,
                                   krb5_responder_otp_challenge *chl)