I have updated the code to use the standard storage format and switched to a better salt generator.