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

Check kdf params. calculate the second half of the key.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22939 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-09 13:07:24 +00:00
parent 122f00f53b
commit 8e6f72fb92
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/crypto.c
View File

@@ -4150,7 +4150,7 @@ _krb5_pk_kdf(krb5_context context,
const Ticket *ticket, const Ticket *ticket,
krb5_keyblock *key) krb5_keyblock *key)
{ {
struct encryption_type *et = _find_enctype(enctype); struct encryption_type *et;
krb5_error_code ret; krb5_error_code ret;
krb5_data other; krb5_data other;
size_t keylen, offset; size_t keylen, offset;
@@ -4158,11 +4158,19 @@ _krb5_pk_kdf(krb5_context context,
unsigned char *keydata; unsigned char *keydata;
unsigned char shaoutput[20]; unsigned char shaoutput[20];
if (der_heim_oid_cmp(oid_id_pkinit_kdf_ah_sha1(), ai->algorithm) != 0) { if (der_heim_oid_cmp(oid_id_pkinit_kdf_ah_sha1(), &ai->algorithm) != 0) {
krb5_set_error_string(context, "kdf not supported"); krb5_set_error_string(context, "kdf not supported");
return KRB5_PROG_ETYPE_NOSUPP; return KRB5_PROG_ETYPE_NOSUPP;
} }
if (ai->parameters != NULL &&
(ai->parameters->length != 2 ||
memcmp(ai->parameters->data, "\x05\x00", 2) != 0))
{
krb5_set_error_string(context, "kdf params not NULL or the NULL-type");
return KRB5_PROG_ETYPE_NOSUPP;
}
et = _find_enctype(enctype);
if(et == NULL) { if(et == NULL) {
krb5_set_error_string(context, "encryption type %d not supported", krb5_set_error_string(context, "encryption type %d not supported",
enctype); enctype);
@@ -4202,7 +4210,7 @@ _krb5_pk_kdf(krb5_context context,
offset += sizeof(shaoutput); offset += sizeof(shaoutput);
counter++; counter++;
} while (keylen < offset); } while(offset < keylen);
memset(shaoutput, 0, sizeof(shaoutput)); memset(shaoutput, 0, sizeof(shaoutput));
free(other.data); free(other.data);