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

Return to servconf.c CVS log

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

Diff for /src/usr.bin/ssh/servconf.c between version 1.374 and 1.375

version 1.374, 2021/01/22 02:44:58

version 1.375, 2021/01/26 05:32:21

Line 108

options->log_verbose = NULL;

options->hostbased_authentication = -1;

options->hostbased_uses_name_from_packet_only = -1;

options->hostbased_key_types = NULL;

options->hostbased_accepted_algos = NULL;

options->hostkeyalgorithms = NULL;

options->pubkey_authentication = -1;

options->pubkey_auth_options = -1;

Line 214

ASSEMBLE(macs, def_mac, all_mac);

ASSEMBLE(kex_algorithms, def_kex, all_kex);

ASSEMBLE(hostkeyalgorithms, def_key, all_key);

ASSEMBLE(hostbased_key_types, def_key, all_key);

ASSEMBLE(hostbased_accepted_algos, def_key, all_key);

ASSEMBLE(pubkey_accepted_algos, def_key, all_key);

ASSEMBLE(ca_sign_algorithms, def_sig, all_sig);

#undef ASSEMBLE

Line 501

sGatewayPorts, sPubkeyAuthentication, sPubkeyAcceptedAlgorithms,

sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions,

sBanner, sUseDNS, sHostbasedAuthentication,

sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,

sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedAlgorithms,

sHostKeyAlgorithms, sPerSourceMaxStartups, sPerSourceNetBlockSize,

sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,

sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,

Line 548

{ "rhostsrsaauthentication", sDeprecated, SSHCFG_ALL },

{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },

{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },

{ "hostbasedacceptedkeytypes", sHostbasedAcceptedKeyTypes, SSHCFG_ALL },

{ "hostbasedacceptedkeytypes", sHostbasedAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */

{ "hostbasedacceptedalgorithms", sHostbasedAcceptedAlgorithms, SSHCFG_ALL },

{ "hostkeyalgorithms", sHostKeyAlgorithms, SSHCFG_GLOBAL },

{ "rsaauthentication", sDeprecated, SSHCFG_ALL },

{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },

Line 1442

Line 1443

intptr = &options->hostbased_uses_name_from_packet_only;

goto parse_flag;

case sHostbasedAcceptedKeyTypes:

case sHostbasedAcceptedAlgorithms:

charptr = &options->hostbased_key_types;

charptr = &options->hostbased_accepted_algos;

parse_pubkey_algos:

arg = strdelim(&cp);

if (!arg || *arg == '\0')

Line 2851

Line 2852

dump_cfg_string(sHostKeyAgent, o->host_key_agent);

dump_cfg_string(sKexAlgorithms, o->kex_algorithms);

dump_cfg_string(sCASignatureAlgorithms, o->ca_sign_algorithms);

dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);

dump_cfg_string(sHostbasedAcceptedAlgorithms, o->hostbased_accepted_algos);

dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);

dump_cfg_string(sPubkeyAcceptedAlgorithms, o->pubkey_accepted_algos);

dump_cfg_string(sRDomain, o->routing_domain);