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

2010-11-19 14:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/sha1.c
  * src/rtl/sha1.h
    ! Fixed some const controversy and writing to read-only memory area.
    ; Please review me.
This commit is contained in:
Viktor Szakats
2010-11-19 13:50:19 +00:00
parent 880f9e77ef
commit 3530a2a0e7
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -16,17 +16,23 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-11-19 14:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/sha1.c
* src/rtl/sha1.h
! Fixed some const controversy and writing to read-only memory area.
; Please review me.
2010-11-19 15:20 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/rddads/ads1.c
! fixed varchar support for windows introduced in one of last commits
; Varchar is not working, if ADS is set to use "OEM charset support",
because AdsGetFieldRaw() returns raw field data and maximum field
because AdsGetFieldRaw() returns raw field data and maximum field
length value is always returned.
ADS_USE_OEM_TRANSLATION is actually ugly hack to solve some DOS/WIN
ADS_USE_OEM_TRANSLATION is actually ugly hack to solve some DOS/WIN
codepage issues. I'm not sure what was the reason to introduce it.
Sharing the same database between DOS and Windows app or what?...
It would be nice if someone who need this setting will test and
support logic in case of variable string, binary string, unicode
It would be nice if someone who need this setting will test and
support logic in case of variable string, binary string, unicode
string.
2010-11-19 12:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

12
harbour/src/rtl/sha1.c
View File

@@ -67,7 +67,7 @@ typedef union _BYTE64QUAD16 {
} BYTE64QUAD16;
/* Hash a single 512-bit block. This is the core of the algorithm. */
static void SHA1_Transform(sha1_quadbyte state[5], const sha1_byte buffer[64]) {
static void SHA1_Transform(sha1_quadbyte state[5], sha1_byte buffer[64]) {
sha1_quadbyte a, b, c, d, e;
BYTE64QUAD16 *block;
@@ -122,8 +122,8 @@ void hb_SHA1_Init(SHA_CTX* context) {
}
/* Run your data through this. */
void hb_SHA1_Update(SHA_CTX *context, const void *datav, unsigned int len) {
const sha1_byte * data = ( const sha1_byte * ) datav;
void hb_SHA1_Update(SHA_CTX *context, void *datav, unsigned int len) {
sha1_byte * data = ( sha1_byte * ) datav;
unsigned int i, j;
j = (context->count[0] >> 3) & 63;
@@ -146,14 +146,16 @@ void hb_SHA1_Update(SHA_CTX *context, const void *datav, unsigned int len) {
void hb_SHA1_Final(sha1_byte digest[SHA1_DIGEST_LENGTH], SHA_CTX *context) {
sha1_quadbyte i;
sha1_byte finalcount[8];
sha1_byte str1[ 1 ] = { '\x80' };
sha1_byte str2[ 1 ] = { '\0' };
for (i = 0; i < 8; i++) {
finalcount[i] = (sha1_byte)((context->count[(i >= 4 ? 0 : 1)]
>> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
}
hb_SHA1_Update(context, (const sha1_byte *)"\x80", 1);
hb_SHA1_Update(context, str1, 1);
while ((context->count[0] & 504) != 448) {
hb_SHA1_Update(context, (const sha1_byte *)"\0", 1);
hb_SHA1_Update(context, str2, 1);
}
/* Should cause a SHA1_Transform() */
hb_SHA1_Update(context, finalcount, 8);

2
harbour/src/rtl/sha1.h
View File

@@ -67,7 +67,7 @@ typedef struct _SHA_CTX {
#ifndef NOPROTO
void hb_SHA1_Init(SHA_CTX *context);
void hb_SHA1_Update(SHA_CTX *context, const void *data, unsigned int len);
void hb_SHA1_Update(SHA_CTX *context, void *data, unsigned int len);
void hb_SHA1_Final(sha1_byte digest[SHA1_DIGEST_LENGTH], SHA_CTX* context);
#else
void hb_SHA1_Init();