[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.373 and 1.374

version 1.373, 2021/01/11 04:48:22 version 1.374, 2021/01/22 02:44:58
Line 112 
Line 112 
         options->hostkeyalgorithms = NULL;          options->hostkeyalgorithms = NULL;
         options->pubkey_authentication = -1;          options->pubkey_authentication = -1;
         options->pubkey_auth_options = -1;          options->pubkey_auth_options = -1;
         options->pubkey_key_types = NULL;          options->pubkey_accepted_algos = NULL;
         options->kerberos_authentication = -1;          options->kerberos_authentication = -1;
         options->kerberos_or_local_passwd = -1;          options->kerberos_or_local_passwd = -1;
         options->kerberos_ticket_cleanup = -1;          options->kerberos_ticket_cleanup = -1;
Line 215 
Line 215 
         ASSEMBLE(kex_algorithms, def_kex, all_kex);          ASSEMBLE(kex_algorithms, def_kex, all_kex);
         ASSEMBLE(hostkeyalgorithms, def_key, all_key);          ASSEMBLE(hostkeyalgorithms, def_key, all_key);
         ASSEMBLE(hostbased_key_types, def_key, all_key);          ASSEMBLE(hostbased_key_types, def_key, all_key);
         ASSEMBLE(pubkey_key_types, def_key, all_key);          ASSEMBLE(pubkey_accepted_algos, def_key, all_key);
         ASSEMBLE(ca_sign_algorithms, def_sig, all_sig);          ASSEMBLE(ca_sign_algorithms, def_sig, all_sig);
 #undef ASSEMBLE  #undef ASSEMBLE
         free(all_cipher);          free(all_cipher);
Line 498 
Line 498 
         sPermitUserEnvironment, sAllowTcpForwarding, sCompression,          sPermitUserEnvironment, sAllowTcpForwarding, sCompression,
         sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,          sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sMacs, sPidFile,          sIgnoreUserKnownHosts, sCiphers, sMacs, sPidFile,
         sGatewayPorts, sPubkeyAuthentication, sPubkeyAcceptedKeyTypes,          sGatewayPorts, sPubkeyAuthentication, sPubkeyAcceptedAlgorithms,
         sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions,          sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions,
         sBanner, sUseDNS, sHostbasedAuthentication,          sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,          sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,
Line 552 
Line 552 
         { "hostkeyalgorithms", sHostKeyAlgorithms, SSHCFG_GLOBAL },          { "hostkeyalgorithms", sHostKeyAlgorithms, SSHCFG_GLOBAL },
         { "rsaauthentication", sDeprecated, SSHCFG_ALL },          { "rsaauthentication", sDeprecated, SSHCFG_ALL },
         { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },          { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
         { "pubkeyacceptedkeytypes", sPubkeyAcceptedKeyTypes, SSHCFG_ALL },          { "pubkeyacceptedkeytypes", sPubkeyAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */
           { "pubkeyacceptedalgorithms", sPubkeyAcceptedAlgorithms, SSHCFG_ALL },
         { "pubkeyauthoptions", sPubkeyAuthOptions, SSHCFG_ALL },          { "pubkeyauthoptions", sPubkeyAuthOptions, SSHCFG_ALL },
         { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */          { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
 #ifdef KRB5  #ifdef KRB5
Line 1443 
Line 1444 
   
         case sHostbasedAcceptedKeyTypes:          case sHostbasedAcceptedKeyTypes:
                 charptr = &options->hostbased_key_types;                  charptr = &options->hostbased_key_types;
  parse_keytypes:   parse_pubkey_algos:
                 arg = strdelim(&cp);                  arg = strdelim(&cp);
                 if (!arg || *arg == '\0')                  if (!arg || *arg == '\0')
                         fatal("%s line %d: Missing argument.",                          fatal("%s line %d: Missing argument.",
Line 1459 
Line 1460 
   
         case sHostKeyAlgorithms:          case sHostKeyAlgorithms:
                 charptr = &options->hostkeyalgorithms;                  charptr = &options->hostkeyalgorithms;
                 goto parse_keytypes;                  goto parse_pubkey_algos;
   
         case sCASignatureAlgorithms:          case sCASignatureAlgorithms:
                 charptr = &options->ca_sign_algorithms;                  charptr = &options->ca_sign_algorithms;
                 goto parse_keytypes;                  goto parse_pubkey_algos;
   
         case sPubkeyAuthentication:          case sPubkeyAuthentication:
                 intptr = &options->pubkey_authentication;                  intptr = &options->pubkey_authentication;
                 goto parse_flag;                  goto parse_flag;
   
         case sPubkeyAcceptedKeyTypes:          case sPubkeyAcceptedAlgorithms:
                 charptr = &options->pubkey_key_types;                  charptr = &options->pubkey_accepted_algos;
                 goto parse_keytypes;                  goto parse_pubkey_algos;
   
         case sPubkeyAuthOptions:          case sPubkeyAuthOptions:
                 intptr = &options->pubkey_auth_options;                  intptr = &options->pubkey_auth_options;
Line 2852 
Line 2853 
         dump_cfg_string(sCASignatureAlgorithms, o->ca_sign_algorithms);          dump_cfg_string(sCASignatureAlgorithms, o->ca_sign_algorithms);
         dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);          dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);
         dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);          dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);
         dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types);          dump_cfg_string(sPubkeyAcceptedAlgorithms, o->pubkey_accepted_algos);
         dump_cfg_string(sRDomain, o->routing_domain);          dump_cfg_string(sRDomain, o->routing_domain);
   
         /* string arguments requiring a lookup */          /* string arguments requiring a lookup */
Legend:
Removed from v.1.373  
changed lines
  Added in v.1.374