X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/9c1437f372e62f0b3b3a7162aabee73bdc96ce4b..HEAD:/symm/salsa20.h

diff --git a/symm/salsa20.h b/symm/salsa20.h
index 043b22d1..7f3059ef 100644
--- a/symm/salsa20.h
+++ b/symm/salsa20.h
@@ -64,8 +64,8 @@ typedef uint32 salsa20_matrix[16];
 
 typedef struct salsa20_ctx {
   salsa20_matrix a;
-  octet buf[SALSA20_OUTSZ];
-  size_t bufi;
+  octet b[SALSA20_OUTSZ];
+  unsigned off;
 } salsa20_ctx;
 
 #define XSALSA20_DEFCTX(name)						\
@@ -317,9 +317,9 @@ extern const octet salsa20_keysz[];
 #define xsalsa2012_keysz salsa20_keysz
 #define xsalsa208_keysz salsa20_keysz
 
-const gccipher salsa20, salsa2012, salsa208;
-const gccipher salsa20_ietf, salsa2012_ietf, salsa208_ietf;
-const gccipher xsalsa20, xsalsa2012, xsalsa208;
+extern const gccipher salsa20, salsa2012, salsa208;
+extern const gccipher salsa20_ietf, salsa2012_ietf, salsa208_ietf;
+extern const gccipher xsalsa20, xsalsa2012, xsalsa208;
 
 /*----- Generic random number generator interface -------------------------*/