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

add _krb5_AES_string_to_default_iterator

Browse Source 
add krb5_string_to_key_salt_opaque()
fix keylengh for keytype_aes256


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12373 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-06-17 04:20:18 +00:00
parent 04ed8c312b
commit 4644344231
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/krb5/crypto.c
View File

@@ -619,6 +619,8 @@ _krb5_PKCS5_PBKDF2(krb5_context context, krb5_cksumtype cktype,
return 0;
}
int _krb5_AES_string_to_default_iterator = 45056;
static krb5_error_code
AES_string_to_key(krb5_context context,
krb5_enctype enctype,
@@ -633,7 +635,7 @@ AES_string_to_key(krb5_context context,
struct key_data kd;
if (opaque.length == 0)
iter = 45056 - 1;
iter = _krb5_AES_string_to_default_iterator - 1;
else if (opaque.length == 4) {
unsigned long v;
_krb5_get_int(opaque.data, &v, 4);
@@ -747,7 +749,7 @@ struct key_type keytype_aes256 = {
KEYTYPE_AES256,
"aes-256",
256,
16,
32,
sizeof(AES_KEY) * 2,
NULL,
AES_schedule,
@@ -1027,6 +1029,21 @@ krb5_string_to_key_salt (krb5_context context,
return krb5_string_to_key_data_salt(context, enctype, pw, salt, key);
}
krb5_error_code
krb5_string_to_key_salt_opaque (krb5_context context,
krb5_enctype enctype,
const char *password,
krb5_salt salt,
krb5_data opaque,
krb5_keyblock *key)
{
krb5_data pw;
pw.data = (void*)password;
pw.length = strlen(password);
return krb5_string_to_key_data_salt_opaque(context, enctype,
pw, salt, opaque, key);
}
krb5_error_code
krb5_keytype_to_string(krb5_context context,
krb5_keytype keytype,