summaryrefslogtreecommitdiffstats
path: root/chksum.c
diff options
context:
space:
mode:
Diffstat (limited to 'chksum.c')
-rw-r--r--chksum.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/chksum.c b/chksum.c
index 26c335fd..f05454fc 100644
--- a/chksum.c
+++ b/chksum.c
@@ -73,15 +73,15 @@
*/
static val chksum_ensure_buf(val self, val buf_in,
- val len, unsigned char **phash,
+ ucnum len, unsigned char **phash,
val hash_name)
{
if (null_or_missing_p(buf_in)) {
- *phash = chk_malloc(c_unum(len, self));
- return make_owned_buf(len, *phash);
+ *phash = chk_malloc(len);
+ return make_owned_buf(len, *phash, self);
} else {
*phash = buf_get(buf_in, self);
- if (lt(length_buf(buf_in), len))
+ if (buf_in->b.len < len)
uw_throwf(error_s, lit("~s: buffer ~s too small for ~a hash"),
self, buf_in, hash_name, nao);
return buf_in;
@@ -148,7 +148,7 @@ val sha1_stream(val stream, val nbytes, val buf_in)
val self = lit("sha1-stream");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(SHA1_DIGEST_LENGTH),
+ SHA1_DIGEST_LENGTH,
&hash, lit("SHA-1"));
sha1_stream_impl(stream, nbytes, hash, self);
return buf;
@@ -166,11 +166,11 @@ static void sha1_szmax_upd(SHA1_t *pctx, mem_t *data, ucnum len)
SHA1_update(pctx, data, len);
}
-static void sha1_buf(val buf, unsigned char *hash, val self)
+static void sha1_buf(val buf, unsigned char *hash)
{
SHA1_t ctx;
SHA1_init(&ctx);
- sha1_szmax_upd(&ctx, buf->b.data, c_unum(buf->b.len, self));
+ sha1_szmax_upd(&ctx, buf->b.data, buf->b.len);
SHA1_final(&ctx, hash);
}
@@ -189,7 +189,7 @@ val sha1(val obj, val buf_in)
val self = lit("sha1");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(SHA1_DIGEST_LENGTH),
+ SHA1_DIGEST_LENGTH,
&hash, lit("SHA-1"));
switch (type(obj)) {
case STR:
@@ -198,7 +198,7 @@ val sha1(val obj, val buf_in)
sha1_str(obj, hash, self);
return buf;
case BUF:
- sha1_buf(obj, hash, self);
+ sha1_buf(obj, hash);
return buf;
case COBJ:
if (streamp(obj)) {
@@ -252,7 +252,7 @@ val sha1_hash(val ctx, val obj)
}
break;
case BUF:
- sha1_szmax_upd(pctx, obj->b.data, c_unum(obj->b.len, self));
+ sha1_szmax_upd(pctx, obj->b.data, obj->b.len);
break;
case CHR:
utf8_encode(c_ch(obj), sha1_utf8_byte_callback,
@@ -290,7 +290,7 @@ val sha1_end(val ctx, val buf_in)
unsigned char *hash;
SHA1_t *pctx = coerce(SHA1_t *,
cobj_handle(self, ctx, sha1_ctx_cls));
- val buf = chksum_ensure_buf(self, buf_in, num_fast(SHA1_DIGEST_LENGTH),
+ val buf = chksum_ensure_buf(self, buf_in, SHA1_DIGEST_LENGTH,
&hash, lit("SHA-1"));
SHA1_final(pctx, hash);
SHA1_init(pctx);
@@ -354,7 +354,7 @@ val sha256_stream(val stream, val nbytes, val buf_in)
val self = lit("sha256-stream");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(SHA256_DIGEST_LENGTH),
+ SHA256_DIGEST_LENGTH,
&hash, lit("SHA-256"));
sha256_stream_impl(stream, nbytes, hash, self);
return buf;
@@ -372,11 +372,11 @@ static void sha256_szmax_upd(SHA256_t *pctx, mem_t *data, ucnum len)
SHA256_update(pctx, data, len);
}
-static void sha256_buf(val buf, unsigned char *hash, val self)
+static void sha256_buf(val buf, unsigned char *hash)
{
SHA256_t ctx;
SHA256_init(&ctx);
- sha256_szmax_upd(&ctx, buf->b.data, c_unum(buf->b.len, self));
+ sha256_szmax_upd(&ctx, buf->b.data, buf->b.len);
SHA256_final(&ctx, hash);
}
@@ -395,7 +395,7 @@ val sha256(val obj, val buf_in)
val self = lit("sha256");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(SHA256_DIGEST_LENGTH),
+ SHA256_DIGEST_LENGTH,
&hash, lit("SHA-256"));
switch (type(obj)) {
case STR:
@@ -404,7 +404,7 @@ val sha256(val obj, val buf_in)
sha256_str(obj, hash, self);
return buf;
case BUF:
- sha256_buf(obj, hash, self);
+ sha256_buf(obj, hash);
return buf;
case COBJ:
if (streamp(obj)) {
@@ -458,7 +458,7 @@ val sha256_hash(val ctx, val obj)
}
break;
case BUF:
- sha256_szmax_upd(pctx, obj->b.data, c_unum(obj->b.len, self));
+ sha256_szmax_upd(pctx, obj->b.data, obj->b.len);
break;
case CHR:
utf8_encode(c_ch(obj), sha256_utf8_byte_callback,
@@ -496,7 +496,7 @@ val sha256_end(val ctx, val buf_in)
unsigned char *hash;
SHA256_t *pctx = coerce(SHA256_t *,
cobj_handle(self, ctx, sha256_ctx_cls));
- val buf = chksum_ensure_buf(self, buf_in, num_fast(SHA256_DIGEST_LENGTH),
+ val buf = chksum_ensure_buf(self, buf_in, SHA256_DIGEST_LENGTH,
&hash, lit("SHA-256"));
SHA256_final(pctx, hash);
SHA256_init(pctx);
@@ -560,7 +560,7 @@ val md5_stream(val stream, val nbytes, val buf_in)
val self = lit("md5-stream");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(MD5_DIGEST_LENGTH),
+ MD5_DIGEST_LENGTH,
&hash, lit("MD5"));
md5_stream_impl(stream, nbytes, hash, self);
return buf;
@@ -578,11 +578,11 @@ static void md5_szmax_upd(MD5_t *pctx, mem_t *data, ucnum len)
MD5_update(pctx, data, len);
}
-static void md5_buf(val buf, unsigned char *hash, val self)
+static void md5_buf(val buf, unsigned char *hash)
{
MD5_t ctx;
MD5_init(&ctx);
- md5_szmax_upd(&ctx, buf->b.data, c_unum(buf->b.len, self));
+ md5_szmax_upd(&ctx, buf->b.data, buf->b.len);
MD5_final(&ctx, hash);
}
@@ -601,7 +601,7 @@ val md5(val obj, val buf_in)
val self = lit("md5");
unsigned char *hash;
val buf = chksum_ensure_buf(self, buf_in,
- num_fast(MD5_DIGEST_LENGTH),
+ MD5_DIGEST_LENGTH,
&hash, lit("MD5"));
switch (type(obj)) {
case STR:
@@ -610,7 +610,7 @@ val md5(val obj, val buf_in)
md5_str(obj, hash, self);
return buf;
case BUF:
- md5_buf(obj, hash, self);
+ md5_buf(obj, hash);
return buf;
case COBJ:
if (streamp(obj)) {
@@ -664,7 +664,7 @@ val md5_hash(val ctx, val obj)
}
break;
case BUF:
- md5_szmax_upd(pctx, obj->b.data, c_unum(obj->b.len, self));
+ md5_szmax_upd(pctx, obj->b.data, obj->b.len);
break;
case CHR:
utf8_encode(c_ch(obj), md5_utf8_byte_callback,
@@ -702,7 +702,7 @@ val md5_end(val ctx, val buf_in)
unsigned char *hash;
MD5_t *pctx = coerce(MD5_t *,
cobj_handle(self, ctx, md5_ctx_cls));
- val buf = chksum_ensure_buf(self, buf_in, num_fast(MD5_DIGEST_LENGTH),
+ val buf = chksum_ensure_buf(self, buf_in, MD5_DIGEST_LENGTH,
&hash, lit("MD5"));
MD5_final(pctx, hash);
MD5_init(pctx);
@@ -754,7 +754,7 @@ val crc32_stream(val stream, val nbytes, val init)
static val crc32_buf(val buf, val init, val self)
{
- ucnum len = c_unum(buf->b.len, self);
+ ucnum len = buf->b.len;
mem_t *data = buf->b.data;
const size_t szmax = convert(size_t, -1) / 4 + 1;
u32_t crc = if3(missingp(init), 0, c_u32(init, self));
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 15:04:11 +0000