core: ltc: rename prng_mpa to prng_crypto

Changes the name of the registered prng descriptor from "prng_mpa" to
"prng_crypto" to better reflect the source of the prng.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

5 files changed, 34 insertions, 34 deletions

diff --git a/core/lib/libtomcrypt/dh.c b/core/lib/libtomcrypt/dh.c
index 51b0504c..54cd1565 100644
--- a/core/lib/libtomcrypt/dh.c
+++ b/core/lib/libtomcrypt/dh.c
@@ -46,7 +46,7 @@ TEE_Result crypto_acipher_gen_dh_key(struct dh_keypair *key, struct bignum *q,
 	/* Generate the DH key */
 	ltc_tmp_key.g = key->g;
 	ltc_tmp_key.p = key->p;
-	ltc_res = dh_make_key(NULL, find_prng("prng_mpa"), q, xbits,
+	ltc_res = dh_make_key(NULL, find_prng("prng_crypto"), q, xbits,
 			      &ltc_tmp_key);
 	if (ltc_res != CRYPT_OK) {
 		res = TEE_ERROR_BAD_PARAMETERS;
diff --git a/core/lib/libtomcrypt/dsa.c b/core/lib/libtomcrypt/dsa.c
index 3fa6301c..728f191d 100644
--- a/core/lib/libtomcrypt/dsa.c
+++ b/core/lib/libtomcrypt/dsa.c
@@ -76,7 +76,7 @@ TEE_Result crypto_acipher_gen_dsa_key(struct dsa_keypair *key, size_t key_size)
 		group_size = 40;
 
 	/* Generate the DSA key */
-	ltc_res = dsa_make_key(NULL, find_prng("prng_mpa"), group_size,
+	ltc_res = dsa_make_key(NULL, find_prng("prng_crypto"), group_size,
 			       modulus_size, &ltc_tmp_key);
 	if (ltc_res != CRYPT_OK) {
 		res = TEE_ERROR_BAD_PARAMETERS;
@@ -147,7 +147,7 @@ TEE_Result crypto_acipher_dsa_sign(uint32_t algo, struct dsa_keypair *key,
 	}
 
 	ltc_res = dsa_sign_hash_raw(msg, msg_len, r, s, NULL,
-				    find_prng("prng_mpa"), &ltc_key);
+				    find_prng("prng_crypto"), &ltc_key);
 
 	if (ltc_res == CRYPT_OK) {
 		*sig_len = 2 * mp_unsigned_bin_size(ltc_key.q);
diff --git a/core/lib/libtomcrypt/ecc.c b/core/lib/libtomcrypt/ecc.c
index 92afe6c4..a4903887 100644
--- a/core/lib/libtomcrypt/ecc.c
+++ b/core/lib/libtomcrypt/ecc.c
@@ -138,7 +138,7 @@ TEE_Result crypto_acipher_gen_ecc_key(struct ecc_keypair *key)
 		return res;
 
 	/* Generate the ECC key */
-	ltc_res = ecc_make_key(NULL, find_prng("prng_mpa"),
+	ltc_res = ecc_make_key(NULL, find_prng("prng_crypto"),
 			       key_size_bytes, &ltc_tmp_key);
 	if (ltc_res != CRYPT_OK)
 		return TEE_ERROR_BAD_PARAMETERS;
@@ -277,7 +277,7 @@ TEE_Result crypto_acipher_ecc_sign(uint32_t algo, struct ecc_keypair *key,
 	}
 
 	ltc_res = ecc_sign_hash_raw(msg, msg_len, r, s,
-				    NULL, find_prng("prng_mpa"), &ltc_key);
+				    NULL, find_prng("prng_crypto"), &ltc_key);
 
 	if (ltc_res == CRYPT_OK) {
 		*sig_len = 2 * key_size_bytes;
diff --git a/core/lib/libtomcrypt/rsa.c b/core/lib/libtomcrypt/rsa.c
index e70e4da6..7e222d9f 100644
--- a/core/lib/libtomcrypt/rsa.c
+++ b/core/lib/libtomcrypt/rsa.c
@@ -150,7 +150,7 @@ TEE_Result crypto_acipher_gen_rsa_key(struct rsa_keypair *key, size_t key_size)
 	e = mp_get_int(key->e);
 
 	/* Generate a temporary RSA key */
-	ltc_res = rsa_make_key(NULL, find_prng("prng_mpa"), key_size / 8, e,
+	ltc_res = rsa_make_key(NULL, find_prng("prng_crypto"), key_size / 8, e,
 			       &ltc_tmp_key);
 	if (ltc_res != CRYPT_OK) {
 		res = TEE_ERROR_BAD_PARAMETERS;
@@ -406,7 +406,7 @@ TEE_Result crypto_acipher_rsaes_encrypt(uint32_t algo,
 
 	ltc_res = rsa_encrypt_key_ex(src, src_len, dst,
 				     (unsigned long *)(dst_len), label,
-				     label_len, NULL, find_prng("prng_mpa"),
+				     label_len, NULL, find_prng("prng_crypto"),
 				     ltc_hashindex, ltc_rsa_algo, &ltc_key);
 	switch (ltc_res) {
 	case CRYPT_PK_INVALID_PADDING:
@@ -504,7 +504,7 @@ TEE_Result crypto_acipher_rsassa_sign(uint32_t algo, struct rsa_keypair *key,
 	ltc_sig_len = mod_size;
 
 	ltc_res = rsa_sign_hash_ex(msg, msg_len, sig, &ltc_sig_len,
-				   ltc_rsa_algo, NULL, find_prng("prng_mpa"),
+				   ltc_rsa_algo, NULL, find_prng("prng_crypto"),
 				   ltc_hashindex, salt_len, &ltc_key);
 
 	*sig_len = ltc_sig_len;
diff --git a/core/lib/libtomcrypt/tomcrypt.c b/core/lib/libtomcrypt/tomcrypt.c
index 2663e774..db4d38b3 100644
--- a/core/lib/libtomcrypt/tomcrypt.c
+++ b/core/lib/libtomcrypt/tomcrypt.c
@@ -24,26 +24,26 @@
 #endif
 
 /* Random generator */
-static int prng_mpa_start(union Prng_state *prng __unused)
+static int prng_crypto_start(union Prng_state *prng __unused)
 {
 	return CRYPT_OK;
 }
 
-static int prng_mpa_add_entropy(const unsigned char *in __unused,
-				unsigned long inlen __unused,
-				union Prng_state *prng __unused)
+static int prng_crypto_add_entropy(const unsigned char *in __unused,
+				   unsigned long inlen __unused,
+				   union Prng_state *prng __unused)
 {
 	/* No entropy is required */
 	return CRYPT_OK;
 }
 
-static int prng_mpa_ready(union Prng_state *prng __unused)
+static int prng_crypto_ready(union Prng_state *prng __unused)
 {
 	return CRYPT_OK;
 }
 
-static unsigned long prng_mpa_read(unsigned char *out, unsigned long outlen,
-				   union Prng_state *prng __unused)
+static unsigned long prng_crypto_read(unsigned char *out, unsigned long outlen,
+				      union Prng_state *prng __unused)
 {
 	if (crypto_rng_read(out, outlen))
 		return 0;
@@ -51,41 +51,41 @@ static unsigned long prng_mpa_read(unsigned char *out, unsigned long outlen,
 	return outlen;
 }
 
-static int prng_mpa_done(union Prng_state *prng __unused)
+static int prng_crypto_done(union Prng_state *prng __unused)
 {
 	return CRYPT_OK;
 }
 
-static int prng_mpa_export(unsigned char *out __unused,
-			   unsigned long *outlen __unused,
-			   union Prng_state *prng __unused)
+static int prng_crypto_export(unsigned char *out __unused,
+			      unsigned long *outlen __unused,
+			      union Prng_state *prng __unused)
 {
 	return CRYPT_OK;
 }
 
-static int prng_mpa_import(const unsigned char *in  __unused,
-			   unsigned long inlen __unused,
-			   union Prng_state *prng __unused)
+static int prng_crypto_import(const unsigned char *in  __unused,
+			      unsigned long inlen __unused,
+			      union Prng_state *prng __unused)
 {
 	return CRYPT_OK;
 }
 
-static int prng_mpa_test(void)
+static int prng_crypto_test(void)
 {
 	return CRYPT_OK;
 }
 
-static const struct ltc_prng_descriptor prng_mpa_desc = {
-	.name = "prng_mpa",
+static const struct ltc_prng_descriptor prng_crypto_desc = {
+	.name = "prng_crypto",
 	.export_size = 64,
-	.start = &prng_mpa_start,
-	.add_entropy = &prng_mpa_add_entropy,
-	.ready = &prng_mpa_ready,
-	.read = &prng_mpa_read,
-	.done = &prng_mpa_done,
-	.pexport = &prng_mpa_export,
-	.pimport = &prng_mpa_import,
-	.test = &prng_mpa_test,
+	.start = &prng_crypto_start,
+	.add_entropy = &prng_crypto_add_entropy,
+	.ready = &prng_crypto_ready,
+	.read = &prng_crypto_read,
+	.done = &prng_crypto_done,
+	.pexport = &prng_crypto_export,
+	.pimport = &prng_crypto_import,
+	.test = &prng_crypto_test,
 };
 
 /*
@@ -122,7 +122,7 @@ static void tee_ltc_reg_algs(void)
 #if defined(CFG_CRYPTO_SHA512)
 	register_hash(&sha512_desc);
 #endif
-	register_prng(&prng_mpa_desc);
+	register_prng(&prng_crypto_desc);
 }
 
 TEE_Result crypto_init(void)