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

More EVP.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23572 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-17 14:06:10 +00:00
parent acdb0765bd
commit b0b2802cb1
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/krb5/crypto.c
View File

@@ -569,20 +569,36 @@ ARCFOUR_string_to_key(krb5_context context,
krb5_keyblock *key) krb5_keyblock *key)
{ {
krb5_error_code ret; krb5_error_code ret;
uint16_t *s; uint16_t *s = NULL;
size_t len, i; size_t len, i;
MD4_CTX m; EVP_MD_CTX *m;
m = EVP_MD_CTX_create();
if (m == NULL) {
ret = ENOMEM;
krb5_set_error_message(context, ret, "Malloc: out of memory");
goto out;
}
if (EVP_DigestInit_ex(m, EVP_md4(), NULL) != 1) {
krb5_set_error_message(context, KRB5_CRYPTO_INTERNAL,
"MD5 init failed");
ret = KRB5_CRYPTO_INTERNAL;
goto out;
}
ret = wind_utf8ucs2_length(password.data, &len); ret = wind_utf8ucs2_length(password.data, &len);
if (ret) { if (ret) {
krb5_set_error_message (context, ret, "Password not an UCS2 string"); krb5_set_error_message (context, ret, "Password not an UCS2 string");
return ret; goto out;
} }
s = malloc (len * sizeof(s[0])); s = malloc (len * sizeof(s[0]));
if (len != 0 && s == NULL) { if (len != 0 && s == NULL) {
krb5_set_error_message (context, ENOMEM, "malloc: out of memory"); krb5_set_error_message (context, ENOMEM, "malloc: out of memory");
return ENOMEM; ret = ENOMEM;
goto out;
} }
ret = wind_utf8ucs2(password.data, s, &len); ret = wind_utf8ucs2(password.data, s, &len);
@@ -592,13 +608,12 @@ ARCFOUR_string_to_key(krb5_context context,
} }
/* LE encoding */ /* LE encoding */
MD4_Init (&m);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
unsigned char p; unsigned char p;
p = (s[i] & 0xff); p = (s[i] & 0xff);
MD4_Update (&m, &p, 1); EVP_DigestUpdate (m, &p, 1);
p = (s[i] >> 8) & 0xff; p = (s[i] >> 8) & 0xff;
MD4_Update (&m, &p, 1); EVP_DigestUpdate (m, &p, 1);
} }
key->keytype = enctype; key->keytype = enctype;
@@ -607,10 +622,12 @@ ARCFOUR_string_to_key(krb5_context context,
krb5_set_error_message (context, ENOMEM, "malloc: out of memory"); krb5_set_error_message (context, ENOMEM, "malloc: out of memory");
goto out; goto out;
} }
MD4_Final (key->keyvalue.data, &m); EVP_DigestFinal_ex (m, key->keyvalue.data, NULL);
ret = 0;
out: out:
memset (s, 0, len); EVP_MD_CTX_destroy(m);
if (s)
memset (s, 0, len);
free (s); free (s);
return ret; return ret;
} }