diff options
Diffstat (limited to 'src/lib/crypto/md5/md5crypto.c')
| -rw-r--r-- | src/lib/crypto/md5/md5crypto.c | 73 |
1 files changed, 46 insertions, 27 deletions
diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c index 1982a56e23..b83e50e77b 100644 --- a/src/lib/crypto/md5/md5crypto.c +++ b/src/lib/crypto/md5/md5crypto.c @@ -2,18 +2,6 @@ #include "rsa-md5.h" #include "des_int.h" /* we cheat a bit and call it directly... */ -/* Windows needs to these prototypes for the assignment below */ - -krb5_error_code -krb5_md5_crypto_sum_func PROTOTYPE((krb5_pointer in, size_t in_length, - krb5_pointer seed, size_t seed_length, krb5_checksum FAR *outcksum)); - -krb5_error_code -krb5_md5_crypto_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in, - size_t in_length, krb5_pointer seed, size_t seed_length)); - -static mit_des_cblock zero_ivec = { 0 }; - /* * In Kerberos V5 Beta 5 and previous releases the RSA-MD5-DES implementation * did not follow RFC1510. The folowing definitions control the compatibility @@ -30,6 +18,37 @@ static mit_des_cblock zero_ivec = { 0 }; #define MD5_K5BETA_COMPAT #define MD5_K5BETA_COMPAT_DEF + +/* Windows needs to these prototypes for the assignment below */ + +#ifdef MD5_K5BETA_COMPAT +krb5_error_code +krb5_md5_crypto_compat_sum_func PROTOTYPE(( + krb5_const krb5_pointer in, + krb5_const size_t in_length, + krb5_const krb5_pointer seed, + krb5_const size_t seed_length, + krb5_checksum FAR *outcksum)); +#endif + +krb5_error_code +krb5_md5_crypto_sum_func PROTOTYPE(( + krb5_const krb5_pointer in, + krb5_const size_t in_length, + krb5_const krb5_pointer seed, + krb5_const size_t seed_length, + krb5_checksum FAR *outcksum)); + +krb5_error_code +krb5_md5_crypto_verify_func PROTOTYPE(( + krb5_const krb5_checksum FAR *cksum, + krb5_const krb5_pointer in, + krb5_const size_t in_length, + krb5_const krb5_pointer seed, + krb5_const size_t seed_length)); + +static mit_des_cblock zero_ivec = { 0 }; + static void krb5_md5_calculate_cksum(md5ctx, confound, confound_length, in, in_length) krb5_MD5_CTX *md5ctx; @@ -48,11 +67,11 @@ krb5_md5_calculate_cksum(md5ctx, confound, confound_length, in, in_length) #ifdef MD5_K5BETA_COMPAT krb5_error_code krb5_md5_crypto_compat_sum_func(in, in_length, seed, seed_length, outcksum) -krb5_pointer in; -size_t in_length; -krb5_pointer seed; -size_t seed_length; -krb5_checksum FAR *outcksum; + krb5_const krb5_pointer in; + krb5_const size_t in_length; + krb5_const krb5_pointer seed; + krb5_const size_t seed_length; + krb5_checksum FAR *outcksum; { krb5_octet outtmp[OLD_RSA_MD5_DES_CKSUM_LENGTH]; krb5_octet *input = (krb5_octet *)in; @@ -96,11 +115,11 @@ krb5_checksum FAR *outcksum; krb5_error_code krb5_md5_crypto_sum_func(in, in_length, seed, seed_length, outcksum) -krb5_pointer in; -size_t in_length; -krb5_pointer seed; -size_t seed_length; -krb5_checksum FAR *outcksum; + krb5_const krb5_pointer in; + krb5_const size_t in_length; + krb5_const krb5_pointer seed; + krb5_const size_t seed_length; + krb5_checksum FAR *outcksum; { krb5_octet outtmp[NEW_RSA_MD5_DES_CKSUM_LENGTH]; mit_des_cblock tmpkey; @@ -162,11 +181,11 @@ krb5_checksum FAR *outcksum; krb5_error_code krb5_md5_crypto_verify_func(cksum, in, in_length, seed, seed_length) -krb5_checksum FAR *cksum; -krb5_pointer in; -size_t in_length; -krb5_pointer seed; -size_t seed_length; + krb5_const krb5_checksum FAR *cksum; + krb5_const krb5_pointer in; + krb5_const size_t in_length; + krb5_const krb5_pointer seed; + krb5_const size_t seed_length; { krb5_octet outtmp[NEW_RSA_MD5_DES_CKSUM_LENGTH]; mit_des_cblock tmpkey; |