src/usr.bin/ssh/compat.c - diff

Return to compat.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/compat.c between version 1.115 and 1.116

version 1.115, 2020/07/05 23:59:45

version 1.116, 2020/10/18 11:32:01

Line 160

{

if (!(datafellows & SSH_BUG_BIGENDIANAES))

return cipher_prop;

debug2("%s: original cipher proposal: %s", __func__, cipher_prop);

debug2_f("original cipher proposal: %s", cipher_prop);

if ((cipher_prop = match_filter_denylist(cipher_prop, "aes*")) == NULL)

fatal("match_filter_denylist failed");

debug2("%s: compat cipher proposal: %s", __func__, cipher_prop);

debug2_f("compat cipher proposal: %s", cipher_prop);

if (*cipher_prop == '\0')

fatal("No supported ciphers found");

return cipher_prop;

Line 174

{

if (!(datafellows & SSH_BUG_RSASIGMD5))

return pkalg_prop;

debug2("%s: original public key proposal: %s", __func__, pkalg_prop);

debug2_f("original public key proposal: %s", pkalg_prop);

if ((pkalg_prop = match_filter_denylist(pkalg_prop, "ssh-rsa")) == NULL)

fatal("match_filter_denylist failed");

debug2("%s: compat public key proposal: %s", __func__, pkalg_prop);

debug2_f("compat public key proposal: %s", pkalg_prop);

if (*pkalg_prop == '\0')

fatal("No supported PK algorithms found");

return pkalg_prop;

Line 188

{

if ((datafellows & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0)

return p;

debug2("%s: original KEX proposal: %s", __func__, p);

debug2_f("original KEX proposal: %s", p);

if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)

if ((p = match_filter_denylist(p,

"curve25519-sha256@libssh.org")) == NULL)

Line 199

"diffie-hellman-group-exchange-sha1")) == NULL)

fatal("match_filter_denylist failed");

}

debug2("%s: compat KEX proposal: %s", __func__, p);

debug2_f("compat KEX proposal: %s", p);

if (*p == '\0')

fatal("No supported key exchange algorithms found");

return p;