oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

correct crc calculation and actually checks it as well.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1279 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-03-08 05:55:54 +00:00
parent cd9dbf4d4f
commit a700b9bcaf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5/encrypt.c
View File

@@ -1,5 +1,6 @@
#include <krb5_locl.h> #include <krb5_locl.h>
#include <krb5_error.h> #include <krb5_error.h>
#include "crc.h"
krb5_error_code krb5_error_code
krb5_encrypt (krb5_context context, krb5_encrypt (krb5_context context,
@@ -45,8 +46,8 @@ krb5_decrypt (krb5_context context,
krb5_keyblock *keyblock, krb5_keyblock *keyblock,
krb5_data *result) krb5_data *result)
{ {
u_char *p; u_char *p = (u_char *)ptr;
u_long crc; u_long my_crc, her_crc;
des_cblock key; des_cblock key;
des_key_schedule schedule; des_key_schedule schedule;
@@ -54,14 +55,16 @@ krb5_decrypt (krb5_context context,
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt ((des_cblock *)ptr, (des_cblock *)ptr, len, schedule, &key, DES_DECRYPT); des_cbc_encrypt ((des_cblock *)ptr, (des_cblock *)ptr, len, schedule, &key, DES_DECRYPT);
her_crc = (p[11] << 24) | (p[10] << 16) | (p[9] << 8) | (p[8] << 0);
memset (p + 8, 0, sizeof(her_crc));
crc_init_table (); crc_init_table ();
crc = crc_update (ptr, len, 0); my_crc = crc_update (ptr, len, 0);
#if 0 if (my_crc != her_crc)
if (crc)
return KRB5KRB_AP_ERR_BAD_INTEGRITY; return KRB5KRB_AP_ERR_BAD_INTEGRITY;
#endif
result->length = len - 12; result->length = len - 12;
result->data = malloc(result->length); result->data = malloc(result->length);
if (result->data == NULL)
return ENOMEM;
memcpy (result->data, (u_char *)ptr + 12, result->length); memcpy (result->data, (u_char *)ptr + 12, result->length);
return 0; return 0;
} }