[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.8 and 1.9

version 1.8, 2000/10/12 09:59:19 version 1.9, 2000/11/12 19:50:38
Line 62 
Line 62 
                 return 0;                  return 0;
   
         challenge = BN_new();          challenge = BN_new();
         key = key_new(KEY_RSA);          key = key_new(KEY_RSA1);
   
         /* Loop through identities served by the agent. */          /* Loop through identities served by the agent. */
         for (key = ssh_get_first_identity(auth, &comment, 1);          for (key = ssh_get_first_identity(auth, &comment, 1);
Line 196 
Line 196 
         int plen, clen;          int plen, clen;
   
         /* Try to load identification for the authentication key. */          /* Try to load identification for the authentication key. */
         public = key_new(KEY_RSA);          public = key_new(KEY_RSA1);
         if (!load_public_key(authfile, public, &comment)) {          if (!load_public_key(authfile, public, &comment)) {
                 key_free(public);                  key_free(public);
                 /* Could not load it.  Fail. */                  /* Could not load it.  Fail. */
Line 237 
Line 237 
   
         debug("Received RSA challenge from server.");          debug("Received RSA challenge from server.");
   
         private = key_new(KEY_RSA);          private = key_new(KEY_RSA1);
         /*          /*
          * Load the private key.  Try first with empty passphrase; if it           * Load the private key.  Try first with empty passphrase; if it
          * fails, ask for a passphrase.           * fails, ask for a passphrase.
Line 760 
Line 760 
         packet_integrity_check(payload_len,          packet_integrity_check(payload_len,
                                8 + 4 + sum_len + 0 + 4 + 0 + 0 + 4 + 4 + 4,                                 8 + 4 + sum_len + 0 + 4 + 0 + 0 + 4 + 4 + 4,
                                SSH_SMSG_PUBLIC_KEY);                                 SSH_SMSG_PUBLIC_KEY);
         k.type = KEY_RSA;          k.type = KEY_RSA1;
         k.rsa = host_key;          k.rsa = host_key;
         check_host_key(host, hostaddr, &k,          check_host_key(host, hostaddr, &k,
             options.user_hostfile, options.system_hostfile);              options.user_hostfile, options.system_hostfile);
Line 994 
Line 994 
   
                 /* Try RSA authentication for each identity. */                  /* Try RSA authentication for each identity. */
                 for (i = 0; i < options.num_identity_files; i++)                  for (i = 0; i < options.num_identity_files; i++)
                         if (try_rsa_authentication(options.identity_files[i]))                          if (options.identity_files_type[i] == KEY_RSA1 &&
                               try_rsa_authentication(options.identity_files[i]))
                                 return;                                  return;
         }          }
         /* Try skey authentication if the server supports it. */          /* Try skey authentication if the server supports it. */

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9