Make poly1305 code use struct aes128_ctx.

diff --git a/ChangeLog b/ChangeLog
index e1e4b018806bcede86375a820240e1be1a0b4c9a..34f36305d442d3d038538c313ba5a29fc4dbd5b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-16  Niels Möller  <nisse@lysator.liu.se>
+
+       * poly1305-aes.h (struct poly1305_aes_ctx): Replace struct aes_ctx
+       by struct aes128_ctx.
+       * poly1305-aes.c (poly1305_aes_set_key, poly1305_aes_digest):
+       Update to use aes128_* functions.
+       * poly1305.h (POLY1305_SET_KEY): Drop key size argument when
+       calling set_key.
+
 2013-12-19  Niels Möller  <nisse@lysator.liu.se>
 
        * poly1305-aes.h (poly1305_aes_update): Define as an alias for

diff --git a/poly1305-aes.c b/poly1305-aes.c
index 26c26859f5021b09ec2def923ec604171459a795..ba0dd0ddec60f6faf3dc120c54ee0b8bb17b0779 100644 (file)
--- a/poly1305-aes.c
+++ b/poly1305-aes.c
@@ -30,7 +30,7 @@
 void
 poly1305_aes_set_key (struct poly1305_aes_ctx *ctx, const uint8_t * key)
 {
-  POLY1305_SET_KEY(ctx, aes_set_encrypt_key, key);
+  POLY1305_SET_KEY(ctx, aes128_set_encrypt_key, key);
 }
 
 void
@@ -44,5 +44,5 @@ void
 poly1305_aes_digest (struct poly1305_aes_ctx *ctx,
                     size_t length, uint8_t * digest)
 {
-  POLY1305_DIGEST(ctx, aes_encrypt, length, digest);
+  POLY1305_DIGEST(ctx, aes128_encrypt, length, digest);
 }

diff --git a/poly1305-aes.h b/poly1305-aes.h
index f2d28fbc845663f69358b31c244ad7653b7febbd..ae22d39c4af0ed6e119abd6270b7dadf234b1afc 100644 (file)
--- a/poly1305-aes.h
+++ b/poly1305-aes.h
@@ -41,7 +41,7 @@ extern "C" {
 #define poly1305_aes_set_nonce nettle_poly1305_aes_set_nonce
 #define poly1305_aes_digest nettle_poly1305_aes_digest
 
-struct poly1305_aes_ctx POLY1305_CTX(struct aes_ctx);
+struct poly1305_aes_ctx POLY1305_CTX(struct aes128_ctx);
 
 /* The _set_key function initialize the nonce to zero. */
 void

diff --git a/poly1305.h b/poly1305.h
index 13b2d6c83bffa1d3110cff33887ab1d4356f09c9..7afa387e07c0c2a5bc7043341a15b6411e1003c1 100644 (file)
--- a/poly1305.h
+++ b/poly1305.h
@@ -1,4 +1,4 @@
-/* poly1305-aes.h
+/* poly1305.h
  *
  * Poly1305 message authentication code.
  */
@@ -77,7 +77,7 @@ void poly1305_digest (struct poly1305_ctx *ctx,
 #define POLY1305_SET_KEY(ctx, set_key, key)    \
   do {                                         \
     poly1305_set_key(&(ctx)->pctx, (key+16));  \
-    (set_key)(&(ctx)->cipher, 16, (key));      \
+    (set_key)(&(ctx)->cipher, (key));          \
     (ctx)->pctx.index = 0;                     \
   } while (0)