X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4ab1268f3ec850a115a68966325aced4f08ec603..a6864ad907239985bd1f6eab414cec6171930d46:/ofb-def.h diff --git a/ofb-def.h b/ofb-def.h index 20be645..8250395 100644 --- a/ofb-def.h +++ b/ofb-def.h @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: ofb-def.h,v 1.2 1999/12/13 15:34:01 mdw Exp $ + * $Id: ofb-def.h,v 1.7 2004/04/08 01:36:15 mdw Exp $ * * Definitions for output feedback mode * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,29 +15,18 @@ * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * + * * Catacomb is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public * License along with Catacomb; if not, write to the Free * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: ofb-def.h,v $ - * Revision 1.2 1999/12/13 15:34:01 mdw - * Add support for seeding from a generic pseudorandom source. - * - * Revision 1.1 1999/12/10 23:16:40 mdw - * Split mode macros into interface and implementation. - * - */ - #ifndef CATACOMB_OFB_DEF_H #define CATACOMB_OFB_DEF_H @@ -53,6 +42,10 @@ #include #include +#ifndef CATACOMB_ARENA_H +# include "arena.h" +#endif + #ifndef CATACOMB_BLKC_H # include "blkc.h" #endif @@ -79,7 +72,7 @@ /* --- @pre_ofbgetiv@ --- * \ * \ * Arguments: @const pre_ofbctx *ctx@ = pointer to OFB context block \ - * @void *iv#@ = pointer to output data block \ + * @void *iv@ = pointer to output data block \ * \ * Returns: --- \ * \ @@ -92,8 +85,8 @@ void pre##_ofbgetiv(const pre##_ofbctx *ctx, void *iv) \ { \ octet *p = iv; \ - int off = ctx->off; \ - int rest = PRE##_BLKSZ - off; \ + unsigned off = ctx->off; \ + unsigned rest = PRE##_BLKSZ - off; \ memcpy(p, ctx->iv + off, rest); \ memcpy(p + rest, ctx->iv, off); \ } \ @@ -110,11 +103,8 @@ void pre##_ofbgetiv(const pre##_ofbctx *ctx, void *iv) \ \ void pre##_ofbsetiv(pre##_ofbctx *ctx, const void *iv) \ { \ - uint32 niv[PRE##_BLKSZ / 4]; \ - BLKC_LOAD(PRE, niv, iv); \ - pre##_eblk(&ctx->ctx, niv, niv); \ - BLKC_STORE(PRE, ctx->iv, niv); \ - ctx->off = 0; \ + memcpy(ctx->iv, iv, PRE##_BLKSZ); \ + ctx->off = PRE##_BLKSZ; \ } \ \ /* --- @pre_ofbbdry@ --- * \ @@ -129,10 +119,12 @@ void pre##_ofbsetiv(pre##_ofbctx *ctx, const void *iv) \ \ void pre##_ofbbdry(pre##_ofbctx *ctx) \ { \ - octet iv[PRE##_BLKSZ]; \ - pre##_ofbgetiv(ctx, iv); \ - pre##_ofbsetiv(ctx, iv); \ - BURN(iv); \ + uint32 niv[PRE##_BLKSZ / 4]; \ + BLKC_LOAD(PRE, niv, ctx->iv); \ + pre##_eblk(&ctx->ctx, niv, niv); \ + BLKC_STORE(PRE, ctx->iv, niv); \ + ctx->off = PRE##_BLKSZ; \ + BURN(niv); \ } \ \ /* --- @pre_ofbsetkey@ --- * \ @@ -170,7 +162,7 @@ void pre##_ofbinit(pre##_ofbctx *ctx, \ const void *key, size_t sz, \ const void *iv) \ { \ - static octet zero[PRE##_BLKSZ] = { 0 }; \ + static const octet zero[PRE##_BLKSZ] = { 0 }; \ pre##_init(&ctx->ctx, key, sz); \ pre##_ofbsetiv(ctx, iv ? iv : zero); \ } \ @@ -197,7 +189,7 @@ void pre##_ofbencrypt(pre##_ofbctx *ctx, \ { \ const octet *s = src; \ octet *d = dest; \ - int off = ctx->off; \ + unsigned off = ctx->off; \ \ /* --- Empty blocks are trivial --- */ \ \ @@ -212,7 +204,7 @@ void pre##_ofbencrypt(pre##_ofbctx *ctx, \ /* --- Finish off what's left in my buffer --- */ \ \ if (!d) \ - sz -= off; \ + sz -= PRE##_BLKSZ - off; \ else { \ while (off < PRE##_BLKSZ) { \ register octet x = s ? *s++ : 0; \ @@ -279,7 +271,7 @@ typedef struct gctx { \ \ static gcipher *ginit(const void *k, size_t sz) \ { \ - gctx *g = CREATE(gctx); \ + gctx *g = S_CREATE(gctx); \ g->c.ops = &gops; \ pre##_ofbinit(&g->k, k, sz, 0); \ return (&g->c); \ @@ -294,7 +286,8 @@ static void gencrypt(gcipher *c, const void *s, void *t, size_t sz) \ static void gdestroy(gcipher *c) \ { \ gctx *g = (gctx *)c; \ - DESTROY(g); \ + BURN(*g); \ + S_DESTROY(g); \ } \ \ static void gsetiv(gcipher *c, const void *iv) \ @@ -310,12 +303,12 @@ static void gbdry(gcipher *c) \ } \ \ static const gcipher_ops gops = { \ - &pre##_ofb.b, \ + &pre##_ofb, \ gencrypt, gencrypt, gdestroy, gsetiv, gbdry \ }; \ \ const gccipher pre##_ofb = { \ - { #pre "-ofb", PRE##_KEYSZ, PRE##_BLKSZ }, \ + #pre "-ofb", pre##_keysz, PRE##_BLKSZ, \ ginit \ }; \ \ @@ -329,7 +322,8 @@ typedef struct grctx { \ static void grdestroy(grand *r) \ { \ grctx *g = (grctx *)r; \ - DESTROY(g); \ + BURN(*g); \ + S_DESTROY(g); \ } \ \ static int grmisc(grand *r, unsigned op, ...) \ @@ -337,6 +331,7 @@ static int grmisc(grand *r, unsigned op, ...) \ grctx *g = (grctx *)r; \ va_list ap; \ int rc = 0; \ + uint32 i; \ octet buf[PRE##_BLKSZ]; \ va_start(ap, op); \ \ @@ -357,12 +352,14 @@ static int grmisc(grand *r, unsigned op, ...) \ break; \ case GRAND_SEEDINT: \ memset(buf, 0, sizeof(buf)); \ - STORE32(buf, va_arg(ap, unsigned)); \ + i = va_arg(ap, unsigned); \ + STORE32(buf, i); \ pre##_ofbsetiv(&g->k, buf); \ break; \ case GRAND_SEEDUINT32: \ memset(buf, 0, sizeof(buf)); \ - STORE32(buf, va_arg(ap, uint32)); \ + i = va_arg(ap, uint32); \ + STORE32(buf, i); \ pre##_ofbsetiv(&g->k, buf); \ break; \ case GRAND_SEEDBLOCK: { \ @@ -413,7 +410,7 @@ static void grfill(grand *r, void *p, size_t sz) \ \ static const grand_ops grops = { \ #pre "-ofb", \ - 0, \ + GRAND_CRYPTO, 0, \ grmisc, grdestroy, \ grword, grbyte, grword, grand_range, grfill \ }; \ @@ -431,7 +428,7 @@ static const grand_ops grops = { \ \ grand *pre##_ofbrand(const void *k, size_t sz) \ { \ - grctx *g = CREATE(grctx); \ + grctx *g = S_CREATE(grctx); \ g->r.ops = &grops; \ pre##_ofbinit(&g->k, k, sz, 0); \ return (&g->r); \ @@ -509,22 +506,22 @@ int main(void) \ if (memcmp(pt, text, sizeof(text)) == 0) { \ done++; \ if (sizeof(text) < 40 || done % 8 == 0) \ - fputc('.', stdout); \ + fputc('.', stdout); \ if (done % 480 == 0) \ - fputs("\n\t", stdout); \ + fputs("\n\t", stdout); \ fflush(stdout); \ } else { \ printf("\nError (sz = %lu)\n", (unsigned long)sz); \ status = 1; \ printf("\tplaintext = "); hexdump(text, sz); \ - printf(", "); hexdump(text + sz, rest); \ - fputc('\n', stdout); \ + printf(", "); hexdump(text + sz, rest); \ + fputc('\n', stdout); \ printf("\tciphertext = "); hexdump(ct, sz); \ - printf(", "); hexdump(ct + sz, rest); \ - fputc('\n', stdout); \ + printf(", "); hexdump(ct + sz, rest); \ + fputc('\n', stdout); \ printf("\trecovered text = "); hexdump(pt, sz); \ - printf(", "); hexdump(pt + sz, rest); \ - fputc('\n', stdout); \ + printf(", "); hexdump(pt + sz, rest); \ + fputc('\n', stdout); \ fputc('\n', stdout); \ } \ if (sz < 63) \