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

- djm@cvs.openbsd.org 2001/12/21 08:53:45

Browse Source 
[readpass.c]
     Avoid interruptable passphrase read; ok markus@
This commit is contained in:
Damien Miller 2002-01-22 23:05:31 +11:00
parent a41c8b15bd
commit f451e22e21
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -13,6 +13,9 @@
- djm@cvs.openbsd.org 2001/12/21 08:52:22 - djm@cvs.openbsd.org 2001/12/21 08:52:22
[ssh-keygen.1 ssh-keygen.c] [ssh-keygen.1 ssh-keygen.c]
Remove default (rsa1) key type; ok markus@ Remove default (rsa1) key type; ok markus@
- djm@cvs.openbsd.org 2001/12/21 08:53:45
[readpass.c]
Avoid interruptable passphrase read; ok markus@
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7160,4 +7163,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1725 2002/01/22 12:05:08 djm Exp $ $Id: ChangeLog,v 1.1726 2002/01/22 12:05:31 djm Exp $

21
readpass.c
View File

@ -32,7 +32,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readpass.c,v 1.23 2001/11/08 10:51:08 markus Exp $"); RCSID("$OpenBSD: readpass.c,v 1.24 2001/12/21 08:53:45 djm Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "readpass.h" #include "readpass.h"
@ -46,7 +46,7 @@ ssh_askpass(char *askpass, const char *msg)
pid_t pid; pid_t pid;
size_t len; size_t len;
char *pass; char *pass;
int p[2], status; int p[2], status, ret;
char buf[1024]; char buf[1024];
if (fflush(stdout) != 0) if (fflush(stdout) != 0)
@ -71,14 +71,23 @@ ssh_askpass(char *askpass, const char *msg)
fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno)); fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
} }
close(p[1]); close(p[1]);
len = read(p[0], buf, sizeof buf -1);
len = ret = 0;
do {
ret = read(p[0], buf + len, sizeof(buf) - 1 - len);
if (ret == -1 && errno == EINTR)
continue;
if (ret <= 0)
break;
len += ret;
} while (sizeof(buf) - 1 - len > 0);
buf[len] = '\0';
close(p[0]); close(p[0]);
while (waitpid(pid, &status, 0) < 0) while (waitpid(pid, &status, 0) < 0)
if (errno != EINTR) if (errno != EINTR)
break; break;
if (len <= 1)
return xstrdup("");
buf[len] = '\0';
buf[strcspn(buf, "\r\n")] = '\0'; buf[strcspn(buf, "\r\n")] = '\0';
pass = xstrdup(buf); pass = xstrdup(buf);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));