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

Diff for /src/usr.bin/ssh/readconf.c between version 1.273 and 1.274

version 1.273, 2017/04/30 23:11:45 version 1.274, 2017/04/30 23:15:04
Line 167 
Line 167 
 } keywords[] = {  } keywords[] = {
         /* Deprecated options */          /* Deprecated options */
         { "protocol", oIgnore }, /* NB. silently ignored */          { "protocol", oIgnore }, /* NB. silently ignored */
           { "cipher", oDeprecated },
         { "fallbacktorsh", oDeprecated },          { "fallbacktorsh", oDeprecated },
         { "globalknownhostsfile2", oDeprecated },          { "globalknownhostsfile2", oDeprecated },
         { "rhostsauthentication", oDeprecated },          { "rhostsauthentication", oDeprecated },
Line 225 
Line 226 
         { "hostkeyalias", oHostKeyAlias },          { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },          { "proxycommand", oProxyCommand },
         { "port", oPort },          { "port", oPort },
         { "cipher", oCipher },  
         { "ciphers", oCiphers },          { "ciphers", oCiphers },
         { "macs", oMacs },          { "macs", oMacs },
         { "remoteforward", oRemoteForward },          { "remoteforward", oRemoteForward },
Line 1160 
Line 1160 
                 intptr = &options->connection_attempts;                  intptr = &options->connection_attempts;
                 goto parse_int;                  goto parse_int;
   
         case oCipher:  
                 intptr = &options->cipher;  
                 arg = strdelim(&s);  
                 if (!arg || *arg == '\0')  
                         fatal("%.200s line %d: Missing argument.", filename, linenum);  
                 value = cipher_number(arg);  
                 if (value == -1)  
                         fatal("%.200s line %d: Bad cipher '%s'.",  
                             filename, linenum, arg ? arg : "<NONE>");  
                 if (*activep && *intptr == -1)  
                         *intptr = value;  
                 break;  
   
         case oCiphers:          case oCiphers:
                 arg = strdelim(&s);                  arg = strdelim(&s);
                 if (!arg || *arg == '\0')                  if (!arg || *arg == '\0')
Line 1796 
Line 1783 
         options->connection_attempts = -1;          options->connection_attempts = -1;
         options->connection_timeout = -1;          options->connection_timeout = -1;
         options->number_of_password_prompts = -1;          options->number_of_password_prompts = -1;
         options->cipher = -1;  
         options->ciphers = NULL;          options->ciphers = NULL;
         options->macs = NULL;          options->macs = NULL;
         options->kex_algorithms = NULL;          options->kex_algorithms = NULL;
Line 1953 
Line 1939 
                 options->connection_attempts = 1;                  options->connection_attempts = 1;
         if (options->number_of_password_prompts == -1)          if (options->number_of_password_prompts == -1)
                 options->number_of_password_prompts = 3;                  options->number_of_password_prompts = 3;
         /* Selected in ssh_login(). */  
         if (options->cipher == -1)  
                 options->cipher = SSH_CIPHER_NOT_SET;  
         /* options->hostkeyalgorithms, default set in myproposals.h */          /* options->hostkeyalgorithms, default set in myproposals.h */
         if (options->add_keys_to_agent == -1)          if (options->add_keys_to_agent == -1)
                 options->add_keys_to_agent = 0;                  options->add_keys_to_agent = 0;
Line 2585 
Line 2568 
                 }                  }
                 printf("\n");                  printf("\n");
         }          }
   
         /* oCipher */  
         if (o->cipher != SSH_CIPHER_NOT_SET)  
                 printf("Cipher %s\n", cipher_name(o->cipher));  
   
         /* oControlPersist */          /* oControlPersist */
         if (o->control_persist == 0 || o->control_persist_timeout == 0)          if (o->control_persist == 0 || o->control_persist_timeout == 0)
Legend:
Removed from v.1.273  
changed lines
  Added in v.1.274