[BACK]Return to servconf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.339 and 1.340

version 1.339, 2018/07/11 18:53:29 version 1.340, 2018/08/12 20:19:13
Line 178 
Line 178 
 assemble_algorithms(ServerOptions *o)  assemble_algorithms(ServerOptions *o)
 {  {
         char *all_cipher, *all_mac, *all_kex, *all_key;          char *all_cipher, *all_mac, *all_kex, *all_key;
           int r;
   
         all_cipher = cipher_alg_list(',', 0);          all_cipher = cipher_alg_list(',', 0);
         all_mac = mac_alg_list(',');          all_mac = mac_alg_list(',');
         all_kex = kex_alg_list(',');          all_kex = kex_alg_list(',');
         all_key = sshkey_alg_list(0, 0, 1, ',');          all_key = sshkey_alg_list(0, 0, 1, ',');
         if (kex_assemble_names(&o->ciphers,  #define ASSEMBLE(what, defaults, all) \
             KEX_SERVER_ENCRYPT, all_cipher) != 0 ||          do { \
             kex_assemble_names(&o->macs,                  if ((r = kex_assemble_names(&o->what, defaults, all)) != 0) \
             KEX_SERVER_MAC, all_mac) != 0 ||                          fatal("%s: %s: %s", __func__, #what, ssh_err(r)); \
             kex_assemble_names(&o->kex_algorithms,          } while (0)
             KEX_SERVER_KEX, all_kex) != 0 ||          ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, all_cipher);
             kex_assemble_names(&o->hostkeyalgorithms,          ASSEMBLE(macs, KEX_SERVER_MAC, all_mac);
             KEX_DEFAULT_PK_ALG, all_key) != 0 ||          ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
             kex_assemble_names(&o->hostbased_key_types,          ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key);
             KEX_DEFAULT_PK_ALG, all_key) != 0 ||          ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
             kex_assemble_names(&o->pubkey_key_types,          ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key);
             KEX_DEFAULT_PK_ALG, all_key) != 0)  #undef ASSEMBLE
                 fatal("kex_assemble_names failed");  
         free(all_cipher);          free(all_cipher);
         free(all_mac);          free(all_mac);
         free(all_kex);          free(all_kex);

Legend:
Removed from v.1.339  
changed lines
  Added in v.1.340