]> git.ipfire.org Git - thirdparty/krb5.git/commit
Simplify null salt handling in string-to-key 622/head
authorGreg Hudson <ghudson@mit.edu>
Mon, 27 Mar 2017 19:40:08 +0000 (15:40 -0400)
committerGreg Hudson <ghudson@mit.edu>
Wed, 29 Mar 2017 16:29:28 +0000 (12:29 -0400)
commitd9afa34fdc08798ccbdc6b8234122f0bdbb754d3
tree6c4a9c19ea84fa8e665aee7afccf5ac3a4f439d7
parentb0f2388874372de5e760b735f665839622286374
Simplify null salt handling in string-to-key

The per-enctype string_to_key implementations are inconsistent about
whether a null salt is treated as empty or results in a null
dereference.  Since the original DES string-to-key allowed a null
salt, substitute an empty salt in krb5_c_string_to_key_with_params().
Eliminate conditionals on accessing salt in the per-enctype
implementations as they are no longer needed.  Based on a patch by
Martin Kittel.
src/lib/crypto/krb/s2k_des.c
src/lib/crypto/krb/s2k_pbkdf2.c
src/lib/crypto/krb/string_to_key.c