src/usr.bin/ssh/readpass.c - diff

Return to readpass.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readpass.c between version 1.15.2.4 and 1.16

version 1.15.2.4, 2002/06/02 22:56:10

version 1.16, 2001/05/02 01:25:39

Line 1

* Redistribution and use in source and binary forms, with or without

* modification, are permitted provided that the following conditions

Line 9

Line 10

* 2. Redistributions in binary form must reproduce the above copyright

* notice, this list of conditions and the following disclaimer in the

* documentation and/or other materials provided with the distribution.

* 3. All advertising materials mentioning features or use of this software

* must display the following acknowledgement:

* This product includes software developed by the University of

* California, Berkeley and its contributors.

* 4. Neither the name of the University nor the names of its contributors

* may be used to endorse or promote products derived from this software

* without specific prior written permission.

* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

* SUCH DAMAGE.

#include "includes.h"

RCSID("$OpenBSD$");

#include <readpassphrase.h>

#include "xmalloc.h"

#include "cli.h"

#include "readpass.h"

#include "pathnames.h"

#include "log.h"

#include "atomicio.h"

#include "ssh.h"

static char *

char *

ssh_askpass(char *askpass, const char *msg)

{

pid_t pid;

size_t len;

char *pass;

char *nl, *pass;

int p[2], status, ret;

int p[2], status;

char buf[1024];

if (fflush(stdout) != 0)

error("ssh_askpass: fflush: %s", strerror(errno));

if (askpass == NULL)

fatal("internal error: askpass undefined");

if (pipe(p) < 0) {

if (pipe(p) < 0)

error("ssh_askpass: pipe: %s", strerror(errno));

fatal("ssh_askpass: pipe: %s", strerror(errno));

return xstrdup("");

if ((pid = fork()) < 0)

}

fatal("ssh_askpass: fork: %s", strerror(errno));

if ((pid = fork()) < 0) {

error("ssh_askpass: fork: %s", strerror(errno));

return xstrdup("");

}

if (pid == 0) {

seteuid(getuid());

setuid(getuid());

Line 64

Line 69

fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));

}

close(p[1]);

len = read(p[0], buf, sizeof buf);

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]);

while (waitpid(pid, &status, 0) < 0)

if (errno != EINTR)

break;

if (len <= 1)

buf[strcspn(buf, "\r\n")] = '\0';

return xstrdup("");

nl = strchr(buf, '\n');

if (nl)

*nl = '\0';

pass = xstrdup(buf);

memset(buf, 0, sizeof(buf));

return pass;

}

* Reads a passphrase from /dev/tty with echo turned off/on. Returns the

* Reads a passphrase from /dev/tty with echo turned off. Returns the

* passphrase (allocated with xmalloc). Exits if EOF is encountered. If

* passphrase (allocated with xmalloc), being very careful to ensure that

* RP_ALLOW_STDIN is set, the passphrase will be read from stdin if no

* no other userland buffer is storing the password.

* tty is available

* Note: the funcationallity of this routing has been moved to

* cli_read_passphrase(). This routing remains to maintain

* compatibility with existing code.

char *

read_passphrase(const char *prompt, int flags)

read_passphrase(char *prompt, int from_stdin)

{

char *askpass = NULL, *ret, buf[1024];

char *askpass = NULL;

int rppflags, use_askpass = 0, ttyfd;

int use_askpass = 0, ttyfd;

rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF;

if (from_stdin) {

if (flags & RP_ALLOW_STDIN) {

if (!isatty(STDIN_FILENO))

use_askpass = 1;

} else {

rppflags |= RPP_REQUIRE_TTY;

ttyfd = open("/dev/tty", O_RDWR);

ttyfd = open(_PATH_TTY, O_RDWR);

if (ttyfd >= 0)

close(ttyfd);

else

Line 120

return ssh_askpass(askpass, prompt);

}

if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL) {

return cli_read_passphrase(prompt, from_stdin, 0);

if (flags & RP_ALLOW_EOF)

return NULL;

return xstrdup("");

}

ret = xstrdup(buf);

memset(buf, 'x', sizeof buf);

return ret;

}