*/ \
\
void pre##_countergetiv(const pre##_counterctx *ctx, void *iv) \
-{ \
- BLKC_STORE(PRE, iv, ctx->n); \
-} \
+ { BLKC_STORE(PRE, iv, ctx->c); } \
\
/* --- @pre_countersetiv@ --- * \
* \
*/ \
\
void pre##_countersetiv(pre##_counterctx *ctx, const void *iv) \
-{ \
- BLKC_LOAD(PRE, ctx->n, iv); \
- ctx->off = PRE##_BLKSZ; \
-} \
+ { BLKC_LOAD(PRE, ctx->c, iv); ctx->off = PRE##_BLKSZ; } \
\
/* --- @pre_counterbdry@ --- * \
* \
*/ \
\
void pre##_counterbdry(pre##_counterctx *ctx) \
-{ \
- BLKC_STEP(PRE, ctx->n); \
- ctx->off = PRE##_BLKSZ; \
-} \
+ { BLKC_STEP(PRE, ctx->c); ctx->off = PRE##_BLKSZ; } \
\
/* --- @pre_countersetkey@ --- * \
* \
*/ \
\
void pre##_countersetkey(pre##_counterctx *ctx, const pre##_ctx *k) \
-{ \
- ctx->ctx = *k; \
-} \
+ { ctx->ctx = *k; } \
\
/* --- @pre_counterinit@ --- * \
* \
const void *iv) \
{ \
static const octet zero[PRE##_BLKSZ] = { 0 }; \
+ \
pre##_init(&ctx->ctx, key, sz); \
pre##_countersetiv(ctx, iv ? iv : zero); \
} \
const octet *s = src; \
octet *d = dest; \
unsigned off = ctx->off; \
+ uint32 t[PRE##_BLKSZ/4], u[PRE##_BLKSZ/4]; \
+ octet y; \
\
/* --- Empty blocks are trivial --- */ \
\
- if (!sz) \
- return; \
+ if (!sz) return; \
\
/* --- If I can deal with the block from my buffer, do that --- */ \
\
- if (sz < PRE##_BLKSZ - off) \
- goto small; \
+ if (sz < PRE##_BLKSZ - off) goto small; \
\
/* --- Finish off what's left in my buffer --- */ \
\
- if (!d) \
- sz -= PRE##_BLKSZ - off; \
- else { \
- while (off < PRE##_BLKSZ) { \
- register octet x = s ? *s++ : 0; \
- *d++ = ctx->buf[off++] ^ x; \
- sz--; \
- } \
- } \
+ if (!d) sz -= PRE##_BLKSZ - off; \
+ else while (off < PRE##_BLKSZ) \
+ { y = s ? *s++ : 0; *d++ = ctx->b[off++] ^ y; sz--; } \
\
/* --- Main encryption loop --- */ \
\
- { \
- uint32 n[PRE##_BLKSZ / 4]; \
- \
- for (;;) { \
- pre##_eblk(&ctx->ctx, ctx->n, n); \
- BLKC_STEP(PRE, ctx->n); \
- if (sz < PRE##_BLKSZ) \
- break; \
- if (d) { \
- if (!s) \
- BLKC_STORE(PRE, d, n); \
- else { \
- uint32 x[PRE##_BLKSZ / 4]; \
- BLKC_LOAD(PRE, x, s); \
- BLKC_XSTORE(PRE, d, n, x); \
- s += PRE##_BLKSZ; \
- } \
- d += PRE##_BLKSZ; \
- } \
- sz -= PRE##_BLKSZ; \
+ for (;;) { \
+ pre##_eblk(&ctx->ctx, ctx->c, t); \
+ BLKC_STEP(PRE, ctx->c); \
+ if (sz < PRE##_BLKSZ) break; \
+ if (!d) /* do nothing */; \
+ else if (!s) { BLKC_STORE(PRE, d, t); d += PRE##_BLKSZ; } \
+ else { \
+ BLKC_LOAD(PRE, u, s); s += PRE##_BLKSZ; \
+ BLKC_XSTORE(PRE, d, t, u); d += PRE##_BLKSZ; \
} \
- \
- BLKC_STORE(PRE, ctx->buf, n); \
- off = 0; \
+ sz -= PRE##_BLKSZ; \
} \
\
+ BLKC_STORE(PRE, ctx->b, t); \
+ off = 0; \
+ \
/* --- Tidying up the tail end --- */ \
\
if (sz) { \
small: \
- if (!d) \
- off += sz; \
- else do { \
- register octet x = s ? *s++ : 0; \
- *d++ = ctx->buf[off++] ^ x; \
- sz--; \
- } while (sz); \
+ if (!d) off += sz; \
+ else do { y = s ? *s++ : 0; *d++ = ctx->b[off++] ^ y; sz--; } \
+ while (sz); \
} \
\
/* --- Done --- */ \
} \
\
static void gencrypt(gcipher *c, const void *s, void *t, size_t sz) \
-{ \
- gctx *g = (gctx *)c; \
- pre##_counterencrypt(&g->k, s, t, sz); \
-} \
+ { gctx *g = (gctx *)c; pre##_counterencrypt(&g->k, s, t, sz); } \
\
static void gdestroy(gcipher *c) \
-{ \
- gctx *g = (gctx *)c; \
- BURN(*g); \
- S_DESTROY(g); \
-} \
+ { gctx *g = (gctx *)c; BURN(*g); S_DESTROY(g); } \
\
static void gsetiv(gcipher *c, const void *iv) \
-{ \
- gctx *g = (gctx *)c; \
- pre##_countersetiv(&g->k, iv); \
-} \
+ { gctx *g = (gctx *)c; pre##_countersetiv(&g->k, iv); } \
\
static void gbdry(gcipher *c) \
-{ \
- gctx *g = (gctx *)c; \
- pre##_counterbdry(&g->k); \
-} \
+ { gctx *g = (gctx *)c; pre##_counterbdry(&g->k); } \
\
static const gcipher_ops gops = { \
&pre##_counter, \
} \
break; \
case GRAND_SEEDINT: \
- BLKC_SET(PRE, g->k.n, va_arg(ap, unsigned)); \
+ BLKC_SET(PRE, g->k.c, va_arg(ap, unsigned)); \
g->k.off = PRE##_BLKSZ; \
break; \
case GRAND_SEEDUINT32: \
- BLKC_SET(PRE, g->k.n, va_arg(ap, uint32)); \
+ BLKC_SET(PRE, g->k.c, va_arg(ap, uint32)); \
g->k.off = PRE##_BLKSZ; \
break; \
case GRAND_SEEDBLOCK: { \
} \
\
static void grfill(grand *r, void *p, size_t sz) \
-{ \
- grctx *g = (grctx *)r; \
- pre##_counterencrypt(&g->k, 0, p, sz); \
-} \
+ { grctx *g = (grctx *)r; pre##_counterencrypt(&g->k, 0, p, sz); } \
\
static const grand_ops grops = { \
name "-counter", \
#ifdef TEST_RIG
-#include <stdio.h>
-
-#include "daftstory.h"
+#include "modes-test.h"
/* --- @COUNTER_TEST@ --- *
*
#define COUNTER_TESTX(PRE, pre, name, fname) \
\
-/* --- Initial plaintext for the test --- */ \
+static pre##_ctx key; \
+static pre##_counterctx ctx; \
\
-static const octet text[] = TEXT; \
+static void pre##_counter_test_setup(const octet *k, size_t ksz) \
+ { pre##_init(&key, k, ksz); pre##_countersetkey(&ctx, &key); } \
\
-/* --- Key and IV to use --- */ \
+static void pre##_counter_test_reset(const octet *iv) \
+ { pre##_countersetiv(&ctx, iv); } \
\
-static const octet key[] = KEY; \
-static const octet iv[] = IV; \
+static void pre##_counter_test_enc(const octet *s, octet *d, size_t sz) \
+ { pre##_counterencrypt(&ctx, s, d, sz); } \
\
-/* --- Buffers for encryption and decryption output --- */ \
- \
-static octet ct[sizeof(text)]; \
-static octet pt[sizeof(text)]; \
- \
-static void hexdump(const octet *p, size_t sz, size_t off) \
+int main(int argc, char *argv[]) \
{ \
- const octet *q = p + sz; \
- for (sz = 0; p < q; p++, sz++) { \
- printf("%02x", *p); \
- if ((off + sz + 1) % PRE##_BLKSZ == 0) \
- putchar(':'); \
- } \
-} \
- \
-int main(void) \
-{ \
- size_t sz = 0, rest; \
- pre##_counterctx ctx; \
- int status = 0; \
- int done = 0; \
- pre##_ctx k; \
- \
- size_t keysz = PRE##_KEYSZ ? \
- PRE##_KEYSZ : strlen((const char *)key); \
- \
- fputs(name "-counter: ", stdout); \
- \
- pre##_init(&k, key, keysz); \
- pre##_countersetkey(&ctx, &k); \
- \
- while (sz <= sizeof(text)) { \
- rest = sizeof(text) - sz; \
- memcpy(ct, text, sizeof(text)); \
- pre##_countersetiv(&ctx, iv); \
- pre##_counterencrypt(&ctx, ct, ct, sz); \
- pre##_counterencrypt(&ctx, ct + sz, ct + sz, rest); \
- memcpy(pt, ct, sizeof(text)); \
- pre##_countersetiv(&ctx, iv); \
- pre##_counterencrypt(&ctx, pt, pt, rest); \
- pre##_counterencrypt(&ctx, pt + rest, pt + rest, sz); \
- if (memcmp(pt, text, sizeof(text)) == 0) { \
- done++; \
- if (sizeof(text) < 40 || done % 8 == 0) \
- fputc('.', stdout); \
- if (done % 480 == 0) \
- fputs("\n\t", stdout); \
- fflush(stdout); \
- } else { \
- printf("\nError (sz = %lu)\n", (unsigned long)sz); \
- status = 1; \
- printf("\tplaintext = "); hexdump(text, sz, 0); \
- printf(", "); hexdump(text + sz, rest, sz); \
- fputc('\n', stdout); \
- printf("\tciphertext = "); hexdump(ct, sz, 0); \
- printf(", "); hexdump(ct + sz, rest, sz); \
- fputc('\n', stdout); \
- printf("\trecovered text = "); hexdump(pt, sz, 0); \
- printf(", "); hexdump(pt + sz, rest, sz); \
- fputc('\n', stdout); \
- fputc('\n', stdout); \
- } \
- if (sz < 63) \
- sz++; \
- else \
- sz += 9; \
- } \
- \
- fputs(status ? " failed\n" : " ok\n", stdout); \
- return (status); \
+ return test_encmode(fname "-counter", PRE##_KEYSZ, PRE##_BLKSZ, 1, 0, \
+ pre##_counter_test_setup, pre##_counter_test_reset, \
+ pre##_counter_test_enc, pre##_counter_test_enc, \
+ argc, argv); \
}
#else
~mdw / catacomb / blobdiff