/* -*-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.
*
* 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
#include <mLib/bits.h>
#include <mLib/sub.h>
+#ifndef CATACOMB_ARENA_H
+# include "arena.h"
+#endif
+
#ifndef CATACOMB_BLKC_H
# include "blkc.h"
#endif
/* --- @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: --- \
* \
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); \
} \
\
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@ --- * \
\
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@ --- * \
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); \
} \
{ \
const octet *s = src; \
octet *d = dest; \
- int off = ctx->off; \
+ unsigned off = ctx->off; \
\
/* --- Empty blocks are trivial --- */ \
\
/* --- 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; \
\
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); \
static void gdestroy(gcipher *c) \
{ \
gctx *g = (gctx *)c; \
- DESTROY(g); \
+ BURN(*g); \
+ S_DESTROY(g); \
} \
\
static void gsetiv(gcipher *c, const void *iv) \
} \
\
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 \
}; \
\
static void grdestroy(grand *r) \
{ \
grctx *g = (grctx *)r; \
- DESTROY(g); \
+ BURN(*g); \
+ S_DESTROY(g); \
} \
\
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); \
\
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: { \
\
static const grand_ops grops = { \
#pre "-ofb", \
- 0, \
+ GRAND_CRYPTO, 0, \
grmisc, grdestroy, \
grword, grbyte, grword, grand_range, grfill \
}; \
\
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); \
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) \
projects / u / mdw / catacomb / blobdiff