*/ \
\
void pre##_ecbsetkey(pre##_ecbctx *ctx, const pre##_ctx *k) \
-{ \
- ctx->ctx = *k; \
-} \
+ { ctx->ctx = *k; } \
\
/* --- @pre_ecbinit@ --- * \
* \
*/ \
\
void pre##_ecbinit(pre##_ecbctx *ctx, \
- const void *key, size_t sz, \
- const void *iv) \
-{ \
- pre##_init(&ctx->ctx, key, sz); \
-} \
+ const void *key, size_t sz, \
+ const void *iv) \
+ { pre##_init(&ctx->ctx, key, sz); } \
\
/* --- @pre_ecbencrypt@ --- * \
* \
*/ \
\
void pre##_ecbencrypt(pre##_ecbctx *ctx, \
- const void *src, void *dest, \
- size_t sz) \
+ const void *src, void *dest, \
+ size_t sz) \
{ \
const octet *s = src; \
octet *d = dest; \
+ uint32 t[PRE##_BLKSZ/4]; \
+ octet b[PRE##_BLKSZ]; \
+ octet y; \
+ unsigned i; \
\
- /* --- Empty blocks are trivial --- */ \
+ /* --- Empty blocks are trivial, and ECB is stateless --- */ \
\
- if (!sz) \
- return; \
+ if (!sz || !d) return; \
\
/* --- Short blocks aren't allowed in ECB --- * \
* \
* Hopefully... \
*/ \
\
- while (sz >= 2 * PRE##_BLKSZ || sz == PRE##_BLKSZ) { \
- uint32 x[PRE##_BLKSZ / 4]; \
- if (!s) \
- BLKC_ZERO(PRE, x); \
- else { \
- BLKC_LOAD(PRE, x, s); \
- s += PRE##_BLKSZ; \
- } \
- pre##_eblk(&ctx->ctx, x, x); \
- if (d) { \
- BLKC_STORE(PRE, d, x); \
- d += PRE##_BLKSZ; \
- } \
+ while (sz >= 2*PRE##_BLKSZ || sz == PRE##_BLKSZ) { \
+ if (!s) BLKC_ZERO(PRE, t); \
+ else { BLKC_LOAD(PRE, t, s); s += PRE##_BLKSZ; } \
+ pre##_eblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, d, t); d += PRE##_BLKSZ; \
sz -= PRE##_BLKSZ; \
} \
\
*/ \
\
if (sz) { \
- uint32 x[PRE##_BLKSZ / 4]; \
- octet b[PRE##_BLKSZ]; \
- unsigned i; \
\
/* --- Let @sz@ be the size of the partial block --- */ \
\
* out yet, because I've not read the partial plaintext block. \
*/ \
\
- if (!s) \
- BLKC_ZERO(PRE, x); \
- else { \
- BLKC_LOAD(PRE, x, s); \
- s += PRE##_BLKSZ; \
- } \
- pre##_eblk(&ctx->ctx, x, x); \
- BLKC_STORE(PRE, b, x); \
+ if (!s) BLKC_ZERO(PRE, t); \
+ else { BLKC_LOAD(PRE, t, s); s += PRE##_BLKSZ; } \
+ pre##_eblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, b, t); \
\
/* --- Second stage --- * \
* \
* ciphertext block. \
*/ \
\
- if (d) d += PRE##_BLKSZ; \
- for (i = 0; i < sz; i++) { \
- register octet y = b[i]; \
- b[i] = s[i]; \
- if (d) d[i] = y; \
- } \
- BLKC_LOAD(PRE, x, b); \
- pre##_eblk(&ctx->ctx, x, x); \
- if (d) BLKC_STORE(PRE, d - PRE##_BLKSZ, x); \
+ d += PRE##_BLKSZ; \
+ for (i = 0; i < sz; i++) { y = b[i]; b[i] = s[i]; d[i] = y; } \
+ BLKC_LOAD(PRE, t, b); \
+ pre##_eblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, d - PRE##_BLKSZ, t); \
} \
\
/* --- Done --- */ \
{ \
const octet *s = src; \
octet *d = dest; \
+ uint32 t[PRE##_BLKSZ/4]; \
+ octet b[PRE##_BLKSZ]; \
+ octet y; \
+ unsigned i; \
\
/* --- Empty blocks are trivial --- */ \
\
- if (!sz) \
- return; \
+ if (!sz) return; \
\
/* --- Short blocks aren't allowed in ECB --- * \
* \
* Each block is just handed to the block cipher in turn. \
*/ \
\
- while (sz >= 2 * PRE##_BLKSZ || sz == PRE##_BLKSZ) { \
- uint32 x[PRE##_BLKSZ / 4]; \
- BLKC_LOAD(PRE, x, s); \
- pre##_dblk(&ctx->ctx, x, x); \
- BLKC_STORE(PRE, d, x); \
- s += PRE##_BLKSZ; \
- d += PRE##_BLKSZ; \
+ while (sz >= 2*PRE##_BLKSZ || sz == PRE##_BLKSZ) { \
+ BLKC_LOAD(PRE, t, s); s += PRE##_BLKSZ; \
+ pre##_dblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, d, t); d += PRE##_BLKSZ; \
sz -= PRE##_BLKSZ; \
} \
\
*/ \
\
if (sz) { \
- uint32 x[PRE##_BLKSZ / 4]; \
- octet b[PRE##_BLKSZ]; \
- unsigned i; \
\
/* --- Let @sz@ be the size of the partial block --- */ \
\
* is carried over for the next encryption operation. \
*/ \
\
- BLKC_LOAD(PRE, x, s); \
- pre##_dblk(&ctx->ctx, x, x); \
- BLKC_STORE(PRE, b, x); \
+ BLKC_LOAD(PRE, t, s); \
+ pre##_dblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, b, t); \
\
/* --- Second stage --- * \
* \
\
s += PRE##_BLKSZ; \
d += PRE##_BLKSZ; \
- for (i = 0; i < sz; i++) { \
- register octet y = s[i]; \
- d[i] = b[i]; \
- b[i] = y; \
- } \
- BLKC_LOAD(PRE, x, b); \
- pre##_dblk(&ctx->ctx, x, x); \
- BLKC_STORE(PRE, d - PRE##_BLKSZ, x); \
+ for (i = 0; i < sz; i++) { y = s[i]; d[i] = b[i]; b[i] = y; } \
+ BLKC_LOAD(PRE, t, b); \
+ pre##_dblk(&ctx->ctx, t, t); \
+ BLKC_STORE(PRE, d - PRE##_BLKSZ, t); \
} \
\
/* --- Done --- */ \
} \
\
static void gencrypt(gcipher *c, const void *s, void *t, size_t sz) \
-{ \
- gctx *g = (gctx *)c; \
- pre##_ecbencrypt(&g->k, s, t, sz); \
-} \
+ { gctx *g = (gctx *)c; pre##_ecbencrypt(&g->k, s, t, sz); } \
\
static void gdecrypt(gcipher *c, const void *s, void *t, size_t sz) \
-{ \
- gctx *g = (gctx *)c; \
- pre##_ecbdecrypt(&g->k, s, t, sz); \
-} \
+ { gctx *g = (gctx *)c; pre##_ecbdecrypt(&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 const gcipher_ops gops = { \
&pre##_ecb, \
#ifdef TEST_RIG
-#include <stdio.h>
-
-#include "daftstory.h"
+#include "modes-test.h"
/* --- @ECB_TEST@ --- *
*
#define ECB_TESTX(PRE, pre, name, fname) \
\
-/* --- Initial plaintext for the test --- */ \
- \
-static const octet text[] = TEXT; \
+static pre##_ctx key; \
+static pre##_ecbctx ctx; \
\
-/* --- Key and IV to use --- */ \
+static void pre##_ecb_test_setup(const octet *k, size_t ksz) \
+ { pre##_init(&key, k, ksz); pre##_ecbsetkey(&ctx, &key); } \
\
-static const octet key[] = KEY; \
-static const octet iv[] = IV; \
+static void pre##_ecb_test_reset(const octet *iv) \
+ { ; } \
\
-/* --- Buffers for encryption and decryption output --- */ \
+static void pre##_ecb_test_enc(const octet *s, octet *d, size_t sz) \
+ { pre##_ecbencrypt(&ctx, s, d, sz); } \
\
-static octet ct[sizeof(text)]; \
-static octet pt[sizeof(text)]; \
+static void pre##_ecb_test_dec(const octet *s, octet *d, size_t sz) \
+ { pre##_ecbdecrypt(&ctx, s, d, sz); } \
\
-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##_ecbctx ctx; \
- int status = 0; \
- int done = 0; \
- \
- size_t keysz = PRE##_KEYSZ ? \
- PRE##_KEYSZ : strlen((const char *)key); \
- \
- fputs(name "-ecb: ", stdout); \
- \
- pre##_ecbinit(&ctx, key, keysz, iv); \
- \
- while (sz <= sizeof(text)) { \
- rest = sizeof(text) - sz; \
- if ((sz != 0 && sz < PRE##_BLKSZ) || \
- (rest != 0 && rest < PRE##_BLKSZ)) \
- goto next; \
- memcpy(ct, text, sizeof(text)); \
- pre##_ecbencrypt(&ctx, ct, ct, sz); \
- pre##_ecbencrypt(&ctx, ct + sz, ct + sz, rest); \
- memcpy(pt, ct, sizeof(text)); \
- pre##_ecbdecrypt(&ctx, pt, pt, sz); \
- pre##_ecbdecrypt(&ctx, pt + sz, pt + sz, rest); \
- 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); \
- } \
- next: \
- if (sz < 63) \
- sz++; \
- else \
- sz += 9; \
- } \
- \
- fputs(status ? " failed\n" : " ok\n", stdout); \
- return (status); \
+ return test_encmode(fname "-ecb", PRE##_KEYSZ, PRE##_BLKSZ, \
+ PRE##_BLKSZ, TEMF_REFALIGN, \
+ pre##_ecb_test_setup, pre##_ecb_test_reset, \
+ pre##_ecb_test_enc, pre##_ecb_test_dec, \
+ argc, argv); \
}
#else
~mdw / catacomb / blobdiff