Rename CONFIG_AS*YM*METRIC, push into headers

1 files changed, 6 insertions, 17 deletions

diff --git a/ncr-key.c b/ncr-key.c
index baf879f..5e05eb8 100644
--- a/ncr-key.c
+++ b/ncr-key.c
@@ -251,7 +251,6 @@ int ncr_key_export(struct ncr_lists *lst, const struct ncr_key_export *data,
 
 		ret = item->key.secret.size;
 		break;
-#ifdef CONFIG_ASSYMETRIC
 	case NCR_KEY_TYPE_PUBLIC:
 	case NCR_KEY_TYPE_PRIVATE:
 		tmp_size = data->buffer_size;
@@ -278,7 +277,6 @@ int ncr_key_export(struct ncr_lists *lst, const struct ncr_key_export *data,
 
 		ret = tmp_size;
 		break;
-#endif
 	default:
 		err();
 		ret = -EINVAL;
@@ -382,7 +380,6 @@ int ncr_key_import(struct ncr_lists *lst, const struct ncr_key_import *data,
 		memcpy(item->key.secret.data, tmp, tmp_size);
 		item->key.secret.size = tmp_size;
 		break;
-#ifdef CONFIG_ASSYMETRIC
 	case NCR_KEY_TYPE_PRIVATE:
 	case NCR_KEY_TYPE_PUBLIC:
 		ret = ncr_pk_unpack(item, tmp, tmp_size);
@@ -391,7 +388,6 @@ int ncr_key_import(struct ncr_lists *lst, const struct ncr_key_import *data,
 			goto fail;
 		}
 		break;
-#endif
 	default:
 		err();
 		ret = -EINVAL;
@@ -411,13 +407,10 @@ fail:
 void ncr_key_clear(struct key_item_st *item)
 {
 	/* clears any previously allocated parameters */
-#ifdef CONFIG_ASSYMETRIC
 	if (item->type == NCR_KEY_TYPE_PRIVATE ||
 	    item->type == NCR_KEY_TYPE_PUBLIC) {
-
 		ncr_pk_clear(item);
 	}
-#endif
 	memset(&item->key, 0, sizeof(item->key));
 	memset(item->key_id, 0, sizeof(item->key_id));
 	item->key_id_size = 0;
@@ -501,7 +494,7 @@ fail:
 	return ret;
 }
 
-#ifdef CONFIG_ASSYMETRIC
+#ifdef CONFIG_CRYPTO_USERSPACE_ASYMMETRIC
 
 /* Those values are derived from "ECRYPT II Yearly Report on Algorithms and
  * Keysizes (2009-2010)". It maps the strength of public key algorithms to 
@@ -561,7 +554,7 @@ static unsigned int dlog_to_bits(unsigned int dlog_bits)
 	return ecrypt_vals[i - 1].bits;
 }
 
-#endif
+#endif /* CONFIG_CRYPTO_USERSPACE_ASYMMETRIC */
 
 /* returns the security level of the key in bits. Private/Public keys
  * are mapped to symmetric key bits using the ECRYPT II 2010 recommendation.
@@ -576,7 +569,7 @@ int _ncr_key_get_sec_level(struct key_item_st *item)
 			return 112;
 
 		return item->key.secret.size * 8;
-#ifdef CONFIG_ASSYMETRIC
+#ifdef CONFIG_CRYPTO_USERSPACE_ASYMMETRIC
 	} else if (item->type == NCR_KEY_TYPE_PRIVATE) {
 		int bits;
 
@@ -608,7 +601,7 @@ int _ncr_key_get_sec_level(struct key_item_st *item)
 		default:
 			return -EINVAL;
 		}
-#endif
+#endif /* CONFIG_CRYPTO_USERSPACE_ASYMMETRIC */
 	} else {
 		return -EINVAL;
 	}
@@ -676,11 +669,11 @@ fail:
 	return ret;
 }
 
+#ifdef CONFIG_CRYPTO_USERSPACE_ASYMMETRIC
 int ncr_key_generate_pair(struct ncr_lists *lst,
 			  const struct ncr_key_generate_pair *gen,
 			  struct nlattr *tb[])
 {
-#ifdef CONFIG_ASSYMETRIC
 	struct key_item_st *private = NULL;
 	struct key_item_st *public = NULL;
 	int ret;
@@ -748,10 +741,8 @@ fail:
 		_ncr_key_item_put(private);
 	}
 	return ret;
-#else
-	return -EOPNOTSUPP;
-#endif
 }
+#endif /* CONFIG_CRYPTO_USERSPACE_ASYMMETRIC */
 
 int ncr_key_derive(struct ncr_lists *lst, const struct ncr_key_derive *data,
 		   struct nlattr *tb[])
@@ -790,7 +781,6 @@ int ncr_key_derive(struct ncr_lists *lst, const struct ncr_key_derive *data,
 	}
 
 	switch (key->type) {
-#ifdef CONFIG_ASSYMETRIC
 	case NCR_KEY_TYPE_PUBLIC:
 	case NCR_KEY_TYPE_PRIVATE:
 		ret = ncr_pk_derive(newkey, key, tb);
@@ -799,7 +789,6 @@ int ncr_key_derive(struct ncr_lists *lst, const struct ncr_key_derive *data,
 			goto fail;
 		}
 		break;
-#endif
 	default:
 		err();
 		ret = -EINVAL;