summaryrefslogtreecommitdiff
path: root/gcm.h
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2011-02-13 15:33:07 +0100
committerNiels Möller <nisse@lysator.liu.se>2011-02-13 15:33:07 +0100
commit4961af0a52912d3bc43518d8d5ba17b7f8d60561 (patch)
tree5b241dd585161084b2cebcfa6611f6985a758d6b /gcm.h
parentccba0ebe59d083f04e865375aaf2ff441561fcc1 (diff)
downloadnettle-4961af0a52912d3bc43518d8d5ba17b7f8d60561.tar.gz
* gcm.h (GCM_UPDATE): Renamed, from...
(GCM_AUTH): ...old name. * gcm-aes.c (gcm_aes_update): Renamed, from... (gcm_aes_auth): ...old name. * gcm.c (gcm_update): Renamed, and fixed an assert. From... (gcm_auth): ...old name. Rev: nettle/ChangeLog:1.150 Rev: nettle/gcm-aes.c:1.3 Rev: nettle/gcm.c:1.14 Rev: nettle/gcm.h:1.11
Diffstat (limited to 'gcm.h')
-rw-r--r--gcm.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/gcm.h b/gcm.h
index 01dbd952..43a8c436 100644
--- a/gcm.h
+++ b/gcm.h
@@ -43,14 +43,14 @@ extern "C" {
/* Name mangling */
#define gcm_set_key nettle_gcm_set_key
#define gcm_set_iv nettle_gcm_set_iv
-#define gcm_auth nettle_gcm_auth
+#define gcm_update nettle_gcm_update
#define gcm_encrypt nettle_gcm_encrypt
#define gcm_decrypt nettle_gcm_decrypt
#define gcm_digest nettle_gcm_digest
#define gcm_aes_set_key nettle_gcm_aes_set_key
#define gcm_aes_set_iv nettle_gcm_aes_set_iv
-#define gcm_aes_auth nettle_gcm_aes_auth
+#define gcm_aes_update nettle_gcm_aes_update
#define gcm_aes_encrypt nettle_gcm_aes_encrypt
#define gcm_aes_decrypt nettle_gcm_aes_decrypt
#define gcm_aes_digest nettle_gcm_aes_digest
@@ -97,8 +97,8 @@ gcm_set_iv(struct gcm_ctx *ctx, const struct gcm_key *key,
unsigned length, const uint8_t *iv);
void
-gcm_auth(struct gcm_ctx *ctx, const struct gcm_key *key,
- unsigned length, const uint8_t *data);
+gcm_update(struct gcm_ctx *ctx, const struct gcm_key *key,
+ unsigned length, const uint8_t *data);
void
gcm_encrypt(struct gcm_ctx *ctx, const struct gcm_key *key,
@@ -127,8 +127,8 @@ gcm_digest(struct gcm_ctx *ctx, const struct gcm_key *key,
gcm_set_key(&(ctx)->key, &(ctx)->cipher, (encrypt)); \
} while (0)
-#define GCM_AUTH(ctx, encrypt, length, data) \
- gcm_auth(&(ctx)->gcm, &(ctx)->key, (length), (data))
+#define GCM_UPDATE(ctx, encrypt, length, data) \
+ gcm_update(&(ctx)->gcm, &(ctx)->key, (length), (data))
#define GCM_ENCRYPT(ctx, encrypt, length, dst, src) \
gcm_encrypt(&(ctx)->gcm, &(ctx)->key, &(ctx)->cipher, (encrypt), \
@@ -152,11 +152,9 @@ void
gcm_aes_set_iv(struct gcm_aes_ctx *ctx,
unsigned length, const uint8_t *iv);
-/* FIXME: Rename to gcm_aes_update, for consistency with other hash
- and mac functions? */
void
-gcm_aes_auth(struct gcm_aes_ctx *ctx,
- unsigned length, const uint8_t *data);
+gcm_aes_update(struct gcm_aes_ctx *ctx,
+ unsigned length, const uint8_t *data);
void
gcm_aes_encrypt(struct gcm_aes_ctx *ctx,