X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/79ba130cb5776f994f6a3f0f87159d8cbc5ff129..d4bb7fded5f9a4b0db99f82e88f22effe94f2ff7:/cbc-def.h diff --git a/cbc-def.h b/cbc-def.h index aff245c..d14c952 100644 --- a/cbc-def.h +++ b/cbc-def.h @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: cbc-def.h,v 1.1 1999/12/10 23:16:39 mdw Exp $ + * $Id: cbc-def.h,v 1.6 2004/04/17 09:58:36 mdw Exp $ * * Definitions for cipher block chaining mode * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,26 +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: cbc-def.h,v $ - * Revision 1.1 1999/12/10 23:16:39 mdw - * Split mode macros into interface and implementation. - * - */ - #ifndef CATACOMB_CBC_DEF_H #define CATACOMB_CBC_DEF_H @@ -49,6 +41,10 @@ #include #include +#ifndef CATACOMB_ARENA_H +# include "arena.h" +#endif + #ifndef CATACOMB_BLKC_H # include "blkc.h" #endif @@ -57,6 +53,10 @@ # include "gcipher.h" #endif +#ifndef CATACOMB_PARANOIA_H +# include "paranoia.h" +#endif + /*----- Macros ------------------------------------------------------------*/ /* --- @CBC_DEF@ --- * @@ -71,7 +71,7 @@ /* --- @pre_cbcgetiv@ --- * \ * \ * Arguments: @const pre_cbcctx *ctx@ = pointer to CBC context block \ - * @void *iv#@ = pointer to output data block \ + * @void *iv@ = pointer to output data block \ * \ * Returns: --- \ * \ @@ -134,7 +134,7 @@ void pre##_cbcinit(pre##_cbcctx *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); \ BLKC_LOAD(PRE, ctx->iv, iv ? iv : zero); \ } \ @@ -179,8 +179,10 @@ void pre##_cbcencrypt(pre##_cbcctx *ctx, \ \ pre##_eblk(&ctx->ctx, ctx->iv, ctx->iv); \ BLKC_STORE(PRE, b, ctx->iv); \ - for (i = 0; i < sz; i++) \ - d[i] = b[i] ^ s[i]; \ + if (d) { \ + for (i = 0; i < sz; i++) \ + d[i] = b[i] ^ (s ? s[i] : 0); \ + } \ memmove(b, b + sz, PRE##_BLKSZ - sz); \ memcpy(b + PRE##_BLKSZ - sz, d, sz); \ BLKC_LOAD(PRE, ctx->iv, b); \ @@ -195,11 +197,15 @@ void pre##_cbcencrypt(pre##_cbcctx *ctx, \ */ \ \ while (sz >= 2 * PRE##_BLKSZ || sz == PRE##_BLKSZ) { \ - BLKC_XLOAD(PRE, ctx->iv, s); \ + if (s) { \ + BLKC_XLOAD(PRE, ctx->iv, s); \ + s += PRE##_BLKSZ; \ + } \ pre##_eblk(&ctx->ctx, ctx->iv, ctx->iv); \ - BLKC_STORE(PRE, d, ctx->iv); \ - s += PRE##_BLKSZ; \ - d += PRE##_BLKSZ; \ + if (d) { \ + BLKC_STORE(PRE, d, ctx->iv); \ + d += PRE##_BLKSZ; \ + } \ sz -= PRE##_BLKSZ; \ } \ \ @@ -224,7 +230,7 @@ void pre##_cbcencrypt(pre##_cbcctx *ctx, \ * block. \ */ \ \ - BLKC_XLOAD(PRE, ctx->iv, s); \ + if (s) BLKC_XLOAD(PRE, ctx->iv, s); \ pre##_eblk(&ctx->ctx, ctx->iv, ctx->iv); \ BLKC_STORE(PRE, b, ctx->iv); \ \ @@ -235,16 +241,16 @@ void pre##_cbcencrypt(pre##_cbcctx *ctx, \ * ciphertext block. \ */ \ \ - s += PRE##_BLKSZ; \ - d += PRE##_BLKSZ; \ + if (s) s += PRE##_BLKSZ; \ + if (d) d += PRE##_BLKSZ; \ for (i = 0; i < sz; i++) { \ register octet x = b[i]; \ - b[i] ^= s[i]; \ - d[i] = x; \ + if (s) b[i] ^= s[i]; \ + if (d) d[i] = x; \ } \ BLKC_LOAD(PRE, ctx->iv, b); \ pre##_eblk(&ctx->ctx, ctx->iv, ctx->iv); \ - BLKC_STORE(PRE, d - PRE##_BLKSZ, ctx->iv); \ + if (d) BLKC_STORE(PRE, d - PRE##_BLKSZ, ctx->iv); \ } \ \ /* --- Done --- */ \ @@ -389,7 +395,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##_cbcinit(&g->k, k, sz, 0); \ return (&g->c); \ @@ -410,7 +416,8 @@ static void gdecrypt(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) \ @@ -420,12 +427,12 @@ static void gsetiv(gcipher *c, const void *iv) \ } \ \ static const gcipher_ops gops = { \ - &pre##_cbc.b, \ - gencrypt, gdecrypt, gdestroy, gsetiv, 0 \ + &pre##_cbc, \ + gencrypt, gdecrypt, gdestroy, gsetiv, 0 \ }; \ \ const gccipher pre##_cbc = { \ - { #pre "-cbc", PRE##_KEYSZ, PRE##_BLKSZ }, \ + #pre "-cbc", pre##_keysz, PRE##_BLKSZ, \ ginit \ }; \ \ @@ -501,22 +508,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) \