diff options
Diffstat (limited to 'librecrypt_realise_salts.c')
| -rw-r--r-- | librecrypt_realise_salts.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/librecrypt_realise_salts.c b/librecrypt_realise_salts.c index eca3c4a..64d65c4 100644 --- a/librecrypt_realise_salts.c +++ b/librecrypt_realise_salts.c @@ -5,7 +5,8 @@ ssize_t librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *settings, - ssize_t (*rng)(void *out, size_t n, void *user), void *user, void *reserved) + ssize_t (*rng)(void *out, size_t n, void *user), void *user, + LIBRECRYPT_CONTEXT *ctx) { const char *lut; char pad; @@ -13,12 +14,6 @@ librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *set size_t i, min, nasterisks, prefix, ret = 0u; size_t count, digit, q, r, left, mid, right; - /* Ensure the reserved parameter is NULL */ - if (reserved != NULL) { - errno = EINVAL; - return -1; - } - /* If we are doing output, it should be NUL-terminated */ if (size) { nul_term = 1; @@ -46,7 +41,7 @@ librecrypt_realise_salts(char *restrict out_buffer, size_t size, const char *set } /* Get binary data encoding format */ - lut = librecrypt_get_encoding(settings, prefix, &pad, &strict_pad, 0, reserved); + lut = librecrypt_get_encoding(settings, prefix, &pad, &strict_pad, 0, ctx); if (!lut) return -1; pad = strict_pad ? pad : '\0'; @@ -209,7 +204,6 @@ main(void) char buf[1024], buf2[1024], conf[128]; size_t i; int r; - char reserved[1] = {0}; SET_UP_ALARM(); INIT_RESOURCE_TEST(); @@ -232,10 +226,6 @@ main(void) #if defined(ALGO) - errno = 0; - EXPECT(librecrypt_realise_salts(NULL, 0u, ALGO, NULL, NULL, reserved) == -1); - EXPECT(errno == EINVAL); - # define CHECK(IN, OUT)\ do {\ EXPECT(librecrypt_realise_salts(NULL, 0u, (IN), NULL, NULL, NULL) == (ssize_t)sizeof(OUT) - 1);\ |