X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fchacha-poly1305%2Fchacha.h;h=d4784f49c91d4430bb5af4856c1845c5dde0f954;hb=e994222a4370621a9ac69c13ed23531c1eaa6809;hp=af1b9a407906447274547d9a3b3568e549f7d145;hpb=2980173ee7f8142598fe5e1ab117e463751da310;p=tinc

diff --git a/src/chacha-poly1305/chacha.h b/src/chacha-poly1305/chacha.h
index af1b9a40..d4784f49 100644
--- a/src/chacha-poly1305/chacha.h
+++ b/src/chacha-poly1305/chacha.h
@@ -7,18 +7,27 @@ Public domain.
 #ifndef CHACHA_H
 #define CHACHA_H
 
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define CHACHA_BLOCKLEN         64
+
+/* use memcpy() to copy blocks of memory (typically faster) */
+#define USE_MEMCPY          1
+/* use unaligned little-endian load/store (can be faster) */
+#define USE_UNALIGNED       0
+
 struct chacha_ctx {
 	uint32_t input[16];
 };
 
-#define CHACHA_MINKEYLEN 	16
-#define CHACHA_NONCELEN		8
-#define CHACHA_CTRLEN		8
-#define CHACHA_STATELEN		(CHACHA_NONCELEN+CHACHA_CTRLEN)
-#define CHACHA_BLOCKLEN		64
-
-void chacha_keysetup(struct chacha_ctx *x, const uint8_t *k, uint32_t kbits);
-void chacha_ivsetup(struct chacha_ctx *x, const uint8_t *iv, const uint8_t *ctr);
-void chacha_encrypt_bytes(struct chacha_ctx *x, const uint8_t *m, uint8_t * c, uint32_t bytes);
+void chacha_keysetup(struct chacha_ctx *x, const unsigned char *k,
+                     uint32_t kbits);
+void chacha_ivsetup(struct chacha_ctx *x, const unsigned char *iv,
+                    const unsigned char *ctr);
+void chacha_encrypt_bytes(struct chacha_ctx *x, const unsigned char *m,
+                          unsigned char *c, uint32_t bytes);
 
-#endif /* CHACHA_H */
+#endif  /* CHACHA_H */