aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-07-27 04:37:50 +0000
committerKen Raeburn <raeburn@mit.edu>2007-07-27 04:37:50 +0000
commitc00f8b975c88fb2f0e0f475f704b80de46db4fd9 (patch)
tree44597a6da19e19a071b1b8796c21842d262f20f9 /src/lib
parentbc4e82e5a193e7ea1ba478f1a4c03e5d2884c0d3 (diff)
downloadkrb5-c00f8b975c88fb2f0e0f475f704b80de46db4fd9.zip
krb5-c00f8b975c88fb2f0e0f475f704b80de46db4fd9.tar.gz
krb5-c00f8b975c88fb2f0e0f475f704b80de46db4fd9.tar.bz2
If no salt is included with the key data, set the salt length field to 0.
Bug report and patch from Nalin Dahyabhai. ticket: 5545 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19733 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/asn.1/ldap_key_seq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/krb5/asn.1/ldap_key_seq.c b/src/lib/krb5/asn.1/ldap_key_seq.c
index 1fe9a54..b910e72 100644
--- a/src/lib/krb5/asn.1/ldap_key_seq.c
+++ b/src/lib/krb5/asn.1/ldap_key_seq.c
@@ -341,7 +341,8 @@ static asn1_error_code asn1_decode_key(asn1buf *buf, krb5_key_data *key)
if (asn1buf_remains(&slt, 0) != 0) { /* Salt value is optional */
ret = decode_tagged_octetstring (&slt, 1, &keylen,
&key->key_data_contents[1]); checkerr;
- }
+ } else
+ keylen = 0;
safe_syncbuf (&subbuf, &slt);
key->key_data_length[1] = keylen; /* XXX range check?? */