Merge "Password is only used in PBKDF2"