* src/vm/runner.c
! Minor to prev.
* include/hbapi.h
* src/vm/extend.c
+ Added hb_parnsize(), hb_retnsize(), hb_stornsize() functions.
; NOTE: These should be used in place of hb_parnl(), hb_retnl(),
hb_stornl() when passing HB_SIZE types.
; TODO: Use them all accross Harbour if they are correct and
after being finalized.
* src/vm/itemapi.c
+ Added hb_itemGetNSize(), hb_itemPutNSize() functions.
* DATETIME stuff in hb_itemGetNL() marked as HB_LEGACY_LEVEL3.
; QUESTION: It's marked as to be deleted in the TODO, so maybe we should
rather delete it.
* include/hbapiitm.h
* src/rtl/filesys.c
+ hb_fsReadAt(), hb_fsWriteAt(): Added support for Win64 HB_SIZE.
; QUESTION: I assume these functions have the purpose of being
atomic seek + read without moving the file pointer,
which means current modification isn't safe. How
can this be solved given Windows doesn't seem to have
64-bit read/write API calls?
! Fixed old copy-paste typos in Windows OVERLAPPED initialization,
where the lines were ended with command instead of semicolon,
they didn't cause any harm though in their former location.
% Reverted a minor change from prev commit to make it
possibly a little bit faster, like it was before.
* src/rtl/hbzlib.c
+ Added casts (at external interface calls) and other fixes to
make it build for Win64 without warnings.
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/dbfnsx/dbfnsx1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbffpt/dbffpt1.c
* contrib/rddbmcdx/bmdbfcdx.c
* HB_ULONG -> HB_SIZE where appropriate to avoid Win64 errors
and some warnings. I'm still not comfortable to touch this
code, but it could certainly need a type cleanup.
* include/hbdefs.h
+ Added HB_PFS macro which holds the printf() format string
for HB_SIZE value.
; TODO: Use it all accross Harbour.
* contrib/hbmysql/mysql.c
* contrib/sddmy/sddmy.c
* contrib/hbmzip/hbmzip.c
* contrib/hbcurl/hbcurl.c
* contrib/hbhpdf/harupdf.c
* contrib/hbpgsql/postgres.c
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
* contrib/hbfimage/fi_wrp.c
* contrib/sddodbc/sddodbc.c
* contrib/hbgd/gdwrp.c
* contrib/hbwin/wapi_wingdi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_winuser.c
* contrib/hbwin/win_bmp.c
* contrib/hbwin/win_prn1.c
* contrib/hbwin/win_regc.c
* contrib/hbssl/evpciph.c
* contrib/hbssl/ssl.c
* contrib/hbssl/bio.c
* contrib/hbssl/sslctx.c
* contrib/hbssl/evpenc.c
* contrib/hbssl/pem.c
* contrib/hbssl/rand.c
* contrib/hbssl/evp.c
+ Added necessary casts at external component boundaries to
make Win64 builds warning-free.
* contrib/hbct/ctstrfil.c
+ HB_ISIZ -> HB_FOFFSET, hb_fsSeek() usage, other type cleanup
to handle file offsets correctly.
* contrib/xhb/hbnxs.h
* contrib/xhb/hbcrypt.c
! Fixed warnings for Win64.
* contrib/hbwin/win_prn3.c
* contrib/xhb/dbf2txt.c
* contrib/xhb/fparse.c
* int -> HB_ISIZ for Win64.
* contrib/xhb/freadlin.c
* hb_fsSeek() -> hb_fsSeekLarge().
* contrib/sddfb/sddfb.c
* Minor type cleanup to make Win64 warning-free.
* contrib/hbsqlit3/hbsqlit3.c
+ Added necessary casts at external interface calls.
% Deleted one dummy operation from SQLITE3_FILE_TO_BUFF().
* contrib/rddsql/sqlmix.c
* contrib/rddads/adsx.c
* HB_ULONG -> HB_SIZE.
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
! int -> HB_ISIZ/HB_SIZE
+ Added necessary casts at external component boundaries to
make Win64 warning-free.
* contrib/rddads/ads1.c
* HB_ULONG -> HB_SIZE
* contrib/hbtip/utils.c
* int -> HB_ISIZ
! Fixed to use HB_FOFFSET type to save/restore file position.
* ChangeLog
+ Added missing item to previous log entry:
! Fixed hb_fsCurDirBuff() for Win64.
; It's quite large commit, nevertheless I'd highly appreciate
peer review, and certainly there will be places which need
better or different solution for Win64.
435 lines
12 KiB
C
435 lines
12 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* xHarbour Project source code:
|
|
* Cryptography for xharbour
|
|
*
|
|
* Copyright 2003 Giancarlo Niccolai <giancarlo@niccolai.ws>
|
|
* www - http://www.xharbour.org
|
|
* SEE ALSO COPYRIGHT NOTICE FOR NXS BELOW.
|
|
*
|
|
* 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. 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.
|
|
*
|
|
*/
|
|
|
|
/***************************************************************
|
|
* NXS aglorithm is FREE SOFTWARE. It can be reused for any
|
|
* purpose, provided that this copyright notice is still present
|
|
* in the software.
|
|
*
|
|
* This program is distributed WITHOUT ANY WARRANTY that it can
|
|
* fit any particular need.
|
|
*
|
|
* NXS author is Giancarlo Niccolai <giancarlo@niccolai.ws>
|
|
**************************************************************/
|
|
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbchksum.h"
|
|
#include "hbnxs.h"
|
|
|
|
#define BASE 65521L /* largest prime smaller than 65536 */
|
|
|
|
/* Giancarlo Niccolai's x scrambler algorithm
|
|
* Prerequisites:
|
|
* 1) source must be at least 8 bytes long.
|
|
* 2) key must be at least 6 characters long.
|
|
* Optimal lenght is about 12 to 16 bytes. Maximum keylen is 512 bytes
|
|
* 3) cipher must be preallocated with srclen bytes
|
|
*/
|
|
|
|
void nxs_crypt(
|
|
const unsigned char *source, HB_SIZE srclen,
|
|
const unsigned char *key, HB_SIZE keylen,
|
|
unsigned char *cipher )
|
|
{
|
|
|
|
if( keylen > NXS_MAX_KEYLEN )
|
|
keylen = NXS_MAX_KEYLEN;
|
|
|
|
#ifdef DEBUG_0
|
|
memcpy( cipher, source, srclen );
|
|
#endif
|
|
|
|
/* pass one: scramble the source using the key */
|
|
nxs_scramble( source, srclen, key, keylen, cipher );
|
|
|
|
/* pass two: xor the source with the key
|
|
threebit mutual shift is done also here */
|
|
nxs_xorcode( cipher, srclen, key, keylen );
|
|
|
|
/* pass three: xor the source with the cyclic key */
|
|
nxs_xorcyclic( cipher, srclen, key, keylen );
|
|
}
|
|
|
|
/*decrypting the buffer */
|
|
|
|
void nxs_decrypt(
|
|
const unsigned char *cipher, HB_SIZE cipherlen,
|
|
const unsigned char *key, HB_SIZE keylen,
|
|
unsigned char *result )
|
|
{
|
|
if( keylen > NXS_MAX_KEYLEN )
|
|
keylen = NXS_MAX_KEYLEN;
|
|
|
|
memcpy( result, cipher, cipherlen );
|
|
|
|
/* pass one: xor the source with the cyclic key */
|
|
nxs_xorcyclic( result, cipherlen, key, keylen );
|
|
|
|
/* pass two: xor the source with the key
|
|
threebit mutual shift is done also here */
|
|
nxs_xordecode( result, cipherlen, key, keylen );
|
|
|
|
/* pass three: unscramble the source using the key */
|
|
nxs_unscramble( result, cipherlen, key, keylen );
|
|
}
|
|
|
|
/* This function scrambles the source using the letter ordering in the
|
|
* key. */
|
|
void nxs_scramble(
|
|
const unsigned char *source, HB_SIZE srclen,
|
|
const unsigned char *key, HB_SIZE keylen,
|
|
unsigned char *cipher )
|
|
{
|
|
HB_ISIZ scramble[ NXS_MAX_KEYLEN ];
|
|
HB_SIZE len;
|
|
|
|
if( keylen > NXS_MAX_KEYLEN )
|
|
keylen = NXS_MAX_KEYLEN;
|
|
|
|
if( keylen > srclen )
|
|
keylen = srclen;
|
|
|
|
/* First step: find key ordering */
|
|
nxs_make_scramble( scramble, key, keylen );
|
|
|
|
/* Leave alone the last block */
|
|
len = keylen > 0 ? ( srclen / keylen ) * keylen : 0;
|
|
nxs_partial_scramble( source, cipher, scramble, len, keylen );
|
|
|
|
keylen = srclen - len;
|
|
nxs_make_scramble( scramble, key, keylen );
|
|
nxs_partial_scramble( source + len, cipher + len, scramble, keylen, keylen );
|
|
}
|
|
|
|
|
|
void nxs_partial_scramble(
|
|
const unsigned char * source, unsigned char * cipher,
|
|
HB_ISIZ * scramble,
|
|
HB_SIZE len, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE pos;
|
|
HB_USHORT kpos;
|
|
|
|
pos = 0l;
|
|
kpos = 0;
|
|
while( pos + kpos < len )
|
|
{
|
|
cipher[ pos + scramble[ kpos ] ] = source[ pos + kpos ];
|
|
kpos++;
|
|
if( kpos >= ( HB_USHORT ) keylen )
|
|
{
|
|
kpos = 0;
|
|
pos += keylen;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Reversing scramble process */
|
|
void nxs_unscramble(
|
|
unsigned char * cipher, HB_SIZE cipherlen,
|
|
const unsigned char * key, HB_SIZE keylen )
|
|
{
|
|
HB_ISIZ scramble[ NXS_MAX_KEYLEN ];
|
|
HB_SIZE len;
|
|
|
|
if( keylen > NXS_MAX_KEYLEN )
|
|
keylen = NXS_MAX_KEYLEN;
|
|
|
|
if( keylen > cipherlen )
|
|
keylen = cipherlen;
|
|
|
|
/* First step: find key ordering */
|
|
nxs_make_scramble( scramble, key, keylen );
|
|
|
|
/* Leave alone the last block */
|
|
len = keylen > 0 ? (cipherlen / keylen) * keylen : 0;
|
|
nxs_partial_unscramble( cipher, scramble, len, keylen );
|
|
|
|
keylen = cipherlen - len;
|
|
nxs_make_scramble( scramble, key, keylen );
|
|
nxs_partial_unscramble( cipher+len, scramble, keylen, keylen );
|
|
}
|
|
|
|
|
|
void nxs_partial_unscramble(
|
|
unsigned char * cipher,
|
|
HB_ISIZ * scramble,
|
|
HB_SIZE len, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE pos;
|
|
HB_USHORT kpos;
|
|
unsigned char buf[ NXS_MAX_KEYLEN ];
|
|
|
|
pos = 0l;
|
|
kpos = 0;
|
|
while( pos + kpos < len )
|
|
{
|
|
buf[ kpos ] = cipher[ pos + scramble[ kpos ] ];
|
|
kpos++;
|
|
if( kpos >= ( HB_USHORT ) keylen )
|
|
{
|
|
memcpy( cipher + pos, buf, keylen );
|
|
kpos = 0;
|
|
pos += keylen;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* pass two: xor the source with the key
|
|
threebit mutual shift is done also here */
|
|
void nxs_xorcode(
|
|
unsigned char * cipher, HB_SIZE cipherlen,
|
|
const unsigned char * key, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE pos = 0l;
|
|
HB_USHORT keypos = 0;
|
|
unsigned char c_bitrest;
|
|
|
|
c_bitrest = cipher[ 0 ] >>5;
|
|
|
|
while( pos < cipherlen )
|
|
{
|
|
cipher[pos] <<= 3;
|
|
|
|
if(keypos == ( HB_USHORT ) keylen-1 || pos == cipherlen -1 )
|
|
cipher[pos] |= c_bitrest;
|
|
else
|
|
cipher[pos] |= cipher[pos+1] >> 5;
|
|
|
|
cipher[pos] ^= key[ keypos ];
|
|
keypos ++;
|
|
pos++;
|
|
|
|
if(keypos == ( HB_USHORT ) keylen )
|
|
{
|
|
keypos = 0;
|
|
c_bitrest = cipher[ pos ] >>5;
|
|
}
|
|
}
|
|
}
|
|
|
|
void nxs_xordecode(
|
|
unsigned char * cipher, HB_SIZE cipherlen,
|
|
const unsigned char * key, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE pos = 0l;
|
|
HB_USHORT keypos = 0;
|
|
unsigned char c_bitrest, c_bitleft;
|
|
|
|
/* A very short block? */
|
|
if( keylen > cipherlen - pos )
|
|
keylen = ( HB_USHORT ) ( cipherlen - pos );
|
|
|
|
c_bitleft = ( cipher[ keylen -1 ] ^ key[ keylen -1 ] ) << 5;
|
|
|
|
while( pos < cipherlen )
|
|
{
|
|
cipher[pos] ^= key[ keypos ];
|
|
|
|
c_bitrest = cipher[ pos ] <<5;
|
|
cipher[ pos ] >>= 3;
|
|
cipher[ pos ] |= c_bitleft;
|
|
c_bitleft = c_bitrest;
|
|
|
|
keypos ++;
|
|
pos ++;
|
|
|
|
if(keypos == ( HB_USHORT ) keylen )
|
|
{
|
|
keypos = 0;
|
|
/* last block */
|
|
if( keylen > cipherlen - pos )
|
|
{
|
|
keylen = ( HB_USHORT ) (cipherlen - pos);
|
|
}
|
|
|
|
c_bitleft = ( cipher[ pos + keylen -1 ] ^ key[ keylen -1 ] ) << 5;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* pass three: xor the source with the cyclic key */
|
|
void nxs_xorcyclic(
|
|
unsigned char * cipher, HB_SIZE cipherlen,
|
|
const unsigned char * key, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE pos = 0l, crcpos = 0l;
|
|
HB_U32 crc1, crc2, crc3;
|
|
HB_U32 crc1l, crc2l, crc3l;
|
|
|
|
/* Build the cyclic key seed */
|
|
crc1 = keylen >= 2 ? hb_adler32( 0, ( const char * ) key + 0, keylen - 2 ) : 1;
|
|
crc2 = keylen >= 4 ? hb_adler32( 0, ( const char * ) key + 2, keylen - 4 ) : 1;
|
|
crc3 = keylen >= 2 ? hb_adler32( 0, ( const char * ) key + 1, keylen - 2 ) : 1;
|
|
|
|
crc1l = crc1 = nxs_cyclic_sequence( crc1 );
|
|
crc2l = crc2 = nxs_cyclic_sequence( crc2 );
|
|
crc3l = crc3 = nxs_cyclic_sequence( crc3 );
|
|
|
|
while( pos < cipherlen )
|
|
{
|
|
if( crcpos < 4 )
|
|
{
|
|
/* this ensures portability across platforms */
|
|
cipher[ pos ] ^= (unsigned char) (crc1l % 256 );
|
|
crc1l /= 256l;
|
|
}
|
|
else if( crcpos < 8 )
|
|
{
|
|
cipher[ pos ] ^= (unsigned char) (crc2l % 256 );
|
|
crc2l /= 256l;
|
|
}
|
|
else
|
|
{
|
|
cipher[ pos ] ^= (unsigned char) (crc3l % 256 );
|
|
crc3l /= 256l;
|
|
}
|
|
crcpos++;
|
|
pos++;
|
|
|
|
if( crcpos == 12 )
|
|
{
|
|
crcpos = 0;
|
|
crc1l = crc1 = nxs_cyclic_sequence( crc1 );
|
|
crc2l = crc2 = nxs_cyclic_sequence( crc2 );
|
|
crc3l = crc3 = nxs_cyclic_sequence( crc3 );
|
|
}
|
|
}
|
|
}
|
|
|
|
HB_U32 nxs_cyclic_sequence( HB_U32 input )
|
|
{
|
|
HB_U32 first = input & 0xffff;
|
|
HB_U32 second = input >> 16;
|
|
HB_U32 ret = ( ( second * BASE * BASE ) & 0xffff ) |
|
|
( (first * BASE * BASE) &0xffff0000);
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
void nxs_make_scramble( HB_ISIZ * scramble, const unsigned char * key, HB_SIZE keylen )
|
|
{
|
|
HB_SIZE i, j, tmp;
|
|
|
|
for( i = 0; i < keylen; i ++ )
|
|
scramble[ i ] = i;
|
|
|
|
for( i = 0; i < keylen; i ++ )
|
|
{
|
|
for( j = i + 1; j < keylen; j ++ )
|
|
{
|
|
if( key[ scramble[ j ] ] < key[ scramble[ i ] ] )
|
|
{
|
|
tmp = scramble[ j ];
|
|
scramble[ j ] = scramble[ i ];
|
|
scramble[ i ] = tmp;
|
|
j = i;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* END OF NXS
|
|
*/
|
|
|
|
/***********************************
|
|
* XHarbour implementation
|
|
************************************/
|
|
|
|
/*****
|
|
* Encrypt a text using a key
|
|
* Usage:
|
|
* HB_Crypt( cSource, cKey ) --> cCipher
|
|
*/
|
|
|
|
HB_FUNC( HB_CRYPT )
|
|
{
|
|
PHB_ITEM pSource = hb_param( 1, HB_IT_ANY );
|
|
PHB_ITEM pKey = hb_param( 2, HB_IT_ANY );
|
|
|
|
unsigned char * cRes = ( unsigned char * ) hb_xgrab( hb_itemGetCLen( pSource ) + 8 );
|
|
|
|
nxs_crypt(
|
|
( unsigned char * ) hb_itemGetCPtr( pSource ), hb_itemGetCLen( pSource ),
|
|
( unsigned char * ) hb_itemGetCPtr( pKey ), hb_itemGetCLen( pKey ),
|
|
cRes );
|
|
|
|
hb_retclen_buffer( ( char * ) cRes, hb_itemGetCLen( pSource ) );
|
|
}
|
|
|
|
/*****
|
|
* Decrypt a text using a key
|
|
* Usage:
|
|
* HB_Decrypt( cCrypt, cKey ) --> cSource
|
|
*/
|
|
|
|
HB_FUNC( HB_DECRYPT )
|
|
{
|
|
PHB_ITEM pSource = hb_param( 1, HB_IT_ANY );
|
|
PHB_ITEM pKey = hb_param( 2, HB_IT_ANY );
|
|
|
|
unsigned char * cRes = ( unsigned char * ) hb_xgrab( hb_itemGetCLen( pSource ) + 8 );
|
|
|
|
nxs_decrypt(
|
|
( unsigned char * ) hb_itemGetCPtr( pSource ), hb_itemGetCLen( pSource ),
|
|
( unsigned char * ) hb_itemGetCPtr( pKey ), hb_itemGetCLen( pKey ),
|
|
cRes );
|
|
|
|
hb_retclen_buffer( ( char * ) cRes, hb_itemGetCLen( pSource ) );
|
|
}
|