Tk Library Source Code

Artifact 9a1df96d581584ef7cd264dd1d98138edb4ea8fb:

Index: sha1.tcl
===================================================================
RCS file: /cvsroot/tcllib/tcllib/modules/sha1/sha1.tcl,v
retrieving revision 1.16
diff -u -r1.16 sha1.tcl
--- sha1.tcl	24 Feb 2005 03:25:50 -0000	1.16
+++ sha1.tcl	23 Sep 2005 17:55:33 -0000
@@ -280,7 +280,7 @@
         for {set t 16} {$t < 80} {incr t} {
             set x [expr {[lindex $W [incr t3]] ^ [lindex $W [incr t8]] ^ \
                              [lindex $W [incr t14]] ^ [lindex $W [incr t16]]}]
-            lappend W [expr {($x << 1) | (($x >> 31) & 1)}]
+            lappend W [expr {int(($x << 1) | (($x >> 31) & 1))}]
         }
         
         # FIPS 180-1: 7c: Copy hash state.
@@ -297,48 +297,48 @@
 
         # Round 1: ft(B,C,D) = (B & C) | (~B & D) ( 0 <= t <= 19)
         for {set t 0} {$t < 20} {incr t} {
-            set TEMP [expr {(($A << 5) | (($A >> 27) & 0x1f)) + \
+            set TEMP [expr {int((($A << 5) | (($A >> 27) & 0x1f)) + \
                                 ($D ^ ($B & ($C ^ $D))) \
-                                + $E + [lindex $W $t] + 0x5a827999}]
+                                + $E + [lindex $W $t] + 0x5a827999)}]
             set E $D
             set D $C
-            set C [expr {($B << 30) | (($B >> 2) & 0x3fffffff)}]
+            set C [expr {int(($B << 30) | (($B >> 2) & 0x3fffffff))}]
             set B $A
             set A $TEMP
         }
 
         # Round 2: ft(B,C,D) = (B ^ C ^ D) ( 20 <= t <= 39)
         for {} {$t < 40} {incr t} {
-            set TEMP [expr {(($A << 5) | (($A >> 27) & 0x1f)) + \
+            set TEMP [expr {int((($A << 5) | (($A >> 27) & 0x1f)) + \
                                 ($B ^ $C ^ $D) \
-                                + $E + [lindex $W $t] + 0x6ed9eba1}]
+                                + $E + [lindex $W $t] + 0x6ed9eba1)}]
             set E $D
             set D $C
-            set C [expr {($B << 30) | (($B >> 2) & 0x3fffffff)}]
+            set C [expr {int(($B << 30) | (($B >> 2) & 0x3fffffff))}]
             set B $A
             set A $TEMP
         }
 
         # Round 3: ft(B,C,D) = ((B & C) | (B & D) | (C & D)) ( 40 <= t <= 59)
         for {} {$t < 60} {incr t} {
-            set TEMP [expr {(($A << 5) | (($A >> 27) & 0x1f)) + \
+            set TEMP [expr {int((($A << 5) | (($A >> 27) & 0x1f)) + \
                                 (($B & $C) | ($D & ($B | $C))) \
-                                + $E + [lindex $W $t] + 0x8f1bbcdc}]
+                                + $E + [lindex $W $t] + 0x8f1bbcdc)}]
             set E $D
             set D $C
-            set C [expr {($B << 30) | (($B >> 2) & 0x3fffffff)}]
+            set C [expr {int(($B << 30) | (($B >> 2) & 0x3fffffff))}]
             set B $A
             set A $TEMP
          }
 
         # Round 4: ft(B,C,D) = (B ^ C ^ D) ( 60 <= t <= 79)
         for {} {$t < 80} {incr t} {
-            set TEMP [expr {(($A << 5) | (($A >> 27) & 0x1f)) + \
+            set TEMP [expr {int((($A << 5) | (($A >> 27) & 0x1f)) + \
                                 ($B ^ $C ^ $D) \
-                                + $E + [lindex $W $t] + 0xca62c1d6}]
+                                + $E + [lindex $W $t] + 0xca62c1d6)}]
             set E $D
             set D $C
-            set C [expr {($B << 30) | (($B >> 2) & 0x3fffffff)}]
+            set C [expr {int(($B << 30) | (($B >> 2) & 0x3fffffff))}]
             set B $A
             set A $TEMP
         }