[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.385 and 1.386

version 1.385, 2022/06/03 04:30:47 version 1.386, 2022/09/17 10:34:29
Line 177 
Line 177 
         options->fingerprint_hash = -1;          options->fingerprint_hash = -1;
         options->disable_forwarding = -1;          options->disable_forwarding = -1;
         options->expose_userauth_info = -1;          options->expose_userauth_info = -1;
           options->required_rsa_size = -1;
 }  }
   
 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */  /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
Line 416 
Line 417 
                 options->expose_userauth_info = 0;                  options->expose_userauth_info = 0;
         if (options->sk_provider == NULL)          if (options->sk_provider == NULL)
                 options->sk_provider = xstrdup("internal");                  options->sk_provider = xstrdup("internal");
           if (options->required_rsa_size == -1)
                   options->required_rsa_size = SSH_RSA_MINIMUM_MODULUS_SIZE;
   
         assemble_algorithms(options);          assemble_algorithms(options);
   
Line 489 
Line 492 
         sStreamLocalBindMask, sStreamLocalBindUnlink,          sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,          sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
         sExposeAuthInfo, sRDomain, sPubkeyAuthOptions, sSecurityKeyProvider,          sExposeAuthInfo, sRDomain, sPubkeyAuthOptions, sSecurityKeyProvider,
           sRequiredRSASize,
         sDeprecated, sIgnore, sUnsupported          sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 632 
Line 636 
         { "rdomain", sRDomain, SSHCFG_ALL },          { "rdomain", sRDomain, SSHCFG_ALL },
         { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },          { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
         { "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },          { "securitykeyprovider", sSecurityKeyProvider, SSHCFG_GLOBAL },
           { "requiredrsasize", sRequiredRSASize, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 2377 
Line 2382 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
           case sRequiredRSASize:
                   intptr = &options->required_rsa_size;
                   goto parse_int;
   
         case sDeprecated:          case sDeprecated:
         case sIgnore:          case sIgnore:
         case sUnsupported:          case sUnsupported:
Line 2549 
Line 2558 
         M_CP_INTOPT(rekey_limit);          M_CP_INTOPT(rekey_limit);
         M_CP_INTOPT(rekey_interval);          M_CP_INTOPT(rekey_interval);
         M_CP_INTOPT(log_level);          M_CP_INTOPT(log_level);
           M_CP_INTOPT(required_rsa_size);
   
         /*          /*
          * The bind_mask is a mode_t that may be unsigned, so we can't use           * The bind_mask is a mode_t that may be unsigned, so we can't use
Line 2810 
Line 2820 
         dump_cfg_int(sMaxSessions, o->max_sessions);          dump_cfg_int(sMaxSessions, o->max_sessions);
         dump_cfg_int(sClientAliveInterval, o->client_alive_interval);          dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
         dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);          dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
           dump_cfg_int(sRequiredRSASize, o->required_rsa_size);
         dump_cfg_oct(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);          dump_cfg_oct(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);
   
         /* formatted integer arguments */          /* formatted integer arguments */
Legend:
Removed from v.1.385  
changed lines
  Added in v.1.386