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

2011-05-19 17:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/arc4.c
    ! fixed for watcom (getpid)
    ! cast for msvc
    ! fixed for dmc (ms struct missing for win seed)
    ! fixed for bcc (inline disabled for this dead compiler, getpid)
    ! fixed warning for all non-unix, non-win targets

    ; TOFIX: it's also broken for watcom/dos and watcom/linux
             Tamas, can you take a look at it?

  * utils/hbmk2/hbmk2.prg
    + use HB_RAND32()
This commit is contained in:
Viktor Szakats
2011-05-19 15:15:59 +00:00
parent ef4b9bf234
commit 955e90fe59
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -16,6 +16,20 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-19 17:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/arc4.c
! fixed for watcom (getpid)
! cast for msvc
! fixed for dmc (ms struct missing for win seed)
! fixed for bcc (inline disabled for this dead compiler, getpid)
! fixed warning for all non-unix, non-win targets
; TOFIX: it's also broken for watcom/dos and watcom/linux
Tamas, can you take a look at it?
* utils/hbmk2/hbmk2.prg
+ use HB_RAND32()
2011-05-19 16:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/Makefile
* src/rtl/hbrandom.c

19
harbour/src/rtl/arc4.c
View File

@@ -95,7 +95,9 @@ struct arc4_stream
};
#if defined( HB_OS_WIN )
# define getpid _getpid
# if ! defined( __BORLANDC__ ) && ! defined( __WATCOMC__ )
# define getpid _getpid
# endif
# define pid_t int
#endif
@@ -108,14 +110,19 @@ static HB_CRITICAL_NEW( arc4_lock );
#define _ARC4_LOCK() hb_threadEnterCriticalSection( &arc4_lock )
#define _ARC4_UNLOCK() hb_threadLeaveCriticalSection( &arc4_lock )
#if defined( __BORLANDC__ ) && defined( _HB_INLINE_ )
#undef _HB_INLINE_
#define _HB_INLINE_
#endif
static _HB_INLINE_ HB_U8 arc4_getbyte( void );
static _HB_INLINE_ void arc4_init( void )
{
int n;
for( n = 0; n < 256; n++ )
rs.s[ n ] = n;
for( n = 0; n < 256; ++n )
rs.s[ n ] = ( HB_U8 ) n;
rs.i = rs.j = 0;
}
@@ -126,7 +133,7 @@ static _HB_INLINE_ void arc4_addrandom( const HB_U8 * dat, int datlen )
HB_U8 si;
rs.i--;
for( n = 0; n < 256; n++ )
for( n = 0; n < 256; ++n )
{
rs.i = ( rs.i + 1 );
si = rs.s[ rs.i ];
@@ -137,7 +144,7 @@ static _HB_INLINE_ void arc4_addrandom( const HB_U8 * dat, int datlen )
rs.j = rs.i;
}
#if ! defined( HB_OS_WIN )
#if defined( HB_OS_UNIX )
static HB_ISIZ read_all( int fd, HB_U8 * buf, size_t count )
{
HB_SIZE numread = 0;
@@ -159,7 +166,7 @@ static HB_ISIZ read_all( int fd, HB_U8 * buf, size_t count )
}
#endif /* ! HB_OS_WIN */
#if defined( HB_OS_WIN )
#if defined( HB_OS_WIN ) && ! defined( __DMC__ )
#define TRY_SEED_MS_CRYPTOAPI
static int arc4_seed_win32( void )

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -932,7 +932,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
LOCAL lHBMAINDLLP
IF s_cSecToken == NIL
s_cSecToken := StrZero( hb_Random( 1, 4294967294 ), 10, 0 )
s_cSecToken := StrZero( hb_rand32(), 10, 0 )
ENDIF
hbmk[ _HBMK_cBUILD ] := ""