src/usr.bin/ssh/sshconnect1.c - diff

Return to sshconnect1.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.6, 2000/09/07 20:27:54

version 1.7, 2000/10/11 20:27:24

Line 25

#include "ssh.h"

#include "buffer.h"

#include "packet.h"

#include "cipher.h"

#include "mpaux.h"

#include "uidswap.h"

#include "readconf.h"

Line 836

Line 835

if (options.cipher == SSH_CIPHER_ILLEGAL) {

log("No valid SSH1 cipher, using %.100s instead.",

cipher_name(SSH_FALLBACK_CIPHER));

cipher_name(ssh_cipher_default));

options.cipher = SSH_FALLBACK_CIPHER;

options.cipher = ssh_cipher_default;

} else if (options.cipher == SSH_CIPHER_NOT_SET) {

if (cipher_mask1() & supported_ciphers & (1 << ssh_cipher_default))

options.cipher = ssh_cipher_default;

else {

debug("Cipher %s not supported, using %.100s instead.",

cipher_name(ssh_cipher_default),

cipher_name(SSH_FALLBACK_CIPHER));

options.cipher = SSH_FALLBACK_CIPHER;

}

/* Check that the selected cipher is supported. */

if (!(supported_ciphers & (1 << options.cipher)))