From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 21 Nov 2005 18:24:40 +0000 (+0100)
Subject: (CTR_CTX, CTR_CRYPT): Fixed bugs, spotted by Goran K.
X-Git-Tag: nettle_1.14_release_20051205~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32fda997b2c8677610278bd88052ba0237de242;p=thirdparty%2Fnettle.git

(CTR_CTX, CTR_CRYPT): Fixed bugs, spotted by Goran K.

Rev: src/nettle/ctr.h:1.2
---

diff --git a/ctr.h b/ctr.h
index 9372b722..95c16615 100644
--- a/ctr.h
+++ b/ctr.h
@@ -39,16 +39,16 @@ ctr_crypt(void *ctx, nettle_crypt_func f,
 	  const uint8_t *src);
 
 #define CTR_CTX(type, size) \
-{ type ctx; uint8_t ctr[size] }
+{ type ctx; uint8_t ctr[size]; }
 
 #define CTR_SET_COUNTER(ctx, data) \
 memcpy((ctx)->ctr, (data), sizeof((ctx)->ctr))
 
 #define CTR_CRYPT(self, f, length, dst, src)		\
 (0 ? ((f)(&(self)->ctx, 0, NULL, NULL))			\
-   : ctr_encrypt((void *) &(self)->ctx,			\
-                 (nettle_crypt_func) (f),		\
-		 sizeof((self)->ctr), (self)->ctr,	\
-                 (length), (dst), (src)))
+   : ctr_crypt((void *) &(self)->ctx,			\
+               (nettle_crypt_func) (f),			\
+	       sizeof((self)->ctr), (self)->ctr,	\
+               (length), (dst), (src)))
 
 #endif /* NETTLE_CTR_H_INCLUDED */