A proper fix to the incapacity to deal with passlen=24 AND saltlen=16.
Previous commit can handle it, but since it hurts performance a litte, this is a best solution.