projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Miscellaneous constification.
[u/mdw/catacomb]
/
ofb-def.h
diff --git
a/ofb-def.h
b/ofb-def.h
index
d09e51f
..
67d3a6a
100644
(file)
--- a/
ofb-def.h
+++ b/
ofb-def.h
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: ofb-def.h,v 1.
3 2000/06/17 11:48:02
mdw Exp $
+ * $Id: ofb-def.h,v 1.
6 2004/04/02 01:03:49
mdw Exp $
*
* Definitions for output feedback mode
*
*
* Definitions for output feedback mode
*
@@
-30,6
+30,15
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: ofb-def.h,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: ofb-def.h,v $
+ * Revision 1.6 2004/04/02 01:03:49 mdw
+ * Miscellaneous constification.
+ *
+ * Revision 1.5 2001/06/17 00:10:51 mdw
+ * Typesetting fixes
+ *
+ * Revision 1.4 2001/04/03 19:36:36 mdw
+ * Don't use @va_arg@ as an argument to @STORE32@!
+ *
* Revision 1.3 2000/06/17 11:48:02 mdw
* Use secure arena for memory allocation. Rearrange setiv slightly.
*
* Revision 1.3 2000/06/17 11:48:02 mdw
* Use secure arena for memory allocation. Rearrange setiv slightly.
*
@@
-86,7
+95,7
@@
/* --- @pre_ofbgetiv@ --- * \
* \
* Arguments: @const pre_ofbctx *ctx@ = pointer to OFB context block \
/* --- @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: --- \
* \
* \
* Returns: --- \
* \
@@
-176,7
+185,7
@@
void pre##_ofbinit(pre##_ofbctx *ctx, \
const void *key, size_t sz, \
const void *iv) \
{ \
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); \
} \
pre##_init(&ctx->ctx, key, sz); \
pre##_ofbsetiv(ctx, iv ? iv : zero); \
} \
@@
-345,6
+354,7
@@
static int grmisc(grand *r, unsigned op, ...) \
grctx *g = (grctx *)r; \
va_list ap; \
int rc = 0; \
grctx *g = (grctx *)r; \
va_list ap; \
int rc = 0; \
+ uint32 i; \
octet buf[PRE##_BLKSZ]; \
va_start(ap, op); \
\
octet buf[PRE##_BLKSZ]; \
va_start(ap, op); \
\
@@
-365,12
+375,14
@@
static int grmisc(grand *r, unsigned op, ...) \
break; \
case GRAND_SEEDINT: \
memset(buf, 0, sizeof(buf)); \
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)); \
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: { \
pre##_ofbsetiv(&g->k, buf); \
break; \
case GRAND_SEEDBLOCK: { \