Changeset 299

Timestamp:

10/13/06 17:59:32 (2 years ago)

Author:

krobillard

Message:

Thune - Added 'sha1 checksum.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (1 diff)
• files.c (modified) (1 diff)
• support/sha1.c (added)
• urlan.c (modified) (1 diff)
• urlan_atoms.h (modified) (1 diff)

trunk/thune/doc/UserManual

@@ -459 +459 @@
 to-hex       (int -- int)            Flag integer to display in hexadecimal.
 to-dec       (int -- int)            Flag integer to display in decimal.
+checksum     (bin type -- digest)    Compute 'crc16 or 'sha1 checksum.
 ===========  ======================  ======================
 

trunk/thune/files.c

@@ -744 +744 @@
 
 
-// (binary -- int)
+#define SHA1HANDSOFF    1
+#include <support/sha1.c>
+
+
+// (binary type -- int)
 UR_CALL( uc_checksum )
 {
+    UCell* res;
     char* cpA;
     char* cpB;
 
-    UR_CALL_UNUSED_TH
-
-    if( ur_binarySlice( tos, &cpA, &cpB ) )
-    {
-        ur_initType(tos, UT_INT);
-        ur_int(tos) = checksum_crc16( (uint8_t*) cpA, cpB - cpA );
+    if( ! ur_isAWord( tos ) )
+        goto typeErr;
+
+    UR_S_DROP;
+    res = UR_TOS;
+
+    if( ur_binarySlice( res, &cpA, &cpB ) )
+    {
+        switch( ur_atom(tos) )
+        {
+            case UR_ATOM_CRC16:
+                ur_initType(res, UT_INT);
+                ur_int(res) = checksum_crc16( (uint8_t*) cpA, cpB - cpA );
+                return;
+
+            case UR_ATOM_SHA1:
+            {
+                SHA1_CTX context;
+                UIndex binN;
+                UBinary* bin;
+
+                binN = ur_makeBinary( 20 );
+                bin = ur_binPtr( binN );
+                bin->used = 20;
+
+                SHA1Init( &context );
+                SHA1Update( &context, (uint8_t*) cpA, cpB - cpA );
+                SHA1Final( bin->ptr.b, &context );
+                
+                ur_initType(res, UT_BINARY);
+                ur_setSeries(res, binN, 0);
+            }
+                return;
+        }
+        goto typeErr;
     }
     else
     {
-        ur_setNone(tos);
-    }
+        ur_throwErr( UR_ERR_DATATYPE, "checksum expected binary!" );
+        return;
+    }
+
+typeErr:
+
+    ur_throwErr( UR_ERR_DATATYPE, "checksum expected type 'crc16 or 'sha1" );
 }
 

trunk/thune/urlan.c

@@ -269 +269 @@
     FIXED_ATOM( "append", 6, UR_ATOM_APPEND )
 
+    // Checksum types
+    FIXED_ATOM( "crc16",  5, UR_ATOM_CRC16 )
+    FIXED_ATOM( "sha1",   4, UR_ATOM_SHA1 )
+
     FIXED_ATOM( "reader-macros", 13, UR_ATOM_READER_MACROS )
 

trunk/thune/urlan_atoms.h

@@ -42 +42 @@
 #define UR_ATOM_WRITE           105
 #define UR_ATOM_APPEND          106
-#define UR_ATOM_READER_MACROS           107
+#define UR_ATOM_CRC16           107
+#define UR_ATOM_SHA1            108
+#define UR_ATOM_READER_MACROS           109