(ripemd160_init): Use memcpy for initializing the state vector.

(COMPRESS): New macro.
(ripemd160_update): Use MD_UPDATE.
(ripemd160_digest): Inline ripemd160_final processing. Use MD_PAD
and _nettle_write_le32.
(ripemd160_final): Deleted function.

Rev: nettle/ripemd160.c:1.3

diff --git a/ripemd160.c b/ripemd160.c
index 15b1e44744b2704cfd48386095231bbd5beec031..3f490046ca8dd512681a9d8139ecfa3670e122c5 100644 (file)
--- a/ripemd160.c
+++ b/ripemd160.c
@@ -141,100 +141,48 @@
 void
 ripemd160_init(struct ripemd160_ctx *ctx)
 {
-  ctx->digest[0] = 0x67452301;
-  ctx->digest[1] = 0xEFCDAB89;
-  ctx->digest[2] = 0x98BADCFE;
-  ctx->digest[3] = 0x10325476;
-  ctx->digest[4] = 0xC3D2E1F0;
-  memset(&ctx->block, 0, sizeof(ctx->block));
-  ctx->nblocks = 0;
+  static const uint32_t iv[_RIPEMD160_DIGEST_LENGTH] =
+    {
+      0x67452301,
+      0xEFCDAB89,
+      0x98BADCFE,
+      0x10325476,
+      0xC3D2E1F0,
+    };
+  memcpy(ctx->state, iv, sizeof(ctx->state));
+  ctx->count_low = ctx->count_high = 0;
   ctx->index = 0;
 }
 
+#define COMPRESS(ctx, data) (_nettle_ripemd160_compress((ctx)->state, (data)))
+
 /* Update the message digest with the contents
  * of DATA with length LENGTH.
  */
 void
 ripemd160_update(struct ripemd160_ctx *ctx, unsigned length, const uint8_t *data)
 {
-  if(ctx->index == 64)  /* flush the buffer */
-    {
-      _nettle_ripemd160_compress(ctx->digest, ctx->block);
-      ctx->index = 0;
-      ctx->nblocks++;
-    }
-  if(!data)
-    return;
-  if(ctx->index)
-    {
-      for(; length && ctx->index < 64; length--)
-       ctx->block[ctx->index++] = *data++;
-      ripemd160_update(ctx, 0, NULL);
-      if(!length)
-       return;
-    }
-
-  while( length >= 64 )
-    {
-      _nettle_ripemd160_compress(ctx->digest, data);
-      ctx->index = 0;
-      ctx->nblocks++;
-      length -= 64;
-      data += 64;
-    }
-  for(; length && ctx->index < 64; length--)
-    ctx->block[ctx->index++] = *data++;
+  MD_UPDATE(ctx, length, data, COMPRESS, MD_INCR(ctx));
 }
 
-/* The routine terminates the computation */
-static void
-ripemd160_final(struct ripemd160_ctx *ctx)
+void
+ripemd160_digest(struct ripemd160_ctx *ctx, unsigned length, uint8_t *digest)
 {
-  uint32_t t, msb, lsb;
-  uint8_t *p;
+  uint32_t high, low;
 
-  ripemd160_update(ctx, 0, NULL); /* flush */;
+  assert(length <= RIPEMD160_DIGEST_SIZE);
 
-  t = ctx->nblocks;
-  /* multiply by 64 to make a byte count */
-  lsb = t << 6;
-  msb = t >> 26;
-  /* add the count */
-  t = lsb;
-  if( (lsb += ctx->index) < t )
-    msb++;
-  /* multiply by 8 to make a bit count */
-  t = lsb;
-  lsb <<= 3;
-  msb <<= 3;
-  msb |= t >> 29;
+  MD_PAD(ctx, 8, COMPRESS);
 
-  if( ctx->index < 56 )  /* enough room */
-    {
-      ctx->block[ctx->index++] = 0x80; /* pad */
-      while( ctx->index < 56 )
-       ctx->block[ctx->index++] = 0;  /* pad */
-    }
-  else  /* need one extra block */
-    {
-      ctx->block[ctx->index++] = 0x80; /* pad character */
-      while( ctx->index < 64 )
-       ctx->block[ctx->index++] = 0;
-      ripemd160_update(ctx, 0, NULL);  /* flush */;
-      memset(ctx->block, 0, 56 ); /* fill next block with zeroes */
-    }
+  /* There are 2^9 bits in one block */
+  high = (ctx->count_high << 9) | (ctx->count_low >> 23);
+  low = (ctx->count_low << 9) | (ctx->index << 3);
+                                                                       \
   /* append the 64 bit count */
-  LE_WRITE_UINT32(ctx->block + 56, lsb);
-  LE_WRITE_UINT32(ctx->block + 60, msb);
-  _nettle_ripemd160_compress(ctx->digest, ctx->block);
-}
-
-void
-ripemd160_digest(struct ripemd160_ctx *ctx, unsigned length, uint8_t *digest)
-{
-  assert(length <= RIPEMD160_DIGEST_SIZE);
+  LE_WRITE_UINT32(ctx->block + 56, low);
+  LE_WRITE_UINT32(ctx->block + 60, high);
+  _nettle_ripemd160_compress(ctx->state, ctx->block);
 
-  ripemd160_final(ctx);
-  _nettle_write_le32(length, digest, ctx->digest);
+  _nettle_write_le32(length, digest, ctx->state);
   ripemd160_init(ctx);
 }