am 9ce4e448: Merge "make_key: reduce raciness of password input"

* commit '9ce4e448dc69cf2d3ebdcdb56956b3f685f99182':
  make_key: reduce raciness of password input