projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename from `mpx-kmac.h', and add macros for @gfx_kmul@.
[u/mdw/catacomb]
/
cbc-def.h
diff --git
a/cbc-def.h
b/cbc-def.h
index
aff245c
..
14a0575
100644
(file)
--- a/
cbc-def.h
+++ b/
cbc-def.h
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-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
*
*
* Definitions for cipher block chaining mode
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: cbc-def.h,v $
/*----- 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.
*
* Revision 1.1 1999/12/10 23:16:39 mdw
* Split mode macros into interface and implementation.
*
@@
-49,6
+52,10
@@
#include <mLib/bits.h>
#include <mLib/sub.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
#ifndef CATACOMB_BLKC_H
# include "blkc.h"
#endif
@@
-57,6
+64,10
@@
# include "gcipher.h"
#endif
# include "gcipher.h"
#endif
+#ifndef CATACOMB_PARANOIA_H
+# include "paranoia.h"
+#endif
+
/*----- Macros ------------------------------------------------------------*/
/* --- @CBC_DEF@ --- *
/*----- Macros ------------------------------------------------------------*/
/* --- @CBC_DEF@ --- *
@@
-389,7
+400,7
@@
typedef struct gctx { \
\
static gcipher *ginit(const void *k, size_t sz) \
{ \
\
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); \
g->c.ops = &gops; \
pre##_cbcinit(&g->k, k, sz, 0); \
return (&g->c); \
@@
-410,7
+421,8
@@
static void gdecrypt(gcipher *c, const void *s, void *t, size_t sz) \
static void gdestroy(gcipher *c) \
{ \
gctx *g = (gctx *)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 void gsetiv(gcipher *c, const void *iv) \
@@
-420,12
+432,12
@@
static void gsetiv(gcipher *c, const void *iv) \
} \
\
static const gcipher_ops gops = { \
} \
\
static const gcipher_ops gops = { \
- &pre##_cbc
.b,
\
-
gencrypt, gdecrypt, gdestroy, gsetiv, 0
\
+ &pre##_cbc
,
\
+
gencrypt, gdecrypt, gdestroy, gsetiv, 0
\
}; \
\
const gccipher pre##_cbc = { \
}; \
\
const gccipher pre##_cbc = { \
-
{ #pre "-cbc", PRE##_KEYSZ, PRE##_BLKSZ },
\
+
#pre "-cbc", pre##_keysz, PRE##_BLKSZ,
\
ginit \
}; \
\
ginit \
}; \
\