Merge branch '3.0'

This commit is contained in:
terrafrost 2019-09-28 13:05:50 -05:00
commit 5ff9e7b48b

View File

@ -4411,10 +4411,7 @@ class SSH2
case 'chacha20-poly1305@openssh.com': case 'chacha20-poly1305@openssh.com':
case 'arcfour128': case 'arcfour128':
case 'arcfour256': case 'arcfour256':
if ($engine == 'Eval') { if ($engine != 'Eval') {
$algos = array_diff($algos, [$algo]);
$ciphers[] = $algo;
} else {
continue 2; continue 2;
} }
break; break;