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

(encrypt_internal): free checksum if lengths fail to match.

Browse Source 
(krb5_get_wrapped_length): new function


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5904 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-04-10 15:10:00 +00:00
parent 953f595904
commit 65f29bd32d
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/krb5/crypto.c
View File

@@ -656,7 +656,7 @@ krb5_generate_random_keyblock(krb5_context context,
static krb5_error_code static krb5_error_code
_key_schedule(krb5_context context, _key_schedule(krb5_context context,
struct key_data *key) struct key_data *key)
{ {
krb5_error_code ret; krb5_error_code ret;
struct encryption_type *et = _find_enctype(key->key->keytype); struct encryption_type *et = _find_enctype(key->key->keytype);
@@ -1207,6 +1207,7 @@ verify_checksum(krb5_context context,
int keyed_checksum; int keyed_checksum;
Checksum c; Checksum c;
struct checksum_type *ct; struct checksum_type *ct;
if(crypto) { if(crypto) {
ct = crypto->et->keyed_checksum; ct = crypto->et->keyed_checksum;
if(ct == NULL) if(ct == NULL)
@@ -1650,8 +1651,10 @@ encrypt_internal(krb5_context context,
p, p,
block_sz, block_sz,
&cksum); &cksum);
if(ret == 0 && cksum.checksum.length != checksum_sz) if(ret == 0 && cksum.checksum.length != checksum_sz) {
free_Checksum (&cksum);
ret = KRB5_CRYPTO_INTERNAL; ret = KRB5_CRYPTO_INTERNAL;
}
if(ret) { if(ret) {
memset(p, 0, block_sz); memset(p, 0, block_sz);
free(p); free(p);
@@ -2101,6 +2104,24 @@ krb5_string_to_key_derived(krb5_context context,
return ret; return ret;
} }
/*
* Return the size of an encrypted packet of length `data_len'
*/
size_t
krb5_get_wrapped_length (krb5_context context,
krb5_crypto crypto,
size_t data_len)
{
struct encryption_type *et = crypto->et;
size_t blocksize = et->blocksize;
size_t res;
res = et->confoundersize + et->cksumtype->checksumsize + data_len;
res = (res + blocksize - 1) / blocksize * blocksize;
return res;
}
#ifdef CRYPTO_DEBUG #ifdef CRYPTO_DEBUG
static krb5_error_code static krb5_error_code