poly1305_donna.c in rbnacl-libsodium-1.0.13

- old
+ new

@@ -1,13 +1,15 @@
 
+#include "poly1305_donna.h"
 #include "crypto_verify_16.h"
+#include "private/common.h"
 #include "utils.h"
-#include "poly1305_donna.h"
+
 #ifdef HAVE_TI_MODE
-# include "poly1305_donna64.h"
+#include "poly1305_donna64.h"
 #else
-# include "poly1305_donna32.h"
+#include "poly1305_donna32.h"
 #endif
 #include "../onetimeauth_poly1305.h"
 
 static void
 poly1305_update(poly1305_state_internal_t *st, const unsigned char *m,
@@ -17,19 +19,22 @@
 
     /* handle leftover */
     if (st->leftover) {
         unsigned long long want = (poly1305_block_size - st->leftover);
 
-        if (want > bytes)
+        if (want > bytes) {
             want = bytes;
-        for (i = 0; i < want; i++)
+        }
+        for (i = 0; i < want; i++) {
             st->buffer[st->leftover + i] = m[i];
+        }
         bytes -= want;
         m += want;
         st->leftover += want;
-        if (st->leftover < poly1305_block_size)
+        if (st->leftover < poly1305_block_size) {
             return;
+        }
         poly1305_blocks(st, st->buffer, poly1305_block_size);
         st->leftover = 0;
     }
 
     /* process full blocks */
@@ -50,11 +55,11 @@
     }
 }
 
 static int
 crypto_onetimeauth_poly1305_donna(unsigned char *out, const unsigned char *m,
-                                  unsigned long long inlen,
+                                  unsigned long long   inlen,
                                   const unsigned char *key)
 {
     CRYPTO_ALIGN(64) poly1305_state_internal_t state;
 
     poly1305_init(&state, key);
@@ -66,52 +71,54 @@
 
 static int
 crypto_onetimeauth_poly1305_donna_init(crypto_onetimeauth_poly1305_state *state,
                                        const unsigned char *key)
 {
-    (void) sizeof(int[sizeof (crypto_onetimeauth_poly1305_state) >=
-                      sizeof (poly1305_state_internal_t) ? 1 : -1]);
-    poly1305_init((poly1305_state_internal_t *)(void *) state, key);
+    COMPILER_ASSERT(sizeof(crypto_onetimeauth_poly1305_state) >=
+        sizeof(poly1305_state_internal_t));
+    poly1305_init((poly1305_state_internal_t *) (void *) state, key);
 
     return 0;
 }
 
 static int
-crypto_onetimeauth_poly1305_donna_update(crypto_onetimeauth_poly1305_state *state,
-                                         const unsigned char *in,
-                                         unsigned long long inlen)
+crypto_onetimeauth_poly1305_donna_update(
+    crypto_onetimeauth_poly1305_state *state, const unsigned char *in,
+    unsigned long long inlen)
 {
-    poly1305_update((poly1305_state_internal_t *)(void *) state, in, inlen);
+    poly1305_update((poly1305_state_internal_t *) (void *) state, in, inlen);
 
     return 0;
 }
 
 static int
-crypto_onetimeauth_poly1305_donna_final(crypto_onetimeauth_poly1305_state *state,
-                                        unsigned char *out)
+crypto_onetimeauth_poly1305_donna_final(
+    crypto_onetimeauth_poly1305_state *state, unsigned char *out)
 {
-    poly1305_finish((poly1305_state_internal_t *)(void *) state, out);
+    poly1305_finish((poly1305_state_internal_t *) (void *) state, out);
 
     return 0;
 }
 
 static int
 crypto_onetimeauth_poly1305_donna_verify(const unsigned char *h,
                                          const unsigned char *in,
-                                         unsigned long long inlen,
+                                         unsigned long long   inlen,
                                          const unsigned char *k)
 {
     unsigned char correct[16];
 
-    crypto_onetimeauth_poly1305_donna(correct,in,inlen,k);
+    crypto_onetimeauth_poly1305_donna(correct, in, inlen, k);
 
-    return crypto_verify_16(h,correct);
+    return crypto_verify_16(h, correct);
 }
 
 struct crypto_onetimeauth_poly1305_implementation
-crypto_onetimeauth_poly1305_donna_implementation = {
-    SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_donna,
-    SODIUM_C99(.onetimeauth_verify =) crypto_onetimeauth_poly1305_donna_verify,
-    SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_donna_init,
-    SODIUM_C99(.onetimeauth_update =) crypto_onetimeauth_poly1305_donna_update,
-    SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_donna_final
-};
+    crypto_onetimeauth_poly1305_donna_implementation = {
+        SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_donna,
+        SODIUM_C99(.onetimeauth_verify =)
+            crypto_onetimeauth_poly1305_donna_verify,
+        SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_donna_init,
+        SODIUM_C99(.onetimeauth_update =)
+            crypto_onetimeauth_poly1305_donna_update,
+        SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_donna_final
+    };