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

Diff for /src/usr.bin/ssh/Attic/sshconnect1.c between version 1.61.2.1 and 1.61.2.2

version 1.61.2.1, 2006/02/03 03:01:58 version 1.61.2.2, 2006/10/06 03:19:33
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
Line 12 
Line 13 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  */   */
   
 #include "includes.h"  #include <sys/types.h>
 RCSID("$OpenBSD$");  #include <sys/socket.h>
   
 #include <openssl/bn.h>  #include <openssl/bn.h>
 #include <openssl/md5.h>  #include <openssl/md5.h>
   
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
   #include <signal.h>
   #include <pwd.h>
   
   #include "xmalloc.h"
 #include "ssh.h"  #include "ssh.h"
 #include "ssh1.h"  #include "ssh1.h"
 #include "xmalloc.h"  
 #include "rsa.h"  #include "rsa.h"
 #include "buffer.h"  #include "buffer.h"
 #include "packet.h"  #include "packet.h"
   #include "key.h"
   #include "cipher.h"
 #include "kex.h"  #include "kex.h"
 #include "uidswap.h"  #include "uidswap.h"
 #include "log.h"  #include "log.h"
 #include "readconf.h"  #include "readconf.h"
 #include "key.h"  
 #include "authfd.h"  #include "authfd.h"
 #include "sshconnect.h"  #include "sshconnect.h"
 #include "authfile.h"  #include "authfile.h"
 #include "misc.h"  #include "misc.h"
 #include "cipher.h"  
 #include "canohost.h"  #include "canohost.h"
   #include "hostfile.h"
 #include "auth.h"  #include "auth.h"
   
 /* Session id for the current session. */  /* Session id for the current session. */
Line 197 
Line 205 
         BIGNUM *challenge;          BIGNUM *challenge;
         Key *public, *private;          Key *public, *private;
         char buf[300], *passphrase, *comment, *authfile;          char buf[300], *passphrase, *comment, *authfile;
         int i, type, quit;          int i, perm_ok = 1, type, quit;
   
         public = options.identity_keys[idx];          public = options.identity_keys[idx];
         authfile = options.identity_files[idx];          authfile = options.identity_files[idx];
Line 243 
Line 251 
         if (public->flags & KEY_FLAG_EXT)          if (public->flags & KEY_FLAG_EXT)
                 private = public;                  private = public;
         else          else
                 private = key_load_private_type(KEY_RSA1, authfile, "", NULL);                  private = key_load_private_type(KEY_RSA1, authfile, "", NULL,
         if (private == NULL && !options.batch_mode) {                      &perm_ok);
           if (private == NULL && !options.batch_mode && perm_ok) {
                 snprintf(buf, sizeof(buf),                  snprintf(buf, sizeof(buf),
                     "Enter passphrase for RSA key '%.100s': ", comment);                      "Enter passphrase for RSA key '%.100s': ", comment);
                 for (i = 0; i < options.number_of_password_prompts; i++) {                  for (i = 0; i < options.number_of_password_prompts; i++) {
                         passphrase = read_passphrase(buf, 0);                          passphrase = read_passphrase(buf, 0);
                         if (strcmp(passphrase, "") != 0) {                          if (strcmp(passphrase, "") != 0) {
                                 private = key_load_private_type(KEY_RSA1,                                  private = key_load_private_type(KEY_RSA1,
                                     authfile, passphrase, NULL);                                      authfile, passphrase, NULL, NULL);
                                 quit = 0;                                  quit = 0;
                         } else {                          } else {
                                 debug2("no passphrase given, try next key");                                  debug2("no passphrase given, try next key");
Line 268 
Line 277 
         xfree(comment);          xfree(comment);
   
         if (private == NULL) {          if (private == NULL) {
                 if (!options.batch_mode)                  if (!options.batch_mode && perm_ok)
                         error("Bad passphrase.");                          error("Bad passphrase.");
   
                 /* Send a dummy response packet to avoid protocol error. */                  /* Send a dummy response packet to avoid protocol error. */
Legend:
Removed from v.1.61.2.1  
changed lines
  Added in v.1.61.2.2