tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-23 13:55:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Print an \r in front of the password prompt so parts of

Browse Source 
a password that was entered too early are likely clobbered by the prompt.
Idea from doas.

from and ok djm
"i like it" deraadt

OpenBSD-Commit-ID: 5fb97c68df6d8b09ab37f77bca1d84d799c4084e
This commit is contained in:
tb@openbsd.org 2019-01-19 04:15:56 +00:00 committed by Damien Miller
parent a6258e5dc3
commit 4ae7f80dfd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
readpass.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readpass.c,v 1.52 2018/07/18 11:34:04 dtucker Exp $ */ /* $OpenBSD: readpass.c,v 1.53 2019/01/19 04:15:56 tb Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -117,7 +117,7 @@ ssh_askpass(char *askpass, const char *msg)
char * char *
read_passphrase(const char *prompt, int flags) read_passphrase(const char *prompt, int flags)
{ {
char *askpass = NULL, *ret, buf[1024]; char cr = '\r', *askpass = NULL, *ret, buf[1024];
int rppflags, use_askpass = 0, ttyfd; int rppflags, use_askpass = 0, ttyfd;
rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF;
@ -131,9 +131,16 @@ read_passphrase(const char *prompt, int flags)
} else { } else {
rppflags |= RPP_REQUIRE_TTY; rppflags |= RPP_REQUIRE_TTY;
ttyfd = open(_PATH_TTY, O_RDWR); ttyfd = open(_PATH_TTY, O_RDWR);
if (ttyfd >= 0) if (ttyfd >= 0) {
/*
* If we're on a tty, ensure that show the prompt at
* the beginning of the line. This will hopefully
* clobber any password characters the user has
* optimistically typed before echo is disabled.
*/
(void)write(ttyfd, &cr, 1);
close(ttyfd); close(ttyfd);
else { } else {
debug("read_passphrase: can't open %s: %s", _PATH_TTY, debug("read_passphrase: can't open %s: %s", _PATH_TTY,
strerror(errno)); strerror(errno));
use_askpass = 1; use_askpass = 1;