[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation/src/blowfish
From:       İsmail Dönmez <ismail () kde ! org ! tr>
Date:       2005-08-10 8:04:52
Message-ID: 1123661092.822727.1157.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 444444 by cartman:

Backports from new Mircryption release


 M  +1 -1      BlowfishCbc.h  
 M  +7 -1      oldblowfish.cpp  
 M  +5 -0      oldblowfish1.h  


--- trunk/extragear/network/konversation/src/blowfish/BlowfishCbc.h #444443:444444
@@ -8,7 +8,7 @@
 //---------------------------------------------------------------------------
 // Mouser 1/14/05
 //  I'm not sure this implementation of cbc is exactly the same as other cbc
-//   algorithms you may find, though the different is insignificant and just
+//   algorithms you may find, though the difference is insignificant and just
 //   requires you to call your other algorithm slightly differently.
 //  This blowfish cbc class basically pretends that the IV is 00000000 but
 //   but that the first 8byte block of the plaintext to encrypt is treated
--- trunk/extragear/network/konversation/src/blowfish/oldblowfish.cpp #444443:444444
@@ -10,7 +10,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301  USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 // Blowfish algorythms: Bruce Schneier and Jim Conger
 //   Bruce Schneier, 1996, Applied Cryptography, 2nd ed., John Wiley & Sons
@@ -108,6 +108,12 @@
 	DWORD  		data, datal, datar ;
 	union aword temp ;
 
+
+	// ATTN: new fix for keys > 56, should make it more compatible with FISH
+	// but fish uses 80 ???
+	if (keybytes>MAXKEYBYTES_COMPATMODE)
+		keybytes=MAXKEYBYTES_COMPATMODE;
+
 	// first fill arrays from data tables
 	for (i = 0 ; i < 18 ; i++)
 		PArray [i] = bf_P [i] ;
--- trunk/extragear/network/konversation/src/blowfish/oldblowfish1.h #444443:444444
@@ -28,7 +28,12 @@
 #define BYTE  		unsigned char
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+// for fish compatibility we use 80 instead of 56
+#define MAXKEYBYTES_COMPATMODE 80
+//---------------------------------------------------------------------------
 
+
 //---------------------------------------------------------------------------
 #include "oldblowfish2.h"
 //---------------------------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]