Delete length argument from GCM_SET_KEY.

diff --git a/ChangeLog b/ChangeLog
index 2fc92a93abfc35f0f53a8979baa96573d84b4535..53348ae4f9a207e2fd46313f38501c7883873911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-25  Niels Möller  <nisse@lysator.liu.se>
+
+       * gcm.h (GCM_SET_KEY): Deleted length argument.
+       * gcm-aes.c (gcm_aes_set_key): Use aes_set_encrypt_key and
+       gcm_set_key, can no longer use GCM_SET_KEY macro.
+
 2014-01-23  Niels Möller  <nisse@lysator.liu.se>
 
        * testsuite/gcm-test.c (test_main): Use the correct

diff --git a/gcm-aes.c b/gcm-aes.c
index f5f54bc4aaf5c8582821b76dec99a23daa873704..37213c3c533b16813f3c5de760661b2c4999a5b6 100644 (file)
--- a/gcm-aes.c
+++ b/gcm-aes.c
@@ -32,7 +32,9 @@
 void
 gcm_aes_set_key(struct gcm_aes_ctx *ctx, size_t length, const uint8_t *key)
 {
-  GCM_SET_KEY(ctx, aes_set_encrypt_key, aes_encrypt, length, key);
+  aes_set_encrypt_key (&ctx->cipher, length, key);
+  gcm_set_key (&ctx->key, &ctx->cipher,
+              (nettle_crypt_func *) aes_encrypt);
 }
 
 void

diff --git a/gcm.h b/gcm.h
index 39b9e48a3a7d4f5effc3ad0160b3d450ed0c9a2d..10578107dcb87bc083021aa3a79f6eed7ce0c4e2 100644 (file)
--- a/gcm.h
+++ b/gcm.h
@@ -115,9 +115,9 @@ gcm_digest(struct gcm_ctx *ctx, const struct gcm_key *key,
 { type cipher; struct gcm_key key; struct gcm_ctx gcm; }
 
 /* NOTE: Avoid using NULL, as we don't include anything defining it. */
-#define GCM_SET_KEY(ctx, set_key, encrypt, length, data)       \
+#define GCM_SET_KEY(ctx, set_key, encrypt, key)                        \
   do {                                                         \
-    (set_key)(&(ctx)->cipher, (length), (data));               \
+    (set_key)(&(ctx)->cipher, (key));                          \
     if (0) (encrypt)(&(ctx)->cipher, 0, (void *)0, (void *)0); \
     gcm_set_key(&(ctx)->key, &(ctx)->cipher,                   \
                (nettle_crypt_func *) (encrypt));               \