Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Randomize hash key on startup and rename to TOMO_HASH_KEY.

Browse Source
This commit is contained in:
Bruce Hill 2024-07-04 16:46:24 -04:00
parent dfb7bb1984
commit 78960b1461
9 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtins/array.c
View File

@ -426,7 +426,7 @@ public uint32_t Array$hash(const array_t *arr, const TypeInfo *type)
for (int64_t i = 0; i < arr->length; i++) {
if (p >= end) {
uint32_t chunk_hash;
halfsiphash(&hash_batch, sizeof(hash_batch), TOMO_HASH_VECTOR, (uint8_t*)&chunk_hash, sizeof(chunk_hash));
halfsiphash(&hash_batch, sizeof(hash_batch), TOMO_HASH_KEY, (uint8_t*)&chunk_hash, sizeof(chunk_hash));
p = hash_batch;
*(uint32_t*)p = chunk_hash;
p += sizeof(uint32_t);
@ -434,7 +434,7 @@ public uint32_t Array$hash(const array_t *arr, const TypeInfo *type)
memcpy((p += item_size), arr->data + i*arr->stride, item_size);
}
uint32_t hash;
halfsiphash(&hash_batch, ((int64_t)p) - ((int64_t)hash_batch), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(&hash_batch, ((int64_t)p) - ((int64_t)hash_batch), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
} else {
uint32_t hash_batch[16] = {(uint32_t)arr->length};
@ -442,14 +442,14 @@ public uint32_t Array$hash(const array_t *arr, const TypeInfo *type)
for (int64_t i = 0; i < arr->length; i++) {
if (p >= end) {
uint64_t chunk_hash;
halfsiphash(&hash_batch, sizeof(hash_batch), TOMO_HASH_VECTOR, (uint8_t*)&chunk_hash, sizeof(chunk_hash));
halfsiphash(&hash_batch, sizeof(hash_batch), TOMO_HASH_KEY, (uint8_t*)&chunk_hash, sizeof(chunk_hash));
p = hash_batch;
*(p++) = chunk_hash;
}
*(p++) = generic_hash(arr->data + i*arr->stride, item);
}
uint32_t hash;
halfsiphash(&hash_batch, ((int64_t)p) - ((int64_t)hash_batch), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(&hash_batch, ((int64_t)p) - ((int64_t)hash_batch), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
}
}

2
builtins/c_string.c
View File

@ -38,7 +38,7 @@ public uint32_t CString$hash(const char **c_str)
if (!*c_str) return 0;
uint32_t hash;
halfsiphash(*c_str, strlen(*c_str), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(*c_str, strlen(*c_str), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
}

12
builtins/functions.c
View File

@ -7,6 +7,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <sys/param.h>
#include <sys/random.h>
#include <uninorm.h>
#include <unistd.h>
@ -22,14 +23,17 @@
#include "types.h"
#include "util.h"
public const char *TOMO_HASH_VECTOR = "tomo hash vector ---------------------------------------------";
public uint8_t TOMO_HASH_KEY[8] = {0};
public void tomo_init(void)
{
GC_INIT();
USE_COLOR = getenv("COLOR") ? strcmp(getenv("COLOR"), "1") == 0 : isatty(STDOUT_FILENO);
srand(arc4random_uniform(UINT32_MAX));
srand48(arc4random_uniform(UINT32_MAX));
getrandom(TOMO_HASH_KEY, sizeof(TOMO_HASH_KEY), 0);
unsigned int seed;
getrandom(&seed, sizeof(seed), 0);
srand(seed);
srand48(seed);
}
public void fail(CORD fmt, ...)
@ -98,7 +102,7 @@ public uint32_t generic_hash(const void *obj, const TypeInfo *type)
default: {
hash_data:;
uint32_t hash;
halfsiphash((void*)obj, type->size, TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash((void*)obj, type->size, TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
}
}

2
builtins/functions.h
View File

@ -8,7 +8,7 @@
#include "types.h"
extern const char *TOMO_HASH_VECTOR;
extern uint8_t TOMO_HASH_KEY[8];
void tomo_init(void);

2
builtins/pointer.c
View File

@ -71,7 +71,7 @@ public bool Pointer$equal(const void *x, const void *y, const TypeInfo *type) {
public uint32_t Pointer$hash(const void *x, const TypeInfo *type) {
(void)type;
uint32_t hash;
halfsiphash(x, sizeof(void*), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(x, sizeof(void*), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
}

2
builtins/table.c
View File

@ -500,7 +500,7 @@ public uint32_t Table$hash(const table_t *t, const TypeInfo *type)
default_hash,
};
uint32_t hash;
halfsiphash(&components, sizeof(components), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(&components, sizeof(components), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
return hash;
}

2
builtins/text.c
View File

@ -123,7 +123,7 @@ public uint32_t Text$hash(const CORD *cord)
uint8_t *normalized = _normalize(*cord, buf, &norm_len);
uint32_t hash;
halfsiphash(normalized, norm_len, TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));
halfsiphash(normalized, norm_len, TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));
if (normalized != buf) free(normalized);
return hash;
}

4
enums.c
View File

@ -124,7 +124,7 @@ static CORD compile_hash_method(env_t *env, ast_t *ast)
return CORD_all("static uint32_t ", full_name, "$hash(const ", full_name, "_t *obj, const TypeInfo *info) {\n"
"(void)info;\n"
"uint32_t hash;\n"
"halfsiphash(&obj->$tag, sizeof(obj->$tag), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));\n"
"halfsiphash(&obj->$tag, sizeof(obj->$tag), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));\n"
"return hash;"
"\n}\n");
}
@ -144,7 +144,7 @@ static CORD compile_hash_method(env_t *env, ast_t *ast)
}
hash_func = CORD_all(hash_func, "}\n"
"uint32_t hash;\n"
"halfsiphash(&hashes, sizeof(hashes), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));\n"
"halfsiphash(&hashes, sizeof(hashes), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));\n"
"return hash;\n}\n");
return hash_func;
}

2
structs.c
View File

@ -109,7 +109,7 @@ static CORD compile_hash_method(env_t *env, ast_t *ast)
}
hash_func = CORD_all(hash_func, "};\n"
"uint32_t hash;\n"
"halfsiphash(&field_hashes, sizeof(field_hashes), TOMO_HASH_VECTOR, (uint8_t*)&hash, sizeof(hash));\n"
"halfsiphash(&field_hashes, sizeof(field_hashes), TOMO_HASH_KEY, (uint8_t*)&hash, sizeof(hash));\n"
"return hash;\n}\n");
return hash_func;
}