From 4401b7e21e9ac6d6ab0b70fa5c7835803f11cbb9 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 16 Jun 2014 09:47:13 -0500 Subject: [PATCH] SSH2: replace _is_includable() with stream_resolve_include_path --- phpseclib/Net/SSH2.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 49382177..29879711 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -1107,31 +1107,31 @@ class Net_SSH2 'none' // OPTIONAL no encryption; NOT RECOMMENDED ); - if (!$this->_is_includable('Crypt/RC4.php')) { + if (stream_resolve_include_path('Crypt/RC4.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('arcfour256', 'arcfour128', 'arcfour') ); } - if (!$this->_is_includable('Crypt/Rijndael.php')) { + if (stream_resolve_include_path('Crypt/Rijndael.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc') ); } - if (!$this->_is_includable('Crypt/Twofish.php')) { + if (stream_resolve_include_path('Crypt/Twofish.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc') ); } - if (!$this->_is_includable('Crypt/Blowfish.php')) { + if (stream_resolve_include_path('Crypt/Blowfish.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('blowfish-ctr', 'blowfish-cbc') ); } - if (!$this->_is_includable('Crypt/TripleDES.php')) { + if (stream_resolve_include_path('Crypt/TripleDES.php') === false) { $encryption_algorithms = array_diff( $encryption_algorithms, array('3des-ctr', '3des-cbc')