aboutsummaryrefslogtreecommitdiff
path: root/lib/krb5/salt-des.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/krb5/salt-des.c')
-rw-r--r--lib/krb5/salt-des.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/krb5/salt-des.c b/lib/krb5/salt-des.c
index d898d6c20574..474ba5d591d6 100644
--- a/lib/krb5/salt-des.c
+++ b/lib/krb5/salt-des.c
@@ -194,7 +194,8 @@ krb5_DES_string_to_key(krb5_context context,
if (len > 0 && s == NULL)
return krb5_enomem(context);
memcpy(s, password.data, password.length);
- memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length);
+ if (salt.saltvalue.length)
+ memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length);
DES_string_to_key_int(s, len, &tmp);
key->keytype = enctype;
krb5_data_copy(&key->keyvalue, tmp, sizeof(tmp));