From 5c95c8f18aaa737e0c114edc6d7c14d19f4ff4e0 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sun, 1 Jun 1997 20:45:00 +0000 Subject: [PATCH] Fill in keytype and length. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1810 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/str2key.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/krb5/str2key.c b/lib/krb5/str2key.c index 01b89dc68..17b90c20b 100644 --- a/lib/krb5/str2key.c +++ b/lib/krb5/str2key.c @@ -115,7 +115,7 @@ krb5_string_to_key (char *str, memset (s, 0, len); strncpy (p, str, strlen(str)); p += strlen(str); - strncpy (p, salt->data, salt->length); + memcpy (p, salt->data, salt->length); odd = 1; memset (tempkey, 0, sizeof(tempkey)); for (i = 0; i < len; i += 8) { @@ -139,6 +139,8 @@ krb5_string_to_key (char *str, if (des_is_weak_key (&tempkey)) xor ((unsigned char *)&tempkey, (unsigned char*)"0x000x000x000x000x000x000x000xF0"); memcpy (key->contents.data, &tempkey, sizeof(tempkey)); + key->keytype = KEYTYPE_DES; + key->contents.length = sizeof(tempkey); return 0; }