[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.114 and 1.115

version 1.114, 2020/06/01 07:11:38 version 1.115, 2020/07/05 23:59:45
Line 161 
Line 161 
         if (!(datafellows & SSH_BUG_BIGENDIANAES))          if (!(datafellows & 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 ((cipher_prop = match_filter_denylist(cipher_prop, "aes*")) == NULL)
                 fatal("match_filter_blacklist failed");                  fatal("match_filter_denylist failed");
         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 175 
Line 175 
         if (!(datafellows & SSH_BUG_RSASIGMD5))          if (!(datafellows & 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 ((pkalg_prop = match_filter_denylist(pkalg_prop, "ssh-rsa")) == NULL)
                 fatal("match_filter_blacklist failed");                  fatal("match_filter_denylist failed");
         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 190 
Line 190 
                 return p;                  return p;
         debug2("%s: original KEX proposal: %s", __func__, p);          debug2("%s: original KEX proposal: %s", __func__, p);
         if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)          if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)
                 if ((p = match_filter_blacklist(p,                  if ((p = match_filter_denylist(p,
                     "curve25519-sha256@libssh.org")) == NULL)                      "curve25519-sha256@libssh.org")) == NULL)
                         fatal("match_filter_blacklist failed");                          fatal("match_filter_denylist failed");
         if ((datafellows & SSH_OLD_DHGEX) != 0) {          if ((datafellows & SSH_OLD_DHGEX) != 0) {
                 if ((p = match_filter_blacklist(p,                  if ((p = match_filter_denylist(p,
                     "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_denylist failed");
         }          }
         debug2("%s: compat KEX proposal: %s", __func__, p);          debug2("%s: compat KEX proposal: %s", __func__, p);
         if (*p == '\0')          if (*p == '\0')
Legend:
Removed from v.1.114  
changed lines
  Added in v.1.115