* contrib/hbct/ctnet.c
! fixed copy and past typo in previous commit
* src/rdd/hbsix/sxcompat.prg
! fixed sx_Compress() and sx_Decompress() used with arrays
; modifications below comes from Viktor fork:
* include/dbinfo.ch
* src/rdd/workarea.c
+ added support for new dbInfo() action: DBI_CODEPAGE
It returns Harbour CP used by current work area.
* src/common/expropt2.c
* change instruction order to protect against NULL references
if we ever add support for dummy lists
* src/common/hbver.c
! CLANG detection
* src/lang/l_fr.c
* src/lang/l_hu.c
* updated translations
* src/rtl/cdpapihb.c
* include/harbour.hbx
+ added function hb_cdpExists( <cCDP> ) -> <lExists>
it returns .T. if the passed codepage is supported
and linked, .F. otherwise
* src/rtl/hbrand.c
* include/harbour.hbx
+ added hb_randStr( <nLen> ) -> <cBytes> which returns a strong
random stream of bytes of requested length
* src/vm/hashfunc.c
* include/harbour.hbx
+ New hash function to easily check for the existence
of a key and at the same time retrieving its corresponding
value:
hb_HGetRef( <hHash>, <xKey>[, <@xValue> ] ) -> <lFound>
If the key is not found, <xValue> is also reset to NIL.
Useful to replace hb_HPos()/hb_HValueAt() call pairs and
associated temp variable, or to avoid multiple hash lookups
for the cost of one temp variable.
* src/rtl/copyfile.c
% use 64KB buffer
* src/rtl/tget.prg
! Get():Insert()/Get():OverStrike() GET freeze fix reworked
using better solution by Heinz.
* src/rtl/tgetlist.prg
* src/rtl/tmenuitm.prg
* src/rtl/tmenusys.prg
* src/rtl/tpopup.prg
! fixed to precisely verify against multiple expected class names
previously a custom class named f.e. 'LIST' was accepted in some
places for LISTBOX
! fixed TOFIX where CP/encoding dependent string was
used to determine whether a menu item is separator
throughout the lifetime of the menu.
* src/common/hbdate.c
* src/common/hbprintf.c
* src/common/hbtrace.c
* src/common/hbver.c
* src/compiler/compi18n.c
* src/compiler/genc.c
* src/compiler/gencc.c
* src/compiler/hbusage.c
* src/debug/dbgthsh.prg
* src/debug/dbgtmenu.prg
* src/debug/debugger.prg
* src/debug/tbrwtext.prg
* src/pp/hbpp.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbfuncs.prg
* src/rdd/dbtotal.prg
* src/rdd/hbsix/sxcompat.prg
* src/rdd/hbsix/sxini.prg
* src/rdd/usrrdd/rdds/arrayrdd.prg
* src/rdd/usrrdd/rdds/hscdx.prg
* src/rtl/adir.prg
* src/rtl/arc4.c
* src/rtl/cdpdet.prg
* src/rtl/dbedit.prg
* src/rtl/dircmd.prg
* src/rtl/diskspac.c
* src/rtl/disksphb.c
* src/rtl/errint.c
* src/rtl/errintlo.c
* src/rtl/errsys.prg
* src/rtl/filesys.c
* src/rtl/fslink.c
* src/rtl/gtkbstat.c
* src/rtl/gtwin/gtwin.c
* src/rtl/gtwvt/gtwvt.c
* src/rtl/hbbffnc.c
* src/rtl/hbi18n1.c
* src/rtl/hbi18n2.prg
* src/rtl/hbini.prg
* src/rtl/hbjson.c
* src/rtl/listbox.prg
* src/rtl/menusys.prg
* src/rtl/mtran.c
* src/rtl/radiogrp.prg
* src/rtl/tgetlist.prg
* src/rtl/tmenusys.prg
* src/rtl/tobject.prg
* src/rtl/tpersist.prg
* src/rtl/tpopup.prg
* src/rtl/tpopuphb.prg
* src/rtl/treport.prg
* src/rtl/tscalar.prg
* src/rtl/ttopbar.prg
* src/rtl/tget.prg
* src/rtl/tlabel.prg
* src/rtl/tmenuitm.prg
* src/rtl/valtoexp.prg
* src/rtl/valtype.c
* src/vm/dlmalloc.c
* src/vm/fm.c
! check module handle returned by GetModuleHandle() in MS-Windows
builds
! use %u for unsigned printf formatting
* casting, formatting, casing and some modifications in names
* use #if 0 / #endif to mark commented blocks
* updated year to 2014
% use FOR EACH, SWITCH, DO CASE statements
% use :__enumFirst() / :__enumLast()
% eliminated some local variables and redundant declarations
% use hb_defaultValue()
% use $ operator instead of At() and hb_HHasKey()
% use hb_ADel() instead of ADel()+ASize()
* replace some functions with procedures
* pacified some MSC warnings
* use hb_StrFormat() for user messages
* use :: instead of Self:
* use ANSI date delimiters
270 lines
8.3 KiB
C
270 lines
8.3 KiB
C
/*
|
|
* Harbour Project source code:
|
|
* PRG functions for BlowFish encryption
|
|
*
|
|
* Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING.txt. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbbfish.h"
|
|
|
|
static const HB_BLOWFISH * hb_bf_keyparam( void )
|
|
{
|
|
if( hb_parclen( 1 ) == sizeof( HB_BLOWFISH ) )
|
|
return ( const HB_BLOWFISH * ) hb_parc( 1 );
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/* hb_blowfishKey( <cPasswd> ) -> <cBfKey>
|
|
*/
|
|
HB_FUNC( HB_BLOWFISHKEY )
|
|
{
|
|
int iLen = ( int ) hb_parclen( 1 );
|
|
|
|
if( iLen )
|
|
{
|
|
HB_BLOWFISH bf;
|
|
|
|
hb_blowfishInit( &bf, hb_parc( 1 ), iLen );
|
|
hb_retclen( ( const char * ) &bf, sizeof( HB_BLOWFISH ) );
|
|
}
|
|
}
|
|
|
|
/* hb_blowfishEncrypt( <cBfKey>, <cText> [, <lRaw>=.F. ] ) -> <cCipher> | NIL
|
|
* return string encrypted using ECB (electronic codebook) mode or
|
|
* NIL on error (wrong parameters),
|
|
* in raw mode passed string is padded to 8 bytes with '\0'
|
|
* otherwise ANSI X.923 padding is used
|
|
*/
|
|
HB_FUNC( HB_BLOWFISHENCRYPT )
|
|
{
|
|
const HB_BLOWFISH * bf = hb_bf_keyparam();
|
|
PHB_ITEM pData = hb_param( 2, HB_IT_STRING );
|
|
|
|
if( bf && pData )
|
|
{
|
|
HB_SIZE nLen = hb_itemGetCLen( pData ), nSize;
|
|
|
|
if( nLen )
|
|
{
|
|
char * pszData;
|
|
HB_BOOL fRaw = hb_parl( 3 );
|
|
|
|
/* In raw mode passed string is padded to 8 bytes with '\0'
|
|
* otherwise ANSI X.923 padding is used
|
|
*/
|
|
nSize = ( fRaw ? ( ( nLen + 7 ) >> 3 ) :
|
|
( ( nLen >> 3 ) + 1 ) ) << 3;
|
|
pszData = ( char * ) hb_xgrab( nSize + 1 );
|
|
memcpy( pszData, hb_itemGetCPtr( pData ), nLen );
|
|
memset( pszData + nLen, '\0', nSize - nLen );
|
|
if( ! fRaw )
|
|
pszData[ nSize - 1 ] = ( char ) ( nSize - nLen );
|
|
for( nLen = 0; nLen < nSize; nLen += 8 )
|
|
{
|
|
HB_U32 xl, xr;
|
|
xl = HB_GET_BE_UINT32( &pszData[ nLen ] );
|
|
xr = HB_GET_BE_UINT32( &pszData[ nLen + 4 ] );
|
|
hb_blowfishEncrypt( bf, &xl, &xr );
|
|
HB_PUT_BE_UINT32( &pszData[ nLen ], xl );
|
|
HB_PUT_BE_UINT32( &pszData[ nLen + 4 ], xr );
|
|
}
|
|
hb_retclen_buffer( pszData, nSize );
|
|
}
|
|
else
|
|
hb_retc_null();
|
|
}
|
|
}
|
|
|
|
/* hb_blowfishDecrypt( <cBfKey>, <cCipher> [, <lRaw>=.F. ] ) -> <cText> | NIL
|
|
* return string decrypted using ECB (electronic codebook) mode or
|
|
* NIL on error (wrong parameters),
|
|
* in raw mode whole passed string is decoded as is
|
|
* otherwise it's decoded ANSI X.923 padded data
|
|
*/
|
|
HB_FUNC( HB_BLOWFISHDECRYPT )
|
|
{
|
|
const HB_BLOWFISH * bf = hb_bf_keyparam();
|
|
PHB_ITEM pData = hb_param( 2, HB_IT_STRING );
|
|
|
|
if( bf && pData )
|
|
{
|
|
HB_SIZE nSize = hb_itemGetCLen( pData ), nLen;
|
|
|
|
if( nSize >= 8 && ( nSize & 0x07 ) == 0 )
|
|
{
|
|
const char * pszSource;
|
|
char * pszData;
|
|
HB_BOOL fRaw = hb_parl( 3 );
|
|
|
|
pszData = ( char * ) hb_xgrab( nSize + ( fRaw ? 1 : 0 ) );
|
|
pszSource = hb_itemGetCPtr( pData );
|
|
for( nLen = 0; nLen < nSize; nLen += 8 )
|
|
{
|
|
HB_U32 xl, xr;
|
|
xl = HB_GET_BE_UINT32( &pszSource[ nLen ] );
|
|
xr = HB_GET_BE_UINT32( &pszSource[ nLen + 4 ] );
|
|
hb_blowfishDecrypt( bf, &xl, &xr );
|
|
HB_PUT_BE_UINT32( &pszData[ nLen ], xl );
|
|
HB_PUT_BE_UINT32( &pszData[ nLen + 4 ], xr );
|
|
}
|
|
if( ! fRaw )
|
|
{
|
|
nSize = ( unsigned char ) pszData[ nSize - 1 ];
|
|
nLen -= ( ( nSize - 1 ) & ~0x07 ) == 0 ? nSize : nLen;
|
|
}
|
|
if( nLen )
|
|
hb_retclen_buffer( pszData, nLen );
|
|
else
|
|
hb_xfree( pszData );
|
|
}
|
|
else if( nSize == 0 )
|
|
hb_retc_null();
|
|
}
|
|
}
|
|
|
|
/* BlowFish encryption using CFB (cipher feedback) mode instead
|
|
* of ECB (electronic codebook) mode with ANSI X.923 padding
|
|
*/
|
|
static void hb_bf_initvect( HB_BYTE * vect )
|
|
{
|
|
const char * pszVect = hb_parc( 3 );
|
|
int iLen = ( int ) hb_parclen( 3 );
|
|
int i;
|
|
|
|
for( i = 0; i < HB_BF_CIPHERBLOCK; ++i )
|
|
{
|
|
vect[ i ] = ( HB_BYTE ) i;
|
|
if( iLen > 0 )
|
|
vect[ i ] ^= ( HB_BYTE ) pszVect[ i % iLen ];
|
|
}
|
|
}
|
|
|
|
static void hb_bf_encode( const HB_BLOWFISH * bf, HB_BYTE * vect )
|
|
{
|
|
HB_U32 xl, xr;
|
|
|
|
xl = HB_GET_BE_UINT32( &vect[ 0 ] );
|
|
xr = HB_GET_BE_UINT32( &vect[ 4 ] );
|
|
hb_blowfishEncrypt( bf, &xl, &xr );
|
|
HB_PUT_BE_UINT32( &vect[ 0 ], xl );
|
|
HB_PUT_BE_UINT32( &vect[ 4 ], xr );
|
|
}
|
|
|
|
/* hb_blowfishEncrypt_CFB( <cBfKey>, <cText> [, <cInitSeed> ] )
|
|
* -> <cCipher> | NIL
|
|
* return string encrypted using CFB (cipher feedback) mode or
|
|
* NIL on error (wrong parameters)
|
|
*/
|
|
HB_FUNC( HB_BLOWFISHENCRYPT_CFB )
|
|
{
|
|
const HB_BLOWFISH * bf = hb_bf_keyparam();
|
|
PHB_ITEM pData = hb_param( 2, HB_IT_STRING );
|
|
|
|
if( bf && pData )
|
|
{
|
|
HB_SIZE nLen = hb_itemGetCLen( pData ), n;
|
|
|
|
if( nLen )
|
|
{
|
|
const char * pszSource = hb_itemGetCPtr( pData );
|
|
char * pszData = ( char * ) hb_xgrab( nLen + 1 );
|
|
HB_BYTE vect[ HB_BF_CIPHERBLOCK ];
|
|
|
|
hb_bf_initvect( vect );
|
|
|
|
for( n = 0; n < nLen; ++n )
|
|
{
|
|
int i = ( int ) ( n & ( HB_BF_CIPHERBLOCK - 1 ) );
|
|
if( i == 0 )
|
|
hb_bf_encode( bf, vect );
|
|
pszData[ n ] = ( vect[ i ] ^= pszSource[ n ] );
|
|
}
|
|
hb_retclen_buffer( pszData, nLen );
|
|
}
|
|
else
|
|
hb_retc_null();
|
|
}
|
|
}
|
|
|
|
/* hb_blowfishDecrypt_CFB( <cBfKey>, <cCipher> [, <cInitSeed> ] )
|
|
* -> <cText> | NIL
|
|
* return string decrypted using CFB (cipher feedback) mode or
|
|
* NIL on error (wrong parameters),
|
|
*/
|
|
HB_FUNC( HB_BLOWFISHDECRYPT_CFB )
|
|
{
|
|
const HB_BLOWFISH * bf = hb_bf_keyparam();
|
|
PHB_ITEM pData = hb_param( 2, HB_IT_STRING );
|
|
|
|
if( bf && pData )
|
|
{
|
|
HB_SIZE nLen = hb_itemGetCLen( pData ), n;
|
|
|
|
if( nLen )
|
|
{
|
|
const char * pszSource = hb_itemGetCPtr( pData );
|
|
char * pszData = ( char * ) hb_xgrab( nLen + 1 );
|
|
HB_BYTE vect[ HB_BF_CIPHERBLOCK ];
|
|
|
|
hb_bf_initvect( vect );
|
|
|
|
for( n = 0; n < nLen; ++n )
|
|
{
|
|
int i = ( int ) ( n & ( HB_BF_CIPHERBLOCK - 1 ) );
|
|
if( i == 0 )
|
|
hb_bf_encode( bf, vect );
|
|
pszData[ n ] = ( vect[ i ] ^ pszSource[ n ] );
|
|
vect[ i ] = pszSource[ n ];
|
|
}
|
|
hb_retclen_buffer( pszData, nLen );
|
|
}
|
|
else
|
|
hb_retc_null();
|
|
}
|
|
}
|