*/ \
\
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, \