diff options
| author | djm <> | 2013-10-04 07:02:27 +0000 |
|---|---|---|
| committer | djm <> | 2013-10-04 07:02:27 +0000 |
| commit | 39dc56fb519d0b54bc787d7afcfd03e39cb45eb6 (patch) | |
| tree | 909e23328c81a3b56b0d9953802363a0484b1a4c | |
| parent | 9a356934a3a8aebc5822ec33f95340401a618b02 (diff) | |
| download | openbsd-39dc56fb519d0b54bc787d7afcfd03e39cb45eb6.tar.gz openbsd-39dc56fb519d0b54bc787d7afcfd03e39cb45eb6.tar.bz2 openbsd-39dc56fb519d0b54bc787d7afcfd03e39cb45eb6.zip | |
a couple of warning fixes and an RCS marker; ok markus@
| -rw-r--r-- | src/lib/libc/crypt/chacha_private.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libc/crypt/chacha_private.h b/src/lib/libc/crypt/chacha_private.h index fa085fb6ae..7c3680fa6d 100644 --- a/src/lib/libc/crypt/chacha_private.h +++ b/src/lib/libc/crypt/chacha_private.h | |||
| @@ -4,6 +4,8 @@ D. J. Bernstein | |||
| 4 | Public domain. | 4 | Public domain. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */ | ||
| 8 | |||
| 7 | typedef unsigned char u8; | 9 | typedef unsigned char u8; |
| 8 | typedef unsigned int u32; | 10 | typedef unsigned int u32; |
| 9 | 11 | ||
| @@ -88,9 +90,9 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes) | |||
| 88 | { | 90 | { |
| 89 | u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; | 91 | u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; |
| 90 | u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15; | 92 | u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15; |
| 91 | u8 *ctarget; | 93 | u8 *ctarget = NULL; |
| 92 | u8 tmp[64]; | 94 | u8 tmp[64]; |
| 93 | int i; | 95 | u_int i; |
| 94 | 96 | ||
| 95 | if (!bytes) return; | 97 | if (!bytes) return; |
| 96 | 98 | ||
