Use argument a to return/read TEE_ATTR_ECC_CURVE

Change-Id: I585fa6750dcf6852bb565177a59d329f1f1cb19d

diff --git a/ssflib/src/ssf_crypto.cpp b/ssflib/src/ssf_crypto.cpp
index f7b67b64ed250cb152414e00ea4e52e78d90aca1..3506a4d12d7ee3a82f037260a4043141dd7654d2 100644 (file)
--- a/ssflib/src/ssf_crypto.cpp
+++ b/ssflib/src/ssf_crypto.cpp
@@ -2742,7 +2742,7 @@ TEE_Result TEE_AsymmetricSignDigest( TEE_OperationHandle operation, const TEE_At
                if (TEE_GetObjectValueAttribute(op->key1, TEE_ATTR_ECC_CURVE, &a, &b) != TEE_SUCCESS) {
                        CRYPTO_PANIC;
                }
-               key.ecc_curve = b;
+               key.ecc_curve = a;
                break;
        }
        default:
@@ -2863,7 +2863,7 @@ TEE_Result TEE_AsymmetricVerifyDigest( TEE_OperationHandle operation, const TEE_
                if (TEE_GetObjectValueAttribute(op->key1, TEE_ATTR_ECC_CURVE, &a, &b) != TEE_SUCCESS) {
                        CRYPTO_PANIC;
                }
-               key.ecc_curve = b;
+               key.ecc_curve = a;
                break;
        }
        default:
@@ -2901,7 +2901,7 @@ void TEE_DeriveKey( TEE_OperationHandle operation, TEE_Attribute* params, uint32
        crypto_internal_keydata pub_x, pub_y;
        unsigned int i, check = 0;
        TransientObject* tr = &derivedKey->tr;
-       uint32_t dummy_a;
+       uint32_t dummy_b;
        TEE_Attribute attrs[MAX_ATTRIBUTE_NUMBER];
        TEE_ObjectInfo key_info;
        size_t maxAttrSize;
@@ -2927,7 +2927,7 @@ void TEE_DeriveKey( TEE_OperationHandle operation, TEE_Attribute* params, uint32
                CRYPTO_PANIC;
        }
        if (TEE_GetObjectValueAttribute(op->key1, TEE_ATTR_ECC_CURVE,
-               &dummy_a, (uint32_t *)&prv_key.ecc_curve) != TEE_SUCCESS) {
+               (uint32_t *)&prv_key.ecc_curve, &dummy_b) != TEE_SUCCESS) {
                CRYPTO_PANIC;
        }
 

diff --git a/ssflib/src/ssf_storage.cpp b/ssflib/src/ssf_storage.cpp
index 039fe9c27a3051856e06e6527c70bb33cb3c376c..e54b5c389b36df8601267a473aaa0609d81beda9 100644 (file)
--- a/ssflib/src/ssf_storage.cpp
+++ b/ssflib/src/ssf_storage.cpp
@@ -1869,7 +1869,7 @@ TEE_Result TEE_GenerateKey(TEE_ObjectHandle object, uint32_t keySize,
 
                        for (i = 0; i < paramCount; i++) {
                                if (params[i].attributeID == TEE_ATTR_ECC_CURVE) {
-                                       if (curve_to_nid(params[i].content.value.b, &nid) != 0)
+                                       if (curve_to_nid(params[i].content.value.a, &nid) != 0)
                                                return TEE_ERROR_BAD_PARAMETERS;
                                        check |= 0x01;
                                }