Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) From: tlyu@mit.edu Subject: git commit RT-Send-CC: X-RT-Original-Encoding: iso-8859-1 Content-Length: 1257 Always include salt in LDAP KrbKey encoding In the LDAP KDB module, ensure that every krb5_key_data we pass to asn1_encode_sequence_of_keys includes a salt type, for compatibility with the decoder in unpatched krb5 1.11 and 1.12. This is not a behavior change by itself; since 1.7 the encoder has always included a KrbKey salt field because it erroneously treats that field as non-optional. (Luckily, the encoded salt always happens to have salt type 0 because krb5_key_data constructors start with zeroed memory.) The next commit will fix the encoder and decoder to properly treat the KrbKey salt field as optional, so we need this change to ensure that our encodings remain compatible. Also fix the ASN.1 tests to set key_data_ver correctly for the sample test key data. (cherry picked from commit 1825455ede7e61ab934b16262fb5b12b78a52f1a) https://github.com/krb5/krb5/commit/5557d29762226e0d1be1f41a76c3994401e5103c Author: Greg Hudson Committer: Tom Yu Commit: 5557d29762226e0d1be1f41a76c3994401e5103c Branch: krb5-1.12 src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c | 21 +++++++++++++++++++- src/tests/asn.1/ktest.c | 1 + 2 files changed, 21 insertions(+), 1 deletions(-)