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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.299 and 1.300

version 1.299, 2018/07/09 21:03:30 version 1.300, 2018/07/11 18:53:29
Line 42 
Line 42 
 #include "packet.h"  #include "packet.h"
 #include "uidswap.h"  #include "uidswap.h"
 #include "compat.h"  #include "compat.h"
 #include "key.h"  #include "sshkey.h"
 #include "sshconnect.h"  #include "sshconnect.h"
 #include "hostfile.h"  #include "hostfile.h"
 #include "log.h"  #include "log.h"
Line 743 
Line 743 
 {  {
         const char *reason;          const char *reason;
   
         if (key_cert_check_authority(host_key, 1, 0, host, &reason) != 0) {          if (sshkey_cert_check_authority(host_key, 1, 0, host, &reason) != 0) {
                 error("%s", reason);                  error("%s", reason);
                 return 0;                  return 0;
         }          }
Line 1456 
Line 1456 
                 logit("WARNING: %s key found for host %s\n"                  logit("WARNING: %s key found for host %s\n"
                     "in %s:%lu\n"                      "in %s:%lu\n"
                     "%s key fingerprint %s.",                      "%s key fingerprint %s.",
                     key_type(found->key),                      sshkey_type(found->key),
                     found->host, found->file, found->line,                      found->host, found->file, found->line,
                     key_type(found->key), fp);                      sshkey_type(found->key), fp);
                 if (options.visual_host_key)                  if (options.visual_host_key)
                         logit("%s", ra);                          logit("%s", ra);
                 free(ra);                  free(ra);
Line 1485 
Line 1485 
         error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!");          error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!");
         error("It is also possible that a host key has just been changed.");          error("It is also possible that a host key has just been changed.");
         error("The fingerprint for the %s key sent by the remote host is\n%s.",          error("The fingerprint for the %s key sent by the remote host is\n%s.",
             key_type(host_key), fp);              sshkey_type(host_key), fp);
         error("Please contact your system administrator.");          error("Please contact your system administrator.");
   
         free(fp);          free(fp);

Legend:
Removed from v.1.299  
changed lines
  Added in v.1.300