summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2007-05-04 18:06:26 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2007-05-04 18:06:26 +0000
commit446760b8bfd900ec1218028d1f19b51afdf117bd (patch)
treef451a895ae8db43d6487a43b14a82ae23f229663
parent833ef8ff9f500f488e3130371cfbdd8449c9ea22 (diff)
downloadkrb5-446760b8bfd900ec1218028d1f19b51afdf117bd.tar.gz
krb5-446760b8bfd900ec1218028d1f19b51afdf117bd.tar.xz
krb5-446760b8bfd900ec1218028d1f19b51afdf117bd.zip
- fix an unitialized length count which caused the plugin to attempt to
read from an uninitialized pointer when reading back salted key which didn't include a non-default salt
-rw-r--r--krb5-1.6-ldap-init.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/krb5-1.6-ldap-init.patch b/krb5-1.6-ldap-init.patch
new file mode 100644
index 0000000..d627752
--- /dev/null
+++ b/krb5-1.6-ldap-init.patch
@@ -0,0 +1,14 @@
+Index: src/lib/krb5/asn.1/ldap_key_seq.c
+===================================================================
+--- src/lib/krb5/asn.1/ldap_key_seq.c (revision 19509)
++++ src/lib/krb5/asn.1/ldap_key_seq.c (working copy)
+@@ -341,7 +341,8 @@
+ 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?? */
+