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

Diff for /src/usr.bin/ssh/compat.c between version 1.111 and 1.112

version 1.111, 2018/07/09 21:03:30 version 1.112, 2018/07/31 03:07:24
Line 182 
Line 182 
 }  }
   
 char *  char *
 compat_cipher_proposal(char *cipher_prop)  compat_cipher_proposal(char *cipher_prop, u_int compat)
 {  {
         if (!(datafellows & SSH_BUG_BIGENDIANAES))          char *cp;
   
           if (!(compat & SSH_BUG_BIGENDIANAES))
                 return cipher_prop;                  return cipher_prop;
         debug2("%s: original cipher proposal: %s", __func__, cipher_prop);          debug2("%s: original cipher proposal: %s", __func__, cipher_prop);
         if ((cipher_prop = match_filter_blacklist(cipher_prop, "aes*")) == NULL)          if ((cp = match_filter_blacklist(cipher_prop, "aes*")) == NULL)
                 fatal("match_filter_blacklist failed");                  fatal("match_filter_blacklist failed");
           free(cipher_prop);
           cipher_prop = cp;
         debug2("%s: compat cipher proposal: %s", __func__, cipher_prop);          debug2("%s: compat cipher proposal: %s", __func__, cipher_prop);
         if (*cipher_prop == '\0')          if (*cipher_prop == '\0')
                 fatal("No supported ciphers found");                  fatal("No supported ciphers found");
Line 196 
Line 200 
 }  }
   
 char *  char *
 compat_pkalg_proposal(char *pkalg_prop)  compat_pkalg_proposal(char *pkalg_prop, u_int compat)
 {  {
         if (!(datafellows & SSH_BUG_RSASIGMD5))          char *cp;
   
           if (!(compat & SSH_BUG_RSASIGMD5))
                 return pkalg_prop;                  return pkalg_prop;
         debug2("%s: original public key proposal: %s", __func__, pkalg_prop);          debug2("%s: original public key proposal: %s", __func__, pkalg_prop);
         if ((pkalg_prop = match_filter_blacklist(pkalg_prop, "ssh-rsa")) == NULL)          if ((cp = match_filter_blacklist(pkalg_prop, "ssh-rsa")) == NULL)
                 fatal("match_filter_blacklist failed");                  fatal("match_filter_blacklist failed");
           free(pkalg_prop);
           pkalg_prop = cp;
         debug2("%s: compat public key proposal: %s", __func__, pkalg_prop);          debug2("%s: compat public key proposal: %s", __func__, pkalg_prop);
         if (*pkalg_prop == '\0')          if (*pkalg_prop == '\0')
                 fatal("No supported PK algorithms found");                  fatal("No supported PK algorithms found");
Line 210 
Line 218 
 }  }
   
 char *  char *
 compat_kex_proposal(char *p)  compat_kex_proposal(char *kex_prop, u_int compat)
 {  {
         if ((datafellows & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0)          char *cp;
                 return p;  
         debug2("%s: original KEX proposal: %s", __func__, p);          if ((compat & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0)
         if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)                  return kex_prop;
                 if ((p = match_filter_blacklist(p,          debug2("%s: original KEX proposal: %s", __func__, kex_prop);
           if ((compat & SSH_BUG_CURVE25519PAD) != 0) {
                   if ((cp = match_filter_blacklist(kex_prop,
                     "curve25519-sha256@libssh.org")) == NULL)                      "curve25519-sha256@libssh.org")) == NULL)
                         fatal("match_filter_blacklist failed");                          fatal("match_filter_blacklist failed");
         if ((datafellows & SSH_OLD_DHGEX) != 0) {                  free(kex_prop);
                 if ((p = match_filter_blacklist(p,                  kex_prop = cp;
           }
           if ((compat & SSH_OLD_DHGEX) != 0) {
                   if ((cp = match_filter_blacklist(kex_prop,
                     "diffie-hellman-group-exchange-sha256,"                      "diffie-hellman-group-exchange-sha256,"
                     "diffie-hellman-group-exchange-sha1")) == NULL)                      "diffie-hellman-group-exchange-sha1")) == NULL)
                         fatal("match_filter_blacklist failed");                          fatal("match_filter_blacklist failed");
                   free(kex_prop);
                   kex_prop = cp;
         }          }
         debug2("%s: compat KEX proposal: %s", __func__, p);          debug2("%s: compat KEX proposal: %s", __func__, kex_prop);
         if (*p == '\0')          if (*kex_prop == '\0')
                 fatal("No supported key exchange algorithms found");                  fatal("No supported key exchange algorithms found");
         return p;          return kex_prop;
 }  }
   
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.112