Fix security issues and improve input validation#2

douglaz merged 2 commits intomasterdouglaz/wskdf:masterfrom

fix/security-and-validation-improvementsdouglaz/wskdf:fix/security-and-validation-improvementsCopy head branch name to clipboard