various compile-error fixes
Merge branch 'master' of https://github.com/dfb5865/Blowfish_Project