projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian: Fix package sections.
[u/mdw/catacomb]
/
counter-def.h
diff --git
a/counter-def.h
b/counter-def.h
index
080321a
..
315e1c1
100644
(file)
--- a/
counter-def.h
+++ b/
counter-def.h
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: counter-def.h,v 1.
1 2000/06/17 10:51:42
mdw Exp $
+ * $Id: counter-def.h,v 1.
4 2004/04/08 01:36:15
mdw Exp $
*
* Block cipher counter mode (or long cycle mode)
*
*
* Block cipher counter mode (or long cycle mode)
*
@@
-27,14
+27,6
@@
* MA 02111-1307, USA.
*/
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: counter-def.h,v $
- * Revision 1.1 2000/06/17 10:51:42 mdw
- * Counter mode ciphers and pseudo-random generator.
- *
- */
-
#ifndef CATACOMB_COUNTER_DEF_H
#define CATACOMB_COUNTER_DEF_H
#ifndef CATACOMB_COUNTER_DEF_H
#define CATACOMB_COUNTER_DEF_H
@@
-81,7
+73,7
@@
* \
* Arguments: @const pre_counterctx *ctx@ = pointer to counter \
* context \
* \
* Arguments: @const pre_counterctx *ctx@ = pointer to counter \
* context \
- * @void *iv
#@ = pointer to output data block
\
+ * @void *iv
@ = pointer to output data block
\
* \
* Returns: --- \
* \
* \
* Returns: --- \
* \
@@
-163,7
+155,7
@@
void pre##_counterinit(pre##_counterctx *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##_countersetiv(ctx, iv ? iv : zero); \
} \
pre##_init(&ctx->ctx, key, sz); \
pre##_countersetiv(ctx, iv ? iv : zero); \
} \