[BACK]Return to readpass.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readpass.c between version 1.15 and 1.15.2.1

version 1.15, 2001/04/18 21:57:41 version 1.15.2.1, 2001/09/27 19:03:55
Line 34 
Line 34 
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
   #include <readpassphrase.h>
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "cli.h"  
 #include "readpass.h"  #include "readpass.h"
 #include "pathnames.h"  #include "pathnames.h"
 #include "log.h"  #include "log.h"
 #include "atomicio.h"  
 #include "ssh.h"  #include "ssh.h"
   
 char *  static char *
 ssh_askpass(char *askpass, char *msg)  ssh_askpass(char *askpass, const char *msg)
 {  {
         pid_t pid;          pid_t pid;
         size_t len;          size_t len;
Line 55 
Line 55 
                 error("ssh_askpass: fflush: %s", strerror(errno));                  error("ssh_askpass: fflush: %s", strerror(errno));
         if (askpass == NULL)          if (askpass == NULL)
                 fatal("internal error: askpass undefined");                  fatal("internal error: askpass undefined");
         if (pipe(p) < 0)          if (pipe(p) < 0) {
                 fatal("ssh_askpass: pipe: %s", strerror(errno));                  error("ssh_askpass: pipe: %s", strerror(errno));
         if ((pid = fork()) < 0)                  return xstrdup("");
                 fatal("ssh_askpass: fork: %s", strerror(errno));          }
           if ((pid = fork()) < 0) {
                   error("ssh_askpass: fork: %s", strerror(errno));
                   return xstrdup("");
           }
         if (pid == 0) {          if (pid == 0) {
                 seteuid(getuid());                  seteuid(getuid());
                 setuid(getuid());                  setuid(getuid());
Line 84 
Line 88 
         return pass;          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 *  char *
 read_passphrase(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))                  if (!isatty(STDIN_FILENO))
                         use_askpass = 1;                          use_askpass = 1;
         } else {          } else {
                   rppflags |= RPP_REQUIRE_TTY;
                 ttyfd = open("/dev/tty", O_RDWR);                  ttyfd = open("/dev/tty", O_RDWR);
                 if (ttyfd >= 0)                  if (ttyfd >= 0)
                         close(ttyfd);                          close(ttyfd);
Line 120 
Line 121 
                 return ssh_askpass(askpass, prompt);                  return ssh_askpass(askpass, prompt);
         }          }
   
         return cli_read_passphrase(prompt, from_stdin, 0);          if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL)
                   return xstrdup("");
   
           ret = xstrdup(buf);
           memset(buf, 'x', sizeof buf);
           return ret;
 }  }
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.15.2.1