/* -*-c-*-
*
- * $Id: cfb-def.h,v 1.4 2004/04/02 01:03:49 mdw Exp $
+ * $Id: cfb-def.h,v 1.6 2004/04/17 09:58:37 mdw Exp $
*
* Definitions for ciphertext feedback mode
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: cfb-def.h,v $
- * Revision 1.4 2004/04/02 01:03:49 mdw
- * Miscellaneous constification.
- *
- * Revision 1.3 2001/06/17 00:10:51 mdw
- * Typesetting fixes
- *
- * Revision 1.2 2000/06/17 10:50:39 mdw
- * Use secure arena for memory allocation. Rearrange setiv slightly.
- *
- * Revision 1.1 1999/12/10 23:16:39 mdw
- * Split mode macros into interface and implementation.
- *
- */
-
#ifndef CATACOMB_CFB_DEF_H
#define CATACOMB_CFB_DEF_H
\
while (off < PRE##_BLKSZ) { \
register octet x = *s++; \
- *d++ = ctx->iv[off++] ^= x; \
+ ctx->iv[off] ^= x; \
+ if (d) *d++ = ctx->iv[off]; \
+ off++; \
sz--; \
} \
\
pre##_eblk(&ctx->ctx, iv, iv); \
if (sz < PRE##_BLKSZ) \
break; \
- BLKC_XLOAD(PRE, iv, s); \
- BLKC_STORE(PRE, d, iv); \
- s += PRE##_BLKSZ; \
- d += PRE##_BLKSZ; \
+ if (s) { \
+ BLKC_XLOAD(PRE, iv, s); \
+ s += PRE##_BLKSZ; \
+ } \
+ if (d) { \
+ BLKC_STORE(PRE, d, iv); \
+ d += PRE##_BLKSZ; \
+ } \
sz -= PRE##_BLKSZ; \
} \
off = 0; \
small: \
do { \
register octet x = *s++; \
- *d++ = ctx->iv[off++] ^= x; \
+ ctx->iv[off] ^= x; \
+ if (d) *d++ = ctx->iv[off]; \
+ off++; \
sz--; \
} while (sz); \
} \