1 files changed, 23 insertions, 24 deletions

diff --git a/src/methods/generic_gmac/generic_gmac.c b/src/methods/generic_gmac/generic_gmac.c
index 91b96cb..f7ea086 100644
--- a/src/methods/generic_gmac/generic_gmac.c
+++ b/src/methods/generic_gmac/generic_gmac.c
@@ -29,16 +29,15 @@
 #include "../common.h"
 
 
-struct fastd_method_context {
+struct fastd_method {
 	const fastd_cipher_info_t *cipher_info;
 	const fastd_mac_info_t *ghash_info;
 };
 
-
 struct fastd_method_session_state {
 	fastd_method_common_t common;
 
-	const fastd_method_context_t *ctx;
+	const fastd_method_t *method;
 
 	const fastd_cipher_t *cipher;
 	fastd_cipher_state_t *cipher_state;
@@ -48,11 +47,11 @@ struct fastd_method_session_state {
 };
 
 
-static bool method_create_by_name(const char *name, fastd_method_context_t **method_ctx) {
-	fastd_method_context_t ctx;
+static bool method_create_by_name(const char *name, fastd_method_t **method) {
+	fastd_method_t m;
 
-	ctx.ghash_info = fastd_mac_info_get_by_name("ghash");
-	if (!ctx.ghash_info)
+	m.ghash_info = fastd_mac_info_get_by_name("ghash");
+	if (!m.ghash_info)
 		return false;
 
 	size_t len = strlen(name);
@@ -69,38 +68,38 @@ static bool method_create_by_name(const char *name, fastd_method_context_t **met
 	memcpy(cipher_name, name, len-5);
 	cipher_name[len-5] = 0;
 
-	ctx.cipher_info = fastd_cipher_info_get_by_name(cipher_name);
-	if (!ctx.cipher_info)
+	m.cipher_info = fastd_cipher_info_get_by_name(cipher_name);
+	if (!m.cipher_info)
 		return false;
 
-	if (ctx.cipher_info->iv_length <= COMMON_NONCEBYTES)
+	if (m.cipher_info->iv_length <= COMMON_NONCEBYTES)
 		return false;
 
-	*method_ctx = malloc(sizeof(fastd_method_context_t));
-	**method_ctx = ctx;
+	*method = malloc(sizeof(fastd_method_t));
+	**method = m;
 
 	return true;
 }
 
-static void method_destroy(fastd_method_context_t *method_ctx) {
-	free(method_ctx);
+static void method_destroy(fastd_method_t *method) {
+	free(method);
 }
 
-static size_t method_key_length(fastd_context_t *ctx UNUSED, const fastd_method_context_t *method_ctx) {
-	return method_ctx->cipher_info->key_length + method_ctx->ghash_info->key_length;
+static size_t method_key_length(fastd_context_t *ctx UNUSED, const fastd_method_t *method) {
+	return method->cipher_info->key_length + method->ghash_info->key_length;
 }
 
-static fastd_method_session_state_t* method_session_init(fastd_context_t *ctx, const fastd_method_context_t *method_ctx, const uint8_t *secret, bool initiator) {
+static fastd_method_session_state_t* method_session_init(fastd_context_t *ctx, const fastd_method_t *method, const uint8_t *secret, bool initiator) {
 	fastd_method_session_state_t *session = malloc(sizeof(fastd_method_session_state_t));
 
 	fastd_method_common_init(ctx, &session->common, initiator);
-	session->ctx = method_ctx;
+	session->method = method;
 
-	session->cipher = fastd_cipher_get(ctx, session->ctx->cipher_info);
+	session->cipher = fastd_cipher_get(ctx, method->cipher_info);
 	session->cipher_state = session->cipher->init(ctx, secret);
 
-	session->ghash = fastd_mac_get(ctx, session->ctx->ghash_info);
-	session->ghash_state = session->ghash->init(ctx, secret + session->ctx->cipher_info->key_length);
+	session->ghash = fastd_mac_get(ctx, method->ghash_info);
+	session->ghash_state = session->ghash->init(ctx, secret + method->cipher_info->key_length);
 
 	return session;
 }
@@ -149,7 +148,7 @@ static bool method_encrypt(fastd_context_t *ctx, fastd_peer_t *peer UNUSED, fast
 	if (tail_len)
 		memset(in.data+in.len, 0, tail_len);
 
-	size_t iv_length = session->ctx->cipher_info->iv_length;
+	size_t iv_length = session->method->cipher_info->iv_length;
 	uint8_t nonce[iv_length];
 	memset(nonce, 0, iv_length);
 	memcpy(nonce, session->common.send_nonce, COMMON_NONCEBYTES);
@@ -204,7 +203,7 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho
 		return false;
 
 
-	size_t iv_length = session->ctx->cipher_info->iv_length;
+	size_t iv_length = session->method->cipher_info->iv_length;
 	uint8_t nonce[iv_length];
 	memset(nonce, 0, iv_length);
 	memcpy(nonce, in.data, COMMON_NONCEBYTES);
@@ -253,7 +252,7 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho
 	return true;
 }
 
-const fastd_method_t fastd_method_generic_gmac = {
+const fastd_method_provider_t fastd_method_generic_gmac = {
 	.max_overhead = COMMON_HEADBYTES + sizeof(fastd_block128_t),
 	.min_encrypt_head_space = sizeof(fastd_block128_t),
 	.min_decrypt_head_space = 0,