diff options
| author | Mattias Andrée <m@maandree.se> | 2026-05-14 22:20:02 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-05-14 22:20:02 +0200 |
| commit | f07a9f80fb6f3099d75534c1e64f448d4b397931 (patch) | |
| tree | 30ebf4afafb0e66226fa7f642db083341c8c96e4 /librecrypt_realise_salts.c | |
| parent | librecrypt.h: add @since (diff) | |
| download | librecrypt-f07a9f80fb6f3099d75534c1e64f448d4b397931.tar.gz librecrypt-f07a9f80fb6f3099d75534c1e64f448d4b397931.tar.bz2 librecrypt-f07a9f80fb6f3099d75534c1e64f448d4b397931.tar.xz | |
Fix minor errors in the test and check that we are not writing out of bounds
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rw-r--r-- | librecrypt_realise_salts.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/librecrypt_realise_salts.c b/librecrypt_realise_salts.c index 195afaf..8a4b769 100644 --- a/librecrypt_realise_salts.c +++ b/librecrypt_realise_salts.c @@ -270,7 +270,9 @@ main(void) EXPECT(librecrypt_realise_salts(NULL, 0u, ALGO"*"LARGE"$", &saltgen, &saltbyte) == -1); EXPECT(errno == ERANGE); + CANARY_FILL(buf); EXPECT(librecrypt_realise_salts(buf, sizeof(ALGO) - 1u, ALGO"*3$", &saltfail, NULL) == (ssize_t)sizeof(ALGO"$") - 1 + 4); + CANARY_CHECK(buf, sizeof(ALGO) - 1u); errno = 0; EXPECT(librecrypt_realise_salts(buf, sizeof(buf), ALGO"*3$", &saltfail, NULL) == -1); EXPECT(errno == EDOM); @@ -293,13 +295,15 @@ main(void) EXPECT(librecrypt_realise_salts(NULL, 0u, conf, &saltgen, &saltbyte) == -1); EXPECT(errno == ERANGE); - memset(buf, 99, sizeof(buf)); - memset(buf2, 99, sizeof(buf2)); + CANARY_FILL(buf); + CANARY_FILL(buf2); EXPECT(librecrypt_realise_salts(buf, sizeof(buf), ALGO"*30$", NULL, NULL) == (ssize_t)sizeof(ALGO"$") - 1 + 40); EXPECT(librecrypt_realise_salts(buf2, sizeof(buf2), ALGO"*30$", NULL, NULL) == (ssize_t)sizeof(ALGO"$") - 1 + 40); EXPECT(!buf[sizeof(ALGO"$") - 1u + 40u]); EXPECT(!buf2[sizeof(ALGO"$") - 1u + 40u]); EXPECT(memcmp(buf, buf2, sizeof(ALGO"$") - 1u + 40u)); + CANARY_CHECK(buf, sizeof(ALGO"$") + 40u); + CANARY_CHECK(buf2, sizeof(ALGO"$") + 40u); #endif STOP_RESOURCE_TEST(); |