[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.354 and 1.355

version 1.354, 2019/11/25 00:52:46 version 1.355, 2019/12/15 18:57:30
Line 157 
Line 157 
         options->authorized_keys_command = NULL;          options->authorized_keys_command = NULL;
         options->authorized_keys_command_user = NULL;          options->authorized_keys_command_user = NULL;
         options->revoked_keys_file = NULL;          options->revoked_keys_file = NULL;
           options->sk_provider = NULL;
         options->trusted_user_ca_keys = NULL;          options->trusted_user_ca_keys = NULL;
         options->authorized_principals_file = NULL;          options->authorized_principals_file = NULL;
         options->authorized_principals_command = NULL;          options->authorized_principals_command = NULL;
Line 197 
Line 198 
         ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);          ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
         ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key);          ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key);
         ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);          ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
         ASSEMBLE(pubkey_key_types, PUBKEY_DEFAULT_PK_ALG, all_key);          ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key);
         ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig);          ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig);
 #undef ASSEMBLE  #undef ASSEMBLE
         free(all_cipher);          free(all_cipher);
Line 407 
Line 408 
                 options->disable_forwarding = 0;                  options->disable_forwarding = 0;
         if (options->expose_userauth_info == -1)          if (options->expose_userauth_info == -1)
                 options->expose_userauth_info = 0;                  options->expose_userauth_info = 0;
           if (options->sk_provider == NULL)
                   options->sk_provider = xstrdup("internal");
   
         assemble_algorithms(options);          assemble_algorithms(options);
   
Line 426 
Line 429 
         CLEAR_ON_NONE(options->banner);          CLEAR_ON_NONE(options->banner);
         CLEAR_ON_NONE(options->trusted_user_ca_keys);          CLEAR_ON_NONE(options->trusted_user_ca_keys);
         CLEAR_ON_NONE(options->revoked_keys_file);          CLEAR_ON_NONE(options->revoked_keys_file);
           CLEAR_ON_NONE(options->sk_provider);
         CLEAR_ON_NONE(options->authorized_principals_file);          CLEAR_ON_NONE(options->authorized_principals_file);
         CLEAR_ON_NONE(options->adm_forced_command);          CLEAR_ON_NONE(options->adm_forced_command);
         CLEAR_ON_NONE(options->chroot_directory);          CLEAR_ON_NONE(options->chroot_directory);
Line 478 
Line 482 
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,          sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,          sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,          sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
         sExposeAuthInfo, sRDomain, sPubkeyAuthOptions,          sExposeAuthInfo, sRDomain, sPubkeyAuthOptions, sSecurityKeyProvider,
         sDeprecated, sIgnore, sUnsupported          sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 612 
Line 616 
         { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },          { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
         { "rdomain", sRDomain, SSHCFG_ALL },          { "rdomain", sRDomain, SSHCFG_ALL },
         { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },          { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
           { "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 1962 
Line 1967 
                 charptr = &options->revoked_keys_file;                  charptr = &options->revoked_keys_file;
                 goto parse_filename;                  goto parse_filename;
   
           case sSecurityKeyProvider:
                   charptr = &options->sk_provider;
                   goto parse_filename;
   
         case sIPQoS:          case sIPQoS:
                 arg = strdelim(&cp);                  arg = strdelim(&cp);
                 if ((value = parse_ipqos(arg)) == -1)                  if ((value = parse_ipqos(arg)) == -1)
Line 2576 
Line 2585 
         dump_cfg_string(sChrootDirectory, o->chroot_directory);          dump_cfg_string(sChrootDirectory, o->chroot_directory);
         dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);          dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);
         dump_cfg_string(sRevokedKeys, o->revoked_keys_file);          dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
           dump_cfg_string(sSecurityKeyProvider, o->sk_provider);
         dump_cfg_string(sAuthorizedPrincipalsFile,          dump_cfg_string(sAuthorizedPrincipalsFile,
             o->authorized_principals_file);              o->authorized_principals_file);
         dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'          dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'
Line 2594 
Line 2604 
         dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ?          dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ?
             o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);              o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
         dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?          dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?
             o->pubkey_key_types : PUBKEY_DEFAULT_PK_ALG);              o->pubkey_key_types : KEX_DEFAULT_PK_ALG);
         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.354  
changed lines
  Added in v.1.355