From 3530a2a0e79ad45de60461b367d528d59b522e8e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 19 Nov 2010 13:50:19 +0000
Subject: [PATCH] 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.

---
 harbour/ChangeLog      | 14 ++++++++++----
 harbour/src/rtl/sha1.c | 12 +++++++-----
 harbour/src/rtl/sha1.h |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d741e56c98..e9cf403836 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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)
diff --git a/harbour/src/rtl/sha1.c b/harbour/src/rtl/sha1.c
index 66b5c15267..53604317d7 100644
--- a/harbour/src/rtl/sha1.c
+++ b/harbour/src/rtl/sha1.c
@@ -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);
diff --git a/harbour/src/rtl/sha1.h b/harbour/src/rtl/sha1.h
index dbfefc6071..ad5141bbaa 100644
--- a/harbour/src/rtl/sha1.h
+++ b/harbour/src/rtl/sha1.h
@@ -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();