commit 369e14bbf168ddb0d97e1ee9ddf40ed3a095d10d
author Paul Bakker <p.j.bakker@polarssl.org> Wed Apr 18 14:16:09 2012 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Apr 18 14:16:09 2012 +0000
tree adcbd0df6df3d8ecddafedbbc667613fbf7b7d92
parent 7890405856d350d5f8f1a5180a0103ffb5f25eb6

 - Small code rewrite

library/camellia.c

diff --git a/library/camellia.c b/library/camellia.c
index 496facf..34b8f29 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -633,7 +633,7 @@
                        const unsigned char *input,
                        unsigned char *output )
 {
-    int c, i, cb;
+    int c, i;
     size_t n = *nc_off;
 
     while( length-- )
@@ -641,12 +641,9 @@
         if( n == 0 ) {
             camellia_crypt_ecb( ctx, CAMELLIA_ENCRYPT, nonce_counter, stream_block );
 
-            i = 15;
-            do {
-               nonce_counter[i]++;
-               cb = nonce_counter[i] == 0;
-            } while( i-- && cb );
-
+            for( i = 16; i > 0; i-- )
+                if( ++nonce_counter[i - 1] != 0 )
+                    break;
         }
         c = *input++;
         *output++ = (unsigned char)( c ^ stream_block[n] );