diff options
| author | Ken Hornstein <kenh@cmf.nrl.navy.mil> | 2002-11-03 20:31:33 +0000 |
|---|---|---|
| committer | Ken Hornstein <kenh@cmf.nrl.navy.mil> | 2002-11-03 20:31:33 +0000 |
| commit | 2a17315d8783b3ef8b7e3593903cf3fe2d3de578 (patch) | |
| tree | 19434bac042e6f4ab4cd72acb33eea0d05b6b290 /src/lib | |
| parent | 2062506389b7b0d295ee645d41520c7d80e58b4d (diff) | |
| download | krb5-2a17315d8783b3ef8b7e3593903cf3fe2d3de578.zip krb5-2a17315d8783b3ef8b7e3593903cf3fe2d3de578.tar.gz krb5-2a17315d8783b3ef8b7e3593903cf3fe2d3de578.tar.bz2 | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/combine_keys.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 1dba48d..2f8c304 100644 --- 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 472c07e..3bf4c2b 100644 --- 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; |