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

new functions DES_encrypt_null_ivec' and DES_encrypt_key_ivec'

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2253 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-13 07:26:22 +00:00
parent 757f7b9430
commit 32fd82841a
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/krb5/encrypt.c
View File

@@ -18,7 +18,20 @@ NULL_encrypt(void *p, size_t len, const krb5_keyblock *keyblock, int encrypt)
} }
static void static void
DES_encrypt(void *p, size_t len, DES_encrypt_null_ivec(void *p, size_t len,
const krb5_keyblock *keyblock, int encrypt)
{
des_cblock key;
des_cblock ivec;
des_key_schedule schedule;
memcpy(&key, keyblock->keyvalue.data, sizeof(key));
des_set_key(&key, schedule);
memset (&ivec, 0, sizeof(ivec));
des_cbc_encrypt(p, p, len, schedule, &ivec, encrypt);
}
static void
DES_encrypt_key_ivec(void *p, size_t len,
const krb5_keyblock *keyblock, int encrypt) const krb5_keyblock *keyblock, int encrypt)
{ {
des_cblock key; des_cblock key;
@@ -35,9 +48,12 @@ DES3_encrypt(void *p, size_t len, const krb5_keyblock *keyblock, int encrypt)
} }
static struct encryption_type em [] = { static struct encryption_type em [] = {
{ ETYPE_DES_CBC_CRC, 8, 8, DES_encrypt, KEYTYPE_DES, CKSUMTYPE_CRC32 }, { ETYPE_DES_CBC_CRC, 8, 8, DES_encrypt_key_ivec,
{ ETYPE_DES_CBC_MD4, 8, 8, DES_encrypt, KEYTYPE_DES, CKSUMTYPE_RSA_MD4 }, KEYTYPE_DES, CKSUMTYPE_CRC32 },
{ ETYPE_DES_CBC_MD5, 8, 8, DES_encrypt, KEYTYPE_DES, CKSUMTYPE_RSA_MD5 }, { ETYPE_DES_CBC_MD4, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD4 },
{ ETYPE_DES_CBC_MD5, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD5 },
{ ETYPE_NULL, 1, 0, NULL_encrypt, KEYTYPE_NULL, CKSUMTYPE_NONE }, { ETYPE_NULL, 1, 0, NULL_encrypt, KEYTYPE_NULL, CKSUMTYPE_NONE },
}; };
@@ -106,7 +122,7 @@ krb5_do_encrypt(krb5_context context,
krb5_generate_random_block(p, et->confoundersize); /* XXX */ krb5_generate_random_block(p, et->confoundersize); /* XXX */
memcpy(p + et->confoundersize + checksumsize, ptr, len); memcpy(p + et->confoundersize + checksumsize, ptr, len);
krb5_create_checksum(context, et->cksumtype, p, sz, &cksum); krb5_create_checksum(context, et->cksumtype, p, sz, NULL, &cksum);
memcpy(p + et->confoundersize, cksum.checksum.data, checksumsize); memcpy(p + et->confoundersize, cksum.checksum.data, checksumsize);
free_Checksum(&cksum); free_Checksum(&cksum);
(*et->encrypt)(p, sz, keyblock, 1); (*et->encrypt)(p, sz, keyblock, 1);
@@ -144,6 +160,7 @@ krb5_do_decrypt(krb5_context context,
ret = krb5_verify_checksum (context, ret = krb5_verify_checksum (context,
ptr, ptr,
len, len,
NULL,
&cksum); &cksum);
free_Checksum(&cksum); free_Checksum(&cksum);
if(ret) if(ret)