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

Return to servconf.c CVS log

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

version 1.281, 2015/08/21 23:52:30

version 1.282, 2015/10/29 08:05:01

Line 168

return o == NULL || strcasecmp(o, "none") == 0;

}

static void

assemble_algorithms(ServerOptions *o)

{

if (kex_assemble_names(KEX_SERVER_ENCRYPT, &o->ciphers) != 0 ||

kex_assemble_names(KEX_SERVER_MAC, &o->macs) != 0 ||

kex_assemble_names(KEX_SERVER_KEX, &o->kex_algorithms) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG,

&o->hostkeyalgorithms) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG,

&o->hostbased_key_types) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG, &o->pubkey_key_types) != 0)

fatal("kex_assemble_names failed");

}

void

fill_default_server_options(ServerOptions *options)

{

Line 323

Line 337

if (options->fingerprint_hash == -1)

options->fingerprint_hash = SSH_FP_HASH_DEFAULT;

if (kex_assemble_names(KEX_SERVER_ENCRYPT, &options->ciphers) != 0 ||

assemble_algorithms(options);

kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||

kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG,

&options->hostkeyalgorithms) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG,

&options->hostbased_key_types) != 0 ||

kex_assemble_names(KEX_DEFAULT_PK_ALG,

&options->pubkey_key_types) != 0)

fatal("%s: kex_assemble_names failed", __func__);

/* Turn privilege separation on by default */

if (use_privsep == -1)

Line 1966

Line 1971

/* See comment in servconf.h */

COPY_MATCH_STRING_OPTS();

/* Arguments that accept '+...' need to be expanded */

assemble_algorithms(dst);

* The only things that should be below this point are string options