[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.10 and 1.11

version 1.10, 2000/11/23 21:03:47 version 1.11, 2000/11/25 16:42:53
Line 833 
Line 833 
         RSA_free(public_key);          RSA_free(public_key);
         RSA_free(host_key);          RSA_free(host_key);
   
         if (options.cipher == SSH_CIPHER_ILLEGAL ||          if (options.cipher == SSH_CIPHER_NOT_SET) {
                   if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default))
                           options.cipher = ssh_cipher_default;
           } else if (options.cipher == SSH_CIPHER_ILLEGAL ||
             !(cipher_mask_ssh1(1) & (1 << options.cipher))) {              !(cipher_mask_ssh1(1) & (1 << options.cipher))) {
                 log("No valid SSH1 cipher, using %.100s instead.",                  log("No valid SSH1 cipher, using %.100s instead.",
                     cipher_name(ssh_cipher_default));                      cipher_name(ssh_cipher_default));
                 options.cipher = ssh_cipher_default;                  options.cipher = ssh_cipher_default;
         } else if (options.cipher == SSH_CIPHER_NOT_SET) {  
                 if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default))  
                         options.cipher = ssh_cipher_default;  
         }          }
         /* Check that the selected cipher is supported. */          /* Check that the selected cipher is supported. */
         if (!(supported_ciphers & (1 << options.cipher)))          if (!(supported_ciphers & (1 << options.cipher)))
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11