projects
/
u
/
mdw
/
catacomb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f32e0f
)
Don't use @va_arg@ as an argument to @STORE32@!
author
mdw
<mdw>
Tue, 3 Apr 2001 19:36:36 +0000
(19:36 +0000)
committer
mdw
<mdw>
Tue, 3 Apr 2001 19:36:36 +0000
(19:36 +0000)
ofb-def.h
patch
|
blob
|
blame
|
history
rc4.c
patch
|
blob
|
blame
|
history
diff --git
a/ofb-def.h
b/ofb-def.h
index
d09e51f
..
f22ccd5
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.
4 2001/04/03 19:36:36
mdw Exp $
*
* Definitions for output feedback mode
*
*
* Definitions for output feedback mode
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: ofb-def.h,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: ofb-def.h,v $
+ * 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.
*
@@
-345,6
+348,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
+369,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: { \
diff --git
a/rc4.c
b/rc4.c
index
69adcc6
..
bf978d3
100644
(file)
--- a/
rc4.c
+++ b/
rc4.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rc4.c,v 1.
4 2000/06/17 11:55:22
mdw Exp $
+ * $Id: rc4.c,v 1.
5 2001/04/03 19:36:36
mdw Exp $
*
* The alleged RC4 stream cipher
*
*
* The alleged RC4 stream cipher
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rc4.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: rc4.c,v $
+ * Revision 1.5 2001/04/03 19:36:36 mdw
+ * Don't use @va_arg@ as an argument to @STORE32@!
+ *
* Revision 1.4 2000/06/17 11:55:22 mdw
* New key size interface. Allow key material to be combined with an
* existing initialized context. Use secure arena for memory allocation.
* Revision 1.4 2000/06/17 11:55:22 mdw
* New key size interface. Allow key material to be combined with an
* existing initialized context. Use secure arena for memory allocation.
@@
-209,6
+212,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[4];
va_start(ap, op);
octet buf[4];
va_start(ap, op);
@@
-228,11
+232,13
@@
static int grmisc(grand *r, unsigned op, ...)
}
break;
case GRAND_SEEDINT:
}
break;
case GRAND_SEEDINT:
- STORE32(buf, va_arg(ap, unsigned));
+ i = va_arg(ap, unsigned);
+ STORE32(buf, i);
rc4_addkey(&g->rc4, buf, sizeof(buf));
break;
case GRAND_SEEDUINT32:
rc4_addkey(&g->rc4, buf, sizeof(buf));
break;
case GRAND_SEEDUINT32:
- STORE32(buf, va_arg(ap, uint32));
+ i = va_arg(ap, uint32);
+ STORE32(buf, i);
rc4_addkey(&g->rc4, buf, sizeof(buf));
break;
case GRAND_SEEDBLOCK: {
rc4_addkey(&g->rc4, buf, sizeof(buf));
break;
case GRAND_SEEDBLOCK: {