From 069759da9f27f4cb8d1f7c52f2412a2b8f47778a Mon Sep 17 00:00:00 2001
From: tim <tim@openbsd.org>
Date: Fri, 9 Oct 2015 20:14:35 +0000
Subject: [PATCH] Replace readpass(3) with readpassphrase(3). This was the only
 use of readpass(3) in base...

OK millert@
---
 usr.bin/skey/skey.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c
index a019f15c634..313fcb91d39 100644
--- a/usr.bin/skey/skey.c
+++ b/usr.bin/skey/skey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skey.c,v 1.28 2015/04/18 18:28:38 deraadt Exp $	*/
+/*	$OpenBSD: skey.c,v 1.29 2015/10/09 20:14:35 tim Exp $	*/
 /*
  * OpenBSD S/Key (skey.c)
  *
@@ -22,12 +22,13 @@
  *
  */
 
+#include <err.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
 #include <unistd.h>
-#include <limits.h>
+#include <readpassphrase.h>
 #include <skey.h>
 
 void    usage(char *);
@@ -118,9 +119,8 @@ main(int argc, char *argv[])
 	if (!pass) {
 		fputs("Reminder - Do not use this program while"
 		    " logged in via telnet.\n", stderr);
-		(void)fputs("Enter secret passphrase: ", stderr);
-		readpass(passwd, sizeof(passwd));
-		if (passwd[0] == '\0')
+		if (readpassphrase("Enter secret passphrase: ", passwd,
+		    sizeof(passwd), 0) == NULL || passwd[0] == '\0')
 			exit(1);
 	}
 
-- 
2.20.1