summaryrefslogtreecommitdiffstats
path: root/php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
blob: e5f8d1f5a9a0b3c67697c431cfc368af39bbf5b4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff -up Net_SSH2-1.0.19/SSH2.php.old Net_SSH2-1.0.19/SSH2.php
--- Net_SSH2-1.0.19/SSH2.php.old	2020-07-08 11:32:38.947331135 +0200
+++ Net_SSH2-1.0.19/SSH2.php	2020-07-08 11:32:59.619256541 +0200
@@ -2059,12 +2059,12 @@ class Net_SSH2
                 return new Crypt_Rijndael(CRYPT_RIJNDAEL_MODE_CTR);
             case 'blowfish-cbc':
                 if (!class_exists('Crypt_Blowfish')) {
-                    include_once 'Crypt/Blowfish.php';
+                    include_once 'Crypt/Blowfish-phpseclib.php';
                 }
                 return new Crypt_Blowfish();
             case 'blowfish-ctr':
                 if (!class_exists('Crypt_Blowfish')) {
-                    include_once 'Crypt/Blowfish.php';
+                    include_once 'Crypt/Blowfish-phpseclib.php';
                 }
                 return new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
             case 'twofish128-cbc':