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

Use wind_utf8ucs2_length to convert the password to utf16.

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

40
lib/krb5/crypto.c
View File

@@ -561,25 +561,39 @@ ARCFOUR_string_to_key(krb5_context context,
krb5_data opaque, krb5_data opaque,
krb5_keyblock *key) krb5_keyblock *key)
{ {
char *s, *p;
size_t len;
int i;
MD4_CTX m;
krb5_error_code ret; krb5_error_code ret;
uint16_t *s;
size_t len, i;
MD4_CTX m;
len = 2 * password.length; ret = wind_utf8ucs2_length(password.data, &len);
s = malloc (len); if (ret) {
krb5_set_error_string(context, "Password not an UCS2 string");
return ret;
}
s = malloc (len * sizeof(s[0]));
if (len != 0 && s == NULL) { if (len != 0 && s == NULL) {
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
ret = ENOMEM; return ENOMEM;
}
ret = wind_utf8ucs2(password.data, s, &len);
if (ret) {
krb5_set_error_string(context, "Password not an UCS2 string");
goto out; goto out;
} }
for (p = s, i = 0; i < password.length; ++i) {
*p++ = ((char *)password.data)[i]; /* LE encoding */
*p++ = 0;
}
MD4_Init (&m); MD4_Init (&m);
MD4_Update (&m, s, len); for (i = 0; i < len; i++) {
unsigned char p;
p = (s[0] & 0xff);
MD4_Update (&m, &p, 1);
p = (s[0] >> 8) & 0xff;
MD4_Update (&m, &p, 1);
}
key->keytype = enctype; key->keytype = enctype;
ret = krb5_data_alloc (&key->keyvalue, 16); ret = krb5_data_alloc (&key->keyvalue, 16);
if (ret) { if (ret) {
@@ -587,9 +601,9 @@ ARCFOUR_string_to_key(krb5_context context,
goto out; goto out;
} }
MD4_Final (key->keyvalue.data, &m); MD4_Final (key->keyvalue.data, &m);
memset (s, 0, len);
ret = 0; ret = 0;
out: out:
memset (s, 0, len);
free (s); free (s);
return ret; return ret;
} }