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

Return to ssh.c CVS log

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

Diff for /src/usr.bin/ssh/ssh.c between version 1.395 and 1.396

version 1.395, 2013/11/26 12:14:54

version 1.396, 2013/12/06 13:39:49

Line 500

else if (strcmp(optarg, "kex") == 0)

cp = kex_alg_list('\n');

else if (strcmp(optarg, "key") == 0)

cp = key_alg_list();

cp = key_alg_list(0, 0);

else if (strcmp(optarg, "key-cert") == 0)

cp = key_alg_list(1, 0);

else if (strcmp(optarg, "key-plain") == 0)

cp = key_alg_list(0, 1);

if (cp == NULL)

fatal("Unsupported query \"%s\"", optarg);

printf("%s\n", cp);

Line 957

Line 961

sensitive_data.external_keysign = 0;

if (options.rhosts_rsa_authentication ||

options.hostbased_authentication) {

sensitive_data.nkeys = 7;

sensitive_data.nkeys = 8;

sensitive_data.keys = xcalloc(sensitive_data.nkeys,

sizeof(Key));

Line 976

Line 980

_PATH_HOST_ECDSA_KEY_FILE, "", NULL, NULL);

sensitive_data.keys[6] = key_load_private_type(KEY_RSA,

_PATH_HOST_RSA_KEY_FILE, "", NULL, NULL);

sensitive_data.keys[7] = key_load_private_type(KEY_ED25519,

_PATH_HOST_ED25519_KEY_FILE, "", NULL, NULL);

PRIV_END;

if (options.hostbased_authentication == 1 &&

sensitive_data.keys[0] == NULL &&

sensitive_data.keys[4] == NULL &&

sensitive_data.keys[5] == NULL &&

sensitive_data.keys[6] == NULL) {

sensitive_data.keys[6] == NULL &&

sensitive_data.keys[7] == NULL) {

sensitive_data.keys[1] = key_load_cert(

_PATH_HOST_DSA_KEY_FILE);

sensitive_data.keys[2] = key_load_cert(

Line 995

Line 1002

_PATH_HOST_ECDSA_KEY_FILE, NULL);

sensitive_data.keys[6] = key_load_public(

_PATH_HOST_RSA_KEY_FILE, NULL);

sensitive_data.keys[7] = key_load_public(

_PATH_HOST_ED25519_KEY_FILE, NULL);

sensitive_data.external_keysign = 1;

}