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

Implement des-cbc-crc, and des-cbc-md5 in separate function.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1987 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-07 00:51:50 +00:00
parent afe3e0eee4
commit 66830aa4ab
1 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/krb5/decrypt.c
View File

@@ -1,17 +1,19 @@
#include <krb5_locl.h> #include <krb5_locl.h>
#include "crc.h" #include "crc.h"
#include <md5.h>
RCSID("$Id$"); RCSID("$Id$");
krb5_error_code krb5_error_code
krb5_decrypt (krb5_context context, krb5_des_cbc_decrypt(krb5_context context,
void *ptr, void *ptr,
size_t len, size_t len,
int etype,
const krb5_keyblock *keyblock, const krb5_keyblock *keyblock,
krb5_data *result) krb5_data *result)
{ {
u_char *p = (u_char *)ptr; u_char *p = (u_char *)ptr;
u_int32_t my_crc, her_crc; size_t offset;
des_cblock key; des_cblock key;
des_key_schedule schedule; des_key_schedule schedule;
@@ -19,17 +21,59 @@ 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, des_cbc_encrypt ((des_cblock *)ptr, (des_cblock *)ptr, len,
schedule, &key, DES_DECRYPT); schedule, &key, DES_DECRYPT);
switch(etype){
case ETYPE_DES_CBC_MD5:
{
struct md5 m;
u_int32_t his_checksum[4];
u_int32_t my_checksum[4];
memcpy(his_checksum, p + 8, 16);
memset(p + 8, 0, 16);
md5init(&m);
md5_update (&m, ptr, len);
md5_finito(&m, my_checksum);
if(memcmp(his_checksum, my_checksum, 16))
return KRB5KRB_AP_ERR_BAD_INTEGRITY;
offset = 24;
}
break;
her_crc = (p[11] << 24) | (p[10] << 16) | (p[9] << 8) | (p[8] << 0); case ETYPE_DES_CBC_CRC:
{
u_int32_t my_crc, her_crc;
her_crc = (p[11] << 24) | (p[10] << 16) |
(p[9] << 8) | (p[8] << 0);
memset (p + 8, 0, sizeof(her_crc)); memset (p + 8, 0, sizeof(her_crc));
crc_init_table (); crc_init_table ();
my_crc = crc_update (ptr, len, 0); my_crc = crc_update (ptr, len, 0);
if (my_crc != her_crc) if (my_crc != her_crc)
return KRB5KRB_AP_ERR_BAD_INTEGRITY; return KRB5KRB_AP_ERR_BAD_INTEGRITY;
result->length = len - 12; offset = 12;
}
break;
default:
return KRB5_PROG_ETYPE_NOSUPP;
}
result->length = len - offset;
result->data = malloc(result->length); result->data = malloc(result->length);
if (result->data == NULL) if (result->data == NULL)
return ENOMEM; return ENOMEM;
memcpy (result->data, (u_char *)ptr + 12, result->length); memcpy(result->data, p + 12, result->length);
return 0; return 0;
} }
krb5_error_code
krb5_decrypt (krb5_context context,
void *ptr,
size_t len,
int etype,
const krb5_keyblock *keyblock,
krb5_data *result)
{
switch(etype){
case ETYPE_DES_CBC_CRC:
return des_cbc_crc_decrypt(context, ptr, len, etype, keyblock, result);
}
return KRB5_PROG_ETYPE_NOSUPP;
}