[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.188 and 1.189

version 1.188, 2010/08/31 11:54:45 version 1.189, 2010/09/22 05:01:29
Line 129 
Line 129 
         oHashKnownHosts,          oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
           oKexAlgorithms,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 237 
Line 238 
 #else  #else
         { "zeroknowledgepasswordauthentication", oUnsupported },          { "zeroknowledgepasswordauthentication", oUnsupported },
 #endif  #endif
           { "kexalgorithms", oKexAlgorithms },
   
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
Line 695 
Line 697 
                         options->macs = xstrdup(arg);                          options->macs = xstrdup(arg);
                 break;                  break;
   
           case oKexAlgorithms:
                   arg = strdelim(&s);
                   if (!arg || *arg == '\0')
                           fatal("%.200s line %d: Missing argument.",
                               filename, linenum);
                   if (!kex_names_valid(arg))
                           fatal("%.200s line %d: Bad SSH2 KexAlgorithms '%s'.",
                               filename, linenum, arg ? arg : "<NONE>");
                   if (*activep && options->kex_algorithms == NULL)
                           options->kex_algorithms = xstrdup(arg);
                   break;
   
         case oHostKeyAlgorithms:          case oHostKeyAlgorithms:
                 arg = strdelim(&s);                  arg = strdelim(&s);
                 if (!arg || *arg == '\0')                  if (!arg || *arg == '\0')
Line 1074 
Line 1088 
         options->cipher = -1;          options->cipher = -1;
         options->ciphers = NULL;          options->ciphers = NULL;
         options->macs = NULL;          options->macs = NULL;
           options->kex_algorithms = NULL;
         options->hostkeyalgorithms = NULL;          options->hostkeyalgorithms = NULL;
         options->protocol = SSH_PROTO_UNKNOWN;          options->protocol = SSH_PROTO_UNKNOWN;
         options->num_identity_files = 0;          options->num_identity_files = 0;
Line 1187 
Line 1202 
                 options->cipher = SSH_CIPHER_NOT_SET;                  options->cipher = SSH_CIPHER_NOT_SET;
         /* options->ciphers, default set in myproposals.h */          /* options->ciphers, default set in myproposals.h */
         /* options->macs, default set in myproposals.h */          /* options->macs, default set in myproposals.h */
           /* options->kex_algorithms, default set in myproposals.h */
         /* options->hostkeyalgorithms, default set in myproposals.h */          /* options->hostkeyalgorithms, default set in myproposals.h */
         if (options->protocol == SSH_PROTO_UNKNOWN)          if (options->protocol == SSH_PROTO_UNKNOWN)
                 options->protocol = SSH_PROTO_2;                  options->protocol = SSH_PROTO_2;
Legend:
Removed from v.1.188  
changed lines
  Added in v.1.189