Revert "crypto: separate cipher/MAC availability check from information request"

This reverts commit d0707b161d10cf79242d40b24853988c89c7604a.

1 files changed, 18 insertions, 10 deletions

diff --git a/src/methods/cipher_test/cipher_test.c b/src/methods/cipher_test/cipher_test.c
index 32512b3..573e90a 100644
--- a/src/methods/cipher_test/cipher_test.c
+++ b/src/methods/cipher_test/cipher_test.c
@@ -38,7 +38,7 @@ 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, bool check) {
+static bool cipher_get(fastd_context_t *ctx, const char *name, const fastd_cipher_info_t **info, const fastd_cipher_t **cipher, const fastd_cipher_context_t **cctx) {
 	size_t len = strlen(name);
 
 	if (len < 12)
@@ -51,25 +51,33 @@ static bool cipher_get(fastd_context_t *ctx, const char *name, const fastd_ciphe
 	memcpy(cipher_name, name, len-12);
 	cipher_name[len-12] = 0;
 
-	if (check && !fastd_cipher_is_available(cipher_name))
-		return false;
+	const fastd_cipher_info_t *cipher_info = NULL;
+
+	if (ctx) {
+		*cipher = fastd_cipher_get_by_name(ctx, cipher_name, &cipher_info, cctx);
+		if (!*cipher)
+			return false;
+	}
+	else {
+		cipher_info = fastd_cipher_info_get_by_name(cipher_name);
+		if (!cipher_info)
+			return false;
+	}
 
-	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);
+	if (info)
+		*info = cipher_info;
 
 	return true;
 }
 
 
 static bool method_provides(const char *name) {
-	return cipher_get(NULL, name, NULL, NULL, NULL, true);
+	return cipher_get(NULL, name, NULL, NULL, NULL);
 }
 
 static size_t method_key_length(fastd_context_t *ctx, const char *name) {
 	const fastd_cipher_info_t *info;
-	if (!cipher_get(NULL, name, &info, NULL, NULL, false))
+	if (!cipher_get(NULL, name, &info, NULL, NULL))
 		exit_bug(ctx, "cipher-test: can't get cipher key length");
 
 	return info->key_length;
@@ -80,7 +88,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, false))
+	if (!cipher_get(ctx, name, &session->cipher_info, &session->cipher, &session->cipher_ctx))
 		exit_bug(ctx, "cipher-test: can't instanciate cipher");
 
 	session->cipher_state = session->cipher->init_state(ctx, session->cipher_ctx, secret);