[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.336 and 1.337

version 1.336, 2020/10/07 02:20:35 version 1.337, 2020/10/07 02:22:23
Line 656 
Line 656 
 /*  /*
  * check whether the supplied host key is valid, return -1 if the key   * check whether the supplied host key is valid, return -1 if the key
  * is not valid. user_hostfile[0] will not be updated if 'readonly' is true.   * is not valid. user_hostfile[0] will not be updated if 'readonly' is true.
  *  
  * If cert_fallbackp is not NULL then will attempt to convert certificate host  
  * keys to plain keys if no certificate match was found and will return  
  * non-zero via *cert_fallbackp if this fall-back was used.  
  */   */
 #define RDRW    0  #define RDRW    0
 #define RDONLY  1  #define RDONLY  1
Line 668 
Line 664 
 check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,  check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
     struct sshkey *host_key, int readonly,      struct sshkey *host_key, int readonly,
     char **user_hostfiles, u_int num_user_hostfiles,      char **user_hostfiles, u_int num_user_hostfiles,
     char **system_hostfiles, u_int num_system_hostfiles, int *cert_fallbackp)      char **system_hostfiles, u_int num_system_hostfiles)
 {  {
         HostStatus host_status;          HostStatus host_status;
         HostStatus ip_status;          HostStatus ip_status;
Line 679 
Line 675 
         const char *type;          const char *type;
         const struct hostkey_entry *host_found, *ip_found;          const struct hostkey_entry *host_found, *ip_found;
         int len, cancelled_forwarding = 0, confirmed;          int len, cancelled_forwarding = 0, confirmed;
         int local = sockaddr_is_local(hostaddr), cert_fallback = 0;          int local = sockaddr_is_local(hostaddr);
         int r, want_cert = sshkey_is_cert(host_key), host_ip_differ = 0;          int r, want_cert = sshkey_is_cert(host_key), host_ip_differ = 0;
         int hostkey_trusted = 0; /* Known or explicitly accepted by user */          int hostkey_trusted = 0; /* Known or explicitly accepted by user */
         struct hostkeys *host_hostkeys, *ip_hostkeys;          struct hostkeys *host_hostkeys, *ip_hostkeys;
         u_int i;          u_int i;
   
         if (cert_fallbackp != NULL)  
                 *cert_fallbackp = 0;  
   
         /*          /*
          * Force accepting of the host key for loopback/localhost. The           * Force accepting of the host key for loopback/localhost. The
          * problem is that if the home directory is NFS-mounted to multiple           * problem is that if the home directory is NFS-mounted to multiple
Line 803 
Line 796 
                 if (options.host_key_alias == NULL && port != 0 &&                  if (options.host_key_alias == NULL && port != 0 &&
                     port != SSH_DEFAULT_PORT) {                      port != SSH_DEFAULT_PORT) {
                         debug("checking without port identifier");                          debug("checking without port identifier");
                         /*  
                          * NB. do not perform cert->key fallback in this  
                          * recursive call. Fallback will only be performed in  
                          * the top-level call.  
                          */  
                         if (check_host_key(hostname, hostaddr, 0, host_key,                          if (check_host_key(hostname, hostaddr, 0, host_key,
                             ROQUIET, user_hostfiles, num_user_hostfiles,                              ROQUIET, user_hostfiles, num_user_hostfiles,
                             system_hostfiles, num_system_hostfiles,                              system_hostfiles, num_system_hostfiles) == 0) {
                             NULL) == 0) {  
                                 debug("found matching key w/out port");                                  debug("found matching key w/out port");
                                 break;                                  break;
                         }                          }
Line 1088 
Line 1075 
                 free_hostkeys(host_hostkeys);                  free_hostkeys(host_hostkeys);
         if (ip_hostkeys != NULL)          if (ip_hostkeys != NULL)
                 free_hostkeys(ip_hostkeys);                  free_hostkeys(ip_hostkeys);
         if (cert_fallbackp != NULL)  
                 *cert_fallbackp = cert_fallback;  
         return 0;          return 0;
   
 fail:  fail:
         if (cert_fallbackp != NULL && want_cert &&          if (want_cert && host_status != HOST_REVOKED) {
             host_status != HOST_REVOKED) {  
                 /*                  /*
                  * No matching certificate. Downgrade cert to raw key and                   * No matching certificate. Downgrade cert to raw key and
                  * search normally.                   * search normally.
Line 1106 
Line 1090 
                 if ((r = sshkey_drop_cert(raw_key)) != 0)                  if ((r = sshkey_drop_cert(raw_key)) != 0)
                         fatal("Couldn't drop certificate: %s", ssh_err(r));                          fatal("Couldn't drop certificate: %s", ssh_err(r));
                 host_key = raw_key;                  host_key = raw_key;
                 cert_fallback = 1;  
                 goto retry;                  goto retry;
         }          }
         sshkey_free(raw_key);          sshkey_free(raw_key);
Line 1119 
Line 1102 
         return -1;          return -1;
 }  }
   
 /*  /* returns 0 if key verifies or -1 if key does NOT verify */
  * returns 0 if key verifies or -1 if key does NOT verify.  
  *  
  * If the host key was a certificate that was downgraded to a plain key in  
  * the process of matching, then cert_fallbackp will be non-zero.  
  */  
 int  int
 verify_host_key(char *host, struct sockaddr *hostaddr, struct sshkey *host_key,  verify_host_key(char *host, struct sockaddr *hostaddr, struct sshkey *host_key)
     int *cert_fallbackp)  
 {  {
         u_int i;          u_int i;
         int r = -1, flags = 0, cert_fallback = 0;          int r = -1, flags = 0;
         char valid[64], *fp = NULL, *cafp = NULL;          char valid[64], *fp = NULL, *cafp = NULL;
         struct sshkey *plain = NULL;          struct sshkey *plain = NULL;
   
         if (cert_fallbackp != NULL)  
                 *cert_fallbackp = 0;  
   
         if ((fp = sshkey_fingerprint(host_key,          if ((fp = sshkey_fingerprint(host_key,
             options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) {              options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) {
                 error("%s: fingerprint host key: %s", __func__, ssh_err(r));                  error("%s: fingerprint host key: %s", __func__, ssh_err(r));
Line 1227 
Line 1201 
         }          }
         r = check_host_key(host, hostaddr, options.port, host_key, RDRW,          r = check_host_key(host, hostaddr, options.port, host_key, RDRW,
             options.user_hostfiles, options.num_user_hostfiles,              options.user_hostfiles, options.num_user_hostfiles,
             options.system_hostfiles, options.num_system_hostfiles,              options.system_hostfiles, options.num_system_hostfiles);
             &cert_fallback);  
   
 out:  out:
         sshkey_free(plain);          sshkey_free(plain);
         free(fp);          free(fp);
         free(cafp);          free(cafp);
         if (r == 0) {          if (r == 0 && host_key != NULL) {
                 if (host_key != NULL) {                  sshkey_free(previous_host_key);
                         sshkey_free(previous_host_key);                  r = sshkey_from_private(host_key, &previous_host_key);
                         r = sshkey_from_private(host_key, &previous_host_key);  
                 }  
                 if (r == 0 && cert_fallbackp != NULL)  
                         *cert_fallbackp = cert_fallback;  
         }          }
   
         return r;          return r;
Legend:
Removed from v.1.336  
changed lines
  Added in v.1.337