Merge "make_key: reduce raciness of password input"