summaryrefslogtreecommitdiffstats
path: root/src/methods/generic_gmac
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-11-29 22:15:58 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-11-29 22:15:58 +0100
commitd0707b161d10cf79242d40b24853988c89c7604a (patch)
tree2d7ebb6082708f49c17ec6385f6019b83be0dda6 /src/methods/generic_gmac
parent27c14deaedc8f914e82388e41e61e8adbfd13f35 (diff)
downloadfastd-d0707b161d10cf79242d40b24853988c89c7604a.tar
fastd-d0707b161d10cf79242d40b24853988c89c7604a.zip
crypto: separate cipher/MAC availability check from information request
Diffstat (limited to 'src/methods/generic_gmac')
-rw-r--r--src/methods/generic_gmac/generic_gmac.c40
1 files changed, 18 insertions, 22 deletions
diff --git a/src/methods/generic_gmac/generic_gmac.c b/src/methods/generic_gmac/generic_gmac.c
index 5501076..50f4f57 100644
--- a/src/methods/generic_gmac/generic_gmac.c
+++ b/src/methods/generic_gmac/generic_gmac.c
@@ -43,8 +43,8 @@ struct fastd_method_session_state {
};
-static bool cipher_get(fastd_context_t *ctx, const char *name, const fastd_cipher_info_t **cipher_info, const fastd_cipher_t **cipher, const fastd_cipher_context_t **cctx) {
- if (!fastd_mac_info_get_by_name("ghash"))
+static bool cipher_get(fastd_context_t *ctx, const char *name, const fastd_cipher_info_t **cipher_info, const fastd_cipher_t **cipher, const fastd_cipher_context_t **cctx, bool check) {
+ if (check && !fastd_mac_is_available("ghash"))
return false;
size_t len = strlen(name);
@@ -62,36 +62,32 @@ static bool cipher_get(fastd_context_t *ctx, const char *name, const fastd_ciphe
memcpy(cipher_name, name, len-5);
cipher_name[len-5] = 0;
- const fastd_cipher_info_t *info = NULL;
-
- if (ctx) {
- *cipher = fastd_cipher_get_by_name(ctx, cipher_name, &info, cctx);
- if (!*cipher)
- return false;
- }
- else {
- info = fastd_cipher_info_get_by_name(cipher_name);
- if (!info)
- return false;
- }
-
- if (info->iv_length <= COMMON_NONCEBYTES)
+ if (check && !fastd_cipher_is_available(cipher_name))
return false;
- if (cipher_info)
- *cipher_info = info;
+ if (ctx)
+ *cipher = fastd_cipher_get_by_name(ctx, cipher_name, cipher_info, cctx);
+ else if (cipher_info)
+ *cipher_info = fastd_cipher_info_get_by_name(cipher_name);
return true;
}
-
static bool method_provides(const char *name) {
- return cipher_get(NULL, name, NULL, NULL, NULL);
+ const fastd_cipher_info_t *cipher_info;
+
+ if (!cipher_get(NULL, name, &cipher_info, NULL, NULL, true))
+ return false;
+
+ if (cipher_info->iv_length <= COMMON_NONCEBYTES)
+ return false;
+
+ return true;
}
static size_t method_key_length(fastd_context_t *ctx, const char *name) {
const fastd_cipher_info_t *cipher_info;
- if (!cipher_get(NULL, name, &cipher_info, NULL, NULL))
+ if (!cipher_get(NULL, name, &cipher_info, NULL, NULL, false))
exit_bug(ctx, "generic-gmac: can't get cipher key length");
return cipher_info->key_length + sizeof(fastd_block128_t);
@@ -102,7 +98,7 @@ static fastd_method_session_state_t* method_session_init(fastd_context_t *ctx, c
fastd_method_common_init(ctx, &session->common, initiator);
- if (!cipher_get(ctx, name, &session->cipher_info, &session->cipher, &session->cipher_ctx))
+ if (!cipher_get(ctx, name, &session->cipher_info, &session->cipher, &session->cipher_ctx, false))
exit_bug(ctx, "generic-gmac: can't instanciate cipher");
session->cipher_state = session->cipher->init_state(ctx, session->cipher_ctx, secret);