Use argument a to return/read TEE_ATTR_ECC_CURVE

Change-Id: Ia642a38e260b6d60db60ed6051107c72c6b24415

diff --git a/ta/src/cmd_exec.c b/ta/src/cmd_exec.c
index 2df62889bf4d2672e6b47aed10110f82dd502de5..427b6f100fd588630d3eae7e74d85a7dbafce0ab 100644 (file)
--- a/ta/src/cmd_exec.c
+++ b/ta/src/cmd_exec.c
@@ -673,7 +673,7 @@ TEE_Result KM_ExecCmdGenerateECKey(TEE_Param param[4])
                return TEE_ERROR_BAD_PARAMETERS;
        }
 
-       KM_InitValueAttribute(&ecParams[0], TEE_ATTR_ECC_CURVE, 0, (uint32_t) curve);
+       KM_InitValueAttribute(&ecParams[0], TEE_ATTR_ECC_CURVE, (uint32_t) curve, 0);
 
        return KM_GenerateAsymKey(param[1].memref.buffer,
                                                        param[1].memref.size,

diff --git a/ta/src/internal.c b/ta/src/internal.c
index 11ce8ea3e269b315ff497c6a9fb4721f6f06a4eb..da04dda6ff135940fb5be7c02237ca592071c53c 100644 (file)
--- a/ta/src/internal.c
+++ b/ta/src/internal.c
@@ -782,7 +782,7 @@ TEE_Result KM_EccCurveToKeyBitSize(uint32_t curve, uint32_t *bitsize)
 TEE_Result KM_EcpublickeyToDer(TEE_ObjectHandle keyHndl, KM_BinaryData *der)
 {
        TEE_Result ret = TEE_SUCCESS;
-       uint32_t a, curve;
+       uint32_t b, curve;
        KM_BinaryData x, y;
        DerData der_x, der_y, der_out;
 
@@ -791,7 +791,7 @@ TEE_Result KM_EcpublickeyToDer(TEE_ObjectHandle keyHndl, KM_BinaryData *der)
        y.data = NULL;
        der_out.data = NULL;
 
-       ret = TEE_GetObjectValueAttribute(keyHndl, TEE_ATTR_ECC_CURVE, &a, &curve);
+       ret = TEE_GetObjectValueAttribute(keyHndl, TEE_ATTR_ECC_CURVE, &curve, &b);
        if (ret != TEE_SUCCESS) {
                goto  clean;
        }
@@ -829,7 +829,7 @@ TEE_Result KM_DerToEcpublic(void *data, uint32_t data_size, uint32_t key_type,
                                                                TEE_ObjectHandle *decKeyHndl)
 {
        TEE_Result ret = TEE_SUCCESS;
-       uint32_t a = 0, curve = 0;
+       uint32_t b = 0, curve = 0;
        DerData x = {NULL, 0}, y = {NULL, 0}, der = {data, data_size};
        TEE_Attribute attr[3];
        uint32_t maxObjectSizeBits = 0;
@@ -840,7 +840,7 @@ TEE_Result KM_DerToEcpublic(void *data, uint32_t data_size, uint32_t key_type,
                return ret;
        }
 
-       KM_InitValueAttribute(&attr[0], TEE_ATTR_ECC_CURVE, a, curve);
+       KM_InitValueAttribute(&attr[0], TEE_ATTR_ECC_CURVE, curve, b);
        KM_InitRefAttribute(&attr[1], TEE_ATTR_ECC_PUBLIC_VALUE_X, x.data, x.size);
        KM_InitRefAttribute(&attr[2], TEE_ATTR_ECC_PUBLIC_VALUE_Y, y.data, y.size);