diff options
| author | Keith Vetter <keithv@fusion.com> | 1995-04-14 00:56:21 +0000 |
|---|---|---|
| committer | Keith Vetter <keithv@fusion.com> | 1995-04-14 00:56:21 +0000 |
| commit | 48e59557cdff501a25c809cda3f1dd34a27cc52f (patch) | |
| tree | 3bbc11e8ef7f3866da45c06871f18b1fae020bcb /src/lib/crypto/des/string2key.c | |
| parent | 73bd684de42505fe4e6a15803ddf074c57db671c (diff) | |
| download | krb5-48e59557cdff501a25c809cda3f1dd34a27cc52f.tar.gz krb5-48e59557cdff501a25c809cda3f1dd34a27cc52f.tar.xz krb5-48e59557cdff501a25c809cda3f1dd34a27cc52f.zip | |
Windows global stuff:
o removed INTERFACE from non-api functions
o add FAR to pointers visible to the world
o made the tests for __STDC__ also check for _WINDOWS
o creates GSSAPI.DLL & GSSAPI.LIB as per spec.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5354 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/des/string2key.c')
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index b9dd7115d2..7eb58affb0 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -40,7 +40,7 @@ returns: errors */ -krb5_error_code INTERFACE +krb5_error_code mit_des_string_to_key (eblock, keytype, keyblock, data, salt) const krb5_encrypt_block FAR * eblock; const krb5_keytype keytype; @@ -61,7 +61,9 @@ const krb5_data FAR * salt; char k_char[64]; mit_des_key_schedule key_sked; +#ifndef min #define min(A, B) ((A) < (B) ? (A): (B)) +#endif if ( keytype != KEYTYPE_DES ) return (KRB5_PROG_KEYTYPE_NOSUPP); |