fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-12-06 10:52 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* include/hbbfish.h
  * src/rtl/hbbffnc.c
    + added HB_BF_CIPHERBLOCK macro
This commit is contained in:
Przemysław Czerpak
2013-12-06 10:52:59 +01:00
parent e7021f96ac
commit 6ff1084cf0
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-12-06 10:52 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbbfish.h
* src/rtl/hbbffnc.c
+ added HB_BF_CIPHERBLOCK macro
2013-12-03 09:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbmxml/3rd/minixml/mxml.hbp
* updated source package URL

6
include/hbbfish.h
View File

@@ -60,8 +60,10 @@
HB_EXTERN_BEGIN
#define SUBKEYS_COUNT 18
#define SBOX_ENTRIES 256
#define HB_BF_CIPHERBLOCK 8
#define SUBKEYS_COUNT 18
#define SBOX_ENTRIES 256
typedef struct
{

10
src/rtl/hbbffnc.c
View File

@@ -178,7 +178,7 @@ static void hb_bf_initvect( HB_BYTE * vect )
int iLen = ( int ) hb_parclen( 3 );
int i;
for( i = 0; i < 8; ++i )
for( i = 0; i < HB_BF_CIPHERBLOCK; ++i )
{
vect[ i ] = ( HB_BYTE ) i;
if( iLen > 0 )
@@ -215,13 +215,13 @@ HB_FUNC( HB_BLOWFISHENCRYPT_CFB )
{
const char * pszSource = hb_itemGetCPtr( pData );
char * pszData = ( char * ) hb_xgrab( nLen + 1 );
HB_BYTE vect[ 8 ];
HB_BYTE vect[ HB_BF_CIPHERBLOCK ];
hb_bf_initvect( vect );
for( n = 0; n < nLen; ++n )
{
int i = ( int ) ( n & 0x07 );
int i = ( int ) ( n & ( HB_BF_CIPHERBLOCK - 1 ) );
if( i == 0 )
hb_bf_encode( bf, vect );
pszData[ n ] = ( vect[ i ] ^= pszSource[ n ] );
@@ -251,13 +251,13 @@ HB_FUNC( HB_BLOWFISHDECRYPT_CFB )
{
const char * pszSource = hb_itemGetCPtr( pData );
char * pszData = ( char * ) hb_xgrab( nLen + 1 );
HB_BYTE vect[ 8 ];
HB_BYTE vect[ HB_BF_CIPHERBLOCK ];
hb_bf_initvect( vect );
for( n = 0; n < nLen; ++n )
{
int i = ( int ) ( n & 0x07 );
int i = ( int ) ( n & ( HB_BF_CIPHERBLOCK - 1 ) );
if( i == 0 )
hb_bf_encode( bf, vect );
pszData[ n ] = ( vect[ i ] ^ pszSource[ n ] );