Calling convention for krb5int_c_combine_keys does not match prototype

The Windows calling convention for krb5int_c_combine_keys does not match the
prototype in k5-int.h.  I missed this during the initial commit since I
neglected to test out the build of this code on Windows.

ticket: new

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 1dba48d3e185bff6d886631dc1d7dab19280c447..2f8c304da32e74dccac1732a746c06e501c3c13e 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-03  Ken Hornstein  <kenh@cmf.nrl.navy.mil>
+
+       * combine_keys.c: Fix up calling convention to match prototype
+       in k5-int.h
+
 2002-10-31  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (check-unix): Don't run t_pkcs5.

diff --git a/src/lib/crypto/combine_keys.c b/src/lib/crypto/combine_keys.c
index 472c07e6a4a52a714641df4d3605d53ea975d6f4..3bf4c2b2de2a94770fe127e0ab4a3185c73632d4 100644 (file)
--- a/src/lib/crypto/combine_keys.c
+++ b/src/lib/crypto/combine_keys.c
@@ -50,7 +50,7 @@ static krb5_error_code dr
 (const struct krb5_enc_provider *enc, const krb5_keyblock *inkey,
                unsigned char *outdata, const krb5_data *in_constant);
 
-krb5_error_code KRB5_CALLCONV krb5int_c_combine_keys
+krb5_error_code krb5int_c_combine_keys
 (krb5_context context, krb5_keyblock *key1, krb5_keyblock *key2, krb5_keyblock *outkey)
 {
     unsigned char *r1, *r2, *combined, *rnd, *output;