[openssh-commits] [openssh] branch master updated: another readpassphrase() fix from OpenBSD libc

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new 6545e6a55 another readpassphrase() fix from OpenBSD libc
6545e6a55 is described below

commit 6545e6a55d4aaad0f48f2bb5c865935692ce32ea
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Fri Oct 16 17:13:41 2026 +1100

    another readpassphrase() fix from OpenBSD libc
    
    revision 1.32
    date: 2026/10/15 16:40:50;  author: millert;  state: Exp;  lines: +2 -2;  commitid: PeYLMhPn3x9iWE37;
    Don't print newline after reading password if interrupted by signal.
    Avoids an extra newline when the user presses ^C or ^\ at the
    password prompt.  OK deraadt@
---
 openbsd-compat/readpassphrase.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 4b710b421..d5fff8730 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readpassphrase.c,v 1.31 2026/10/15 05:55:06 djm Exp $	*/
+/*	$OpenBSD: readpassphrase.c,v 1.32 2026/10/15 16:40:50 millert Exp $	*/
 
 /*
  * Copyright (c) 2000-2002, 2007, 2010
@@ -162,7 +162,7 @@ restart:
 	}
 	*p = '\0';
 	save_errno = errno;
-	if (!(term.c_lflag & ECHO))
+	if (!(term.c_lflag & ECHO) && !(nr == -1 && errno == EINTR))
 		(void)write(output, "\n", 1);
 
 	/* Restore old terminal settings and signals. */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.