allow reading encryption password from getpass(3) and stdin
Merge branch 'master' into portable