/* -*-c-*-
*
- * $Id: cbc-def.h,v 1.1 1999/12/10 23:16:39 mdw Exp $
+ * $Id: cbc-def.h,v 1.2 2000/06/17 10:49:52 mdw Exp $
*
* Definitions for cipher block chaining mode
*
/*----- Revision history --------------------------------------------------*
*
* $Log: cbc-def.h,v $
+ * Revision 1.2 2000/06/17 10:49:52 mdw
+ * Use secure arena for memory allocation.
+ *
* Revision 1.1 1999/12/10 23:16:39 mdw
* Split mode macros into interface and implementation.
*
#include <mLib/bits.h>
#include <mLib/sub.h>
+#ifndef CATACOMB_ARENA_H
+# include "arena.h"
+#endif
+
#ifndef CATACOMB_BLKC_H
# include "blkc.h"
#endif
# include "gcipher.h"
#endif
+#ifndef CATACOMB_PARANOIA_H
+# include "paranoia.h"
+#endif
+
/*----- Macros ------------------------------------------------------------*/
/* --- @CBC_DEF@ --- *
\
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); \
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##_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 \
}; \
\