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.334 and 1.335

-version 1.334, 2018/07/03 10:59:35
+version 1.335, 2018/07/04 13:49:31
 Line 176
 Line 176
 Line 176
  static void
  assemble_algorithms(ServerOptions *o)
  {
-         if (kex_assemble_names(KEX_SERVER_ENCRYPT, &o->ciphers) != 0 ||
+         char *all_cipher, *all_mac, *all_kex, *all_key;
-             kex_assemble_names(KEX_SERVER_MAC, &o->macs) != 0 ||
-             kex_assemble_names(KEX_SERVER_KEX, &o->kex_algorithms) != 0 ||
+         all_cipher = cipher_alg_list(',', 0);
-             kex_assemble_names(KEX_DEFAULT_PK_ALG,
+         all_mac = mac_alg_list(',');
-             &o->hostkeyalgorithms) != 0 ||
+         all_kex = kex_alg_list(',');
-             kex_assemble_names(KEX_DEFAULT_PK_ALG,
+         all_key = sshkey_alg_list(0, 0, 1, ',');
-             &o->hostbased_key_types) != 0 ||
+         if (kex_assemble_names(&o->ciphers,
-             kex_assemble_names(KEX_DEFAULT_PK_ALG, &o->pubkey_key_types) != 0)
+             KEX_SERVER_ENCRYPT, all_cipher) != 0 ||
+             kex_assemble_names(&o->macs,
+             KEX_SERVER_MAC, all_mac) != 0 ||
+             kex_assemble_names(&o->kex_algorithms,
+             KEX_SERVER_KEX, all_kex) != 0 ||
+             kex_assemble_names(&o->hostkeyalgorithms,
+             KEX_DEFAULT_PK_ALG, all_key) != 0 ||
+             kex_assemble_names(&o->hostbased_key_types,
+             KEX_DEFAULT_PK_ALG, all_key) != 0 ||
+             kex_assemble_names(&o->pubkey_key_types,
+             KEX_DEFAULT_PK_ALG, all_key) != 0)
                  fatal("kex_assemble_names failed");
+         free(all_cipher);
+         free(all_mac);
+         free(all_kex);
+         free(all_key);
  }
  static void