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

Return to ssh.c CVS log

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

version 1.474, 2018/02/23 02:34:33

version 1.475, 2018/02/23 15:58:38

Line 1350

sensitive_data.keys = NULL;

sensitive_data.external_keysign = 0;

if (options.hostbased_authentication) {

sensitive_data.nkeys = 9;

sensitive_data.nkeys = 11;

sensitive_data.keys = xcalloc(sensitive_data.nkeys,

sizeof(struct sshkey)); /* XXX */

Line 1371

_PATH_HOST_RSA_KEY_FILE, "", NULL, NULL);

sensitive_data.keys[8] = key_load_private_type(KEY_DSA,

_PATH_HOST_DSA_KEY_FILE, "", NULL, NULL);

sensitive_data.keys[9] = key_load_private_cert(KEY_XMSS,

_PATH_HOST_XMSS_KEY_FILE, "", NULL);

sensitive_data.keys[10] = key_load_private_type(KEY_XMSS,

_PATH_HOST_XMSS_KEY_FILE, "", NULL, NULL);

PRIV_END;

if (options.hostbased_authentication == 1 &&

Line 1378

Line 1382

sensitive_data.keys[5] == NULL &&

sensitive_data.keys[6] == NULL &&

sensitive_data.keys[7] == NULL &&

sensitive_data.keys[8] == NULL) {

sensitive_data.keys[8] == NULL &&

sensitive_data.keys[9] == NULL) {

sensitive_data.keys[1] = key_load_cert(

_PATH_HOST_ECDSA_KEY_FILE);

sensitive_data.keys[2] = key_load_cert(

Line 1395

Line 1400

_PATH_HOST_RSA_KEY_FILE, NULL);

sensitive_data.keys[8] = key_load_public(

_PATH_HOST_DSA_KEY_FILE, NULL);

sensitive_data.keys[9] = key_load_cert(

_PATH_HOST_XMSS_KEY_FILE);

sensitive_data.keys[10] = key_load_public(

_PATH_HOST_XMSS_KEY_FILE, NULL);

sensitive_data.external_keysign = 1;

}