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

Diff for /src/usr.bin/ssh/clientloop.c between version 1.274 and 1.275

version 1.274, 2015/07/01 02:26:31 version 1.275, 2015/07/10 06:21:53
Line 92 
Line 92 
 #include "key.h"  #include "key.h"
 #include "cipher.h"  #include "cipher.h"
 #include "kex.h"  #include "kex.h"
   #include "myproposal.h"
 #include "log.h"  #include "log.h"
 #include "misc.h"  #include "misc.h"
 #include "readconf.h"  #include "readconf.h"
Line 2344 
Line 2345 
                 debug3("%s: received %s key %s", __func__,                  debug3("%s: received %s key %s", __func__,
                     sshkey_type(key), fp);                      sshkey_type(key), fp);
                 free(fp);                  free(fp);
   
                 /* Check that the key is accepted in HostkeyAlgorithms */                  /* Check that the key is accepted in HostkeyAlgorithms */
                 if (options.hostkeyalgorithms != NULL &&                  if (match_pattern_list(sshkey_ssh_name(key),
                     match_pattern_list(sshkey_ssh_name(key),                      options.hostkeyalgorithms ? options.hostkeyalgorithms :
                     options.hostkeyalgorithms, 0) != 1) {                      KEX_DEFAULT_PK_ALG, 0) != 1) {
                         debug3("%s: %s key not permitted by HostkeyAlgorithms",                          debug3("%s: %s key not permitted by HostkeyAlgorithms",
                             __func__, sshkey_ssh_name(key));                              __func__, sshkey_ssh_name(key));
                         continue;                          continue;

Legend:
Removed from v.1.274  
changed lines
  Added in v.1.275