generic was broken, needed to use salt->length and not strlen of salt
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  generic was broken, needed to use salt->length and not strlen of salt