summaryrefslogtreecommitdiff
path: root/nettle-internal.c
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2014-01-26 21:35:40 +0100
committerNiels Möller <nisse@lysator.liu.se>2014-01-26 21:35:40 +0100
commite57d2fe2e0385f219e1e4f7adc051ad6b98905c1 (patch)
treebe39f15d6a3132030e6c873315c25657c3fb1859 /nettle-internal.c
parent187631fa9c0b08e1bcb22e5580b11e6be909dd4b (diff)
downloadnettle-e57d2fe2e0385f219e1e4f7adc051ad6b98905c1.tar.gz
New gcm-aes interface.
Diffstat (limited to 'nettle-internal.c')
-rw-r--r--nettle-internal.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/nettle-internal.c b/nettle-internal.c
index e4e71761..40f2dd45 100644
--- a/nettle-internal.c
+++ b/nettle-internal.c
@@ -107,12 +107,16 @@ nettle_salsa20r12 = {
(nettle_crypt_func *) salsa20r12_crypt
};
+#define gcm_aes128_set_nonce gcm_aes128_set_iv
+#define gcm_aes192_set_nonce gcm_aes192_set_iv
+#define gcm_aes256_set_nonce gcm_aes256_set_iv
const struct nettle_aead
-nettle_gcm_aes128 = _NETTLE_AEAD(gcm, GCM, aes, 128);
+nettle_gcm_aes128 = _NETTLE_AEAD(gcm, GCM, aes128, 128);
const struct nettle_aead
-nettle_gcm_aes192 = _NETTLE_AEAD(gcm, GCM, aes, 192);
+nettle_gcm_aes192 = _NETTLE_AEAD(gcm, GCM, aes192, 192);
const struct nettle_aead
-nettle_gcm_aes256 = _NETTLE_AEAD(gcm, GCM, aes, 256);
+nettle_gcm_aes256 = _NETTLE_AEAD(gcm, GCM, aes256, 256);
+
/* Old, unified, interface */
const struct nettle_cipher nettle_unified_aes128
@@ -172,8 +176,5 @@ eax_aes128_digest(struct eax_aes128_ctx *ctx,
EAX_DIGEST(ctx, aes128_encrypt, length, digest);
}
-/* FIXME: Rename to set_nonce, in struct nettle_aead. */
-#define eax_aes128_set_iv eax_aes128_set_nonce
-
const struct nettle_aead
-nettle_eax_aes128 = _NETTLE_AEAD_FIX(eax, EAX, aes128, 128);
+nettle_eax_aes128 = _NETTLE_AEAD(eax, EAX, aes128, 128);