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.18 and 1.19

version 1.18, 2001/06/23 15:12:19

version 1.19, 2001/06/24 05:35:33

Line 34

#include "includes.h"

RCSID("$OpenBSD$");

#include <readpassphrase.h>

#include "xmalloc.h"

#include "cli.h"

#include "readpass.h"

#include "pathnames.h"

#include "log.h"

Line 84

Line 85

return pass;

}

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

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

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

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

* no other userland buffer is storing the password.

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

* 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 from_stdin)

read_passphrase(const char *prompt, int flags)

{

char *askpass = NULL;

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

int use_askpass = 0, ttyfd;

int rppflags, use_askpass = 0, ttyfd;

if (from_stdin) {

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

if (flags & RP_ALLOW_STDIN) {

if (!isatty(STDIN_FILENO))

use_askpass = 1;

} else {

rppflags |= RPP_REQUIRE_TTY;

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

if (ttyfd >= 0)

close(ttyfd);

Line 120

Line 118

return ssh_askpass(askpass, prompt);

}

return cli_read_passphrase(prompt, from_stdin, 0);

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

return NULL;

ret = xstrdup(buf);

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

return ret;

}