key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / symm / mars-mktab.c

diff --git a/symm/mars-mktab.c b/symm/mars-mktab.c
index d43f7c0..53ce0f7 100644 (file)
--- a/symm/mars-mktab.c
+++ b/symm/mars-mktab.c
@@ -154,10 +154,10 @@ void sha_hash(sha_ctx *ctx, const void *buf, size_t sz)
 
   {
     uint32 _l = ((uint32) ((_bsz) & MASK32));
-    uint32 _h = ((_bsz & ~MASK32) >> 16) >> 16;
+    uint32 _h = ((_bsz & ~(size_t)MASK32) >> 16) >> 16;
     _bctx->nh += _h;
     _bctx->nl += _l;
-    if (_bctx->nl < _l || _bctx->nl & ~MASK32)
+    if (_bctx->nl < _l || _bctx->nl & ~(uint32)MASK32)
       _bctx->nh++;
   }
   if (_bctx->off + _bsz < SHA_BUFSZ) {