From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 May 2004 19:41:33 +0000 (+0000)
Subject: Use correct aes-ctr implementation in mainline, too.
X-Git-Tag: debian-version-0.0.6.1-1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebe8fa0d62073e97745cba6fb5d461b704bd9bd2;p=thirdparty%2Ftor.git

Use correct aes-ctr implementation in mainline, too.


svn:r1800
---

diff --git a/src/common/aes.c b/src/common/aes.c
index 58efbf72a5..f00822bca8 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -47,14 +47,14 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher)
   u32 counter1 = cipher->counter1;
   u8 buf[16];
   memset(buf, 0, 8);
-  buf[15] = (counter0 >> 0)  && 0xff;
-  buf[14] = (counter0 >> 8)   && 0xff;
-  buf[13] = (counter0 >> 16) && 0xff;
-  buf[12] = (counter0 >> 24) && 0xff;
-  buf[11] = (counter1 >> 0)  && 0xff;
-  buf[10] = (counter1 >> 8)  && 0xff;
-  buf[ 9] = (counter1 >> 16) && 0xff;
-  buf[ 8] = (counter1 >> 24) && 0xff;
+  buf[15] = (counter0 >> 0)  & 0xff;
+  buf[14] = (counter0 >> 8)  & 0xff;
+  buf[13] = (counter0 >> 16) & 0xff;
+  buf[12] = (counter0 >> 24) & 0xff;
+  buf[11] = (counter1 >> 0)  & 0xff;
+  buf[10] = (counter1 >> 8)  & 0xff;
+  buf[ 9] = (counter1 >> 16) & 0xff;
+  buf[ 8] = (counter1 >> 24) & 0xff;
 
   rijndaelEncrypt(cipher->rk, cipher->nr, buf, cipher->buf);
   cipher->pos = 0;