From 7b96171b3bed031238bee741a0a223ea332946b4 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Sat, 24 Jul 2010 02:29:35 +0200
Subject: Replace algo_can_*, algo_needs_iv with direct accesses

---
 ncr-sessions.c | 67 +++++-----------------------------------------------------
 1 file changed, 5 insertions(+), 62 deletions(-)

diff --git a/ncr-sessions.c b/ncr-sessions.c
index dfc8976..e96da56 100644
--- a/ncr-sessions.c
+++ b/ncr-sessions.c
@@ -211,63 +211,6 @@ int i = 0;
 	return NULL;
 }
 
-static int algo_needs_iv(ncr_algorithm_t algo)
-{
-ncr_algorithm_t a;
-int i = 0;
-
-	while((a=algo_properties[i].algo)!=NCR_ALG_NONE) {
-		if (a == algo)
-			return algo_properties[i].needs_iv;
-		i++;
-	}
-
-	return 0;
-}
-
-static int algo_can_sign(ncr_algorithm_t algo)
-{
-ncr_algorithm_t a;
-int i = 0;
-
-	while((a=algo_properties[i].algo)!=NCR_ALG_NONE) {
-		if (a == algo)
-			return algo_properties[i].can_sign;
-		i++;
-	}
-
-	return 0;
-}
-
-static int algo_can_encrypt(ncr_algorithm_t algo)
-{
-ncr_algorithm_t a;
-int i = 0;
-
-	while((a=algo_properties[i].algo)!=NCR_ALG_NONE) {
-		if (a == algo)
-			return algo_properties[i].can_encrypt;
-		i++;
-	}
-
-	return 0;
-}
-
-static int algo_can_digest(ncr_algorithm_t algo)
-{
-ncr_algorithm_t a;
-int i = 0;
-
-	while((a=algo_properties[i].algo)!=NCR_ALG_NONE) {
-		if (a == algo)
-			return algo_properties[i].can_digest;
-		i++;
-	}
-
-	return 0;
-}
-
-
 int _ncr_algo_digest_size(ncr_algorithm_t algo)
 {
 ncr_algorithm_t a;
@@ -305,7 +248,7 @@ static int _ncr_session_init(struct ncr_lists* lists, struct ncr_session_st* ses
 	switch(session->op) {
 		case NCR_OP_ENCRYPT:
 		case NCR_OP_DECRYPT:
-			if (algo_can_encrypt(session->algorithm)==0) {
+			if (!ns->algorithm->can_encrypt) {
 				err();
 				ret = -EINVAL;
 				goto fail;
@@ -336,7 +279,7 @@ static int _ncr_session_init(struct ncr_lists* lists, struct ncr_session_st* ses
 					goto fail;
 				}
 
-				if (algo_needs_iv(session->algorithm)) {
+				if (ns->algorithm->needs_iv) {
 					if (session->params.params.cipher.iv_size > sizeof(session->params.params.cipher.iv)) {
 						err();
 						ret = -EINVAL;
@@ -360,7 +303,7 @@ static int _ncr_session_init(struct ncr_lists* lists, struct ncr_session_st* ses
 
 		case NCR_OP_SIGN:
 		case NCR_OP_VERIFY:
-			if (algo_can_sign(session->algorithm)==0) {
+			if (!ns->algorithm->can_sign) {
 				err();
 				ret = -EINVAL;
 				goto fail;
@@ -394,7 +337,7 @@ static int _ncr_session_init(struct ncr_lists* lists, struct ncr_session_st* ses
 					return PTR_ERR(sign_hash);
 				}
 
-				if (algo_can_digest(sign_hash->algo) == 0) {
+				if (!sign_hash->can_digest) {
 					err();
 					ret = -EINVAL;
 					goto fail;
@@ -426,7 +369,7 @@ static int _ncr_session_init(struct ncr_lists* lists, struct ncr_session_st* ses
 
 			break;
 		case NCR_OP_DIGEST:
-			if (algo_can_digest(session->algorithm)==0) {
+			if (!ns->algorithm->can_digest) {
 				err();
 				ret = -EINVAL;
 				goto fail;
-- 
cgit