diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-01-25 07:27:39 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-01-25 07:27:39 +0100 |
| commit | 25e27f195eb7b65a920c35ef249389980e5d38ba (patch) | |
| tree | 46f111786ecb50540fc7ac698df426afd9c4cc0e /php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch | |
php-phpseclib-net-ssh2: import from rawhide
Diffstat (limited to 'php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch')
| -rw-r--r-- | php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch new file mode 100644 index 0000000..e5f8f2d --- /dev/null +++ b/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch @@ -0,0 +1,43 @@ +Description: Fix Crypt_Blowfish conflict + Rename Crypt/Blowfish.php into Crypt/Blowfish-phpseclib.php so it can + be co-installed with Crypt_Blowfish from PEAR (php-crypt-blowfish + package). +Author: David Prévot <taffit@tilapin.org> +Bug: https://github.com/phpseclib/phpseclib/issues/125 +Last-Update: 2013-06-29 +--- a/Net/SSH2.php ++++ b/Net/SSH2.php +@@ -1329,14 +1329,14 @@ + break; + case 'blowfish-cbc': + if (!class_exists('Crypt_Blowfish')) { +- require_once('Crypt/Blowfish.php'); ++ require_once('Crypt/Blowfish-phpseclib.php'); + } + $this->encrypt = new Crypt_Blowfish(); + $this->encrypt_block_size = 8; + break; + case 'blowfish-ctr': + if (!class_exists('Crypt_Blowfish')) { +- require_once('Crypt/Blowfish.php'); ++ require_once('Crypt/Blowfish-phpseclib.php'); + } + $this->encrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR); + $this->encrypt_block_size = 8; +@@ -1405,14 +1405,14 @@ + break; + case 'blowfish-cbc': + if (!class_exists('Crypt_Blowfish')) { +- require_once('Crypt/Blowfish.php'); ++ require_once('Crypt/Blowfish-phpseclib.php'); + } + $this->decrypt = new Crypt_Blowfish(); + $this->decrypt_block_size = 8; + break; + case 'blowfish-ctr': + if (!class_exists('Crypt_Blowfish')) { +- require_once('Crypt/Blowfish.php'); ++ require_once('Crypt/Blowfish-phpseclib.php'); + } + $this->decrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR); + $this->decrypt_block_size = 8; |