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

add MD4

Browse Source 
adjust krb5_encrypt and krb5_decrypt to reality


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2017 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-07 09:49:43 +00:00
parent 6b1ad83a22
commit db5cadb051
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/krb5/encrypt.c
View File

@@ -17,11 +17,20 @@ NULL_checksum(void *p, size_t len, void *result)
{ {
} }
static void
MD4_checksum(void *p, size_t len, void *result)
{
struct md4 m;
md4_init(&m);
md4_update(&m, p, len);
md4_finito(&m, result);
}
static void static void
MD5_checksum(void *p, size_t len, void *result) MD5_checksum(void *p, size_t len, void *result)
{ {
struct md5 m; struct md5 m;
md5init(&m); md5_init(&m);
md5_update(&m, p, len); md5_update(&m, p, len);
md5_finito(&m, result); md5_finito(&m, result);
} }
@@ -67,11 +76,12 @@ DES_encrypt(void *p, size_t len,
static void static void
DES3_encrypt(void *p, size_t len, const krb5_keyblock *keyblock, int encrypt) DES3_encrypt(void *p, size_t len, const krb5_keyblock *keyblock, int encrypt)
{ {
abort ();
} }
static struct encryption_type em [] = { static struct encryption_type em [] = {
{ ETYPE_DES_CBC_CRC, 8, 8, 4, DES_encrypt, CRC_checksum }, { ETYPE_DES_CBC_CRC, 8, 8, 4, DES_encrypt, CRC_checksum },
{ ETYPE_DES_CBC_MD4, 8, 8, 16, DES_encrypt, MD4_checksum },
{ ETYPE_DES_CBC_MD5, 8, 8, 16, DES_encrypt, MD5_checksum }, { ETYPE_DES_CBC_MD5, 8, 8, 16, DES_encrypt, MD5_checksum },
{ ETYPE_NULL, 1, 0, 0, NULL_encrypt, NULL_checksum }, { ETYPE_NULL, 1, 0, 0, NULL_encrypt, NULL_checksum },
}; };
@@ -86,17 +96,16 @@ krb5_do_encrypt(krb5_context context,
krb5_keyblock *keyblock, krb5_keyblock *keyblock,
krb5_data *result) krb5_data *result)
{ {
size_t size;
size_t sz; size_t sz;
unsigned char *p; unsigned char *p;
size = len + et->confoundersize + et->checksumsize; sz = len + et->confoundersize + et->checksumsize;
sz = (size + et->blocksize - 1) & ~ (et->blocksize - 1); sz = (sz + et->blocksize - 1) & ~ (et->blocksize - 1);
p = calloc(1, sz); p = calloc(1, sz);
if (p == NULL) if (p == NULL)
return ENOMEM; return ENOMEM;
des_rand_data(p, et->confoundersize); des_rand_data(p, et->confoundersize);
memcpy(p + et->confoundersize + et->checksumsize, ptr, len); memcpy(p + et->confoundersize + et->checksumsize, ptr, len);
(*et->checksum)(p, size, p + et->confoundersize); (*et->checksum)(p, sz, p + et->confoundersize);
(*et->encrypt)(p, sz, keyblock, 1); (*et->encrypt)(p, sz, keyblock, 1);
result->data = p; result->data = p;
result->length = sz; result->length = sz;
@@ -113,20 +122,23 @@ krb5_do_decrypt(krb5_context context,
{ {
unsigned char *his_checksum; unsigned char *his_checksum;
unsigned char *p = ptr; unsigned char *p = ptr;
size_t length = 0; /* magic! */ size_t outlen;
(*et->encrypt)(ptr, len, keyblock, 0); (*et->encrypt)(ptr, len, keyblock, 0);
his_checksum = malloc(et->checksumsize); his_checksum = malloc(et->checksumsize);
memcpy(his_checksum, ptr + et->confoundersize, et->checksumsize); memcpy(his_checksum, p + et->confoundersize, et->checksumsize);
memset(ptr + et->confoundersize, 0, et->checksumsize); memset(p + et->confoundersize, 0, et->checksumsize);
(*et->checksum)(p, length, p + et->confoundersize); (*et->checksum)(p, len, p + et->confoundersize);
if (memcmp(p + et->confoundersize, his_checksum, et->checksumsize)) if (memcmp(p + et->confoundersize, his_checksum, et->checksumsize))
return KRB5KRB_AP_ERR_BAD_INTEGRITY; return KRB5KRB_AP_ERR_BAD_INTEGRITY;
result->data = malloc(length);
outlen = len - et->confoundersize - et->checksumsize;
result->data = malloc(outlen);
if(result->data == NULL) if(result->data == NULL)
return ENOMEM; return ENOMEM;
result->length = length; result->length = outlen;
memcpy(result->data, p + et->confoundersize, et->checksumsize); memcpy(result->data, p + et->confoundersize + et->checksumsize, outlen);
return 0; return 0;
} }