diff --git a/device_attest_lite/services/core/BUILD.gn b/device_attest_lite/services/core/BUILD.gn index 84003f577b1fd136c526b35d64be3467c43d16c8..cb27d3c0e7a866949b32f43e9448c279668d2d4e 100644 --- a/device_attest_lite/services/core/BUILD.gn +++ b/device_attest_lite/services/core/BUILD.gn @@ -115,6 +115,11 @@ config("devattest_core_config") { outputs = ["$root_out_dir/data/attest/attest_mock_device_para"] } + copy("attest_mock_token") { + sources = ["${devattest_path}/test/data/token"] + outputs = ["$root_out_dir/data/attest/token"] + } + defines += [ "__ATTEST_MOCK_DEVICE_STUB__", ] @@ -204,6 +209,7 @@ if (ohos_kernel_type == "liteos_m") { if (enable_attest_mock_device) { deps += [ ":attest_mock_device_para", + ":attest_mock_token", ] } } diff --git a/device_attest_lite/services/core/adapter/attest_adapter.c b/device_attest_lite/services/core/adapter/attest_adapter.c index 09f361612acb1d3e53792b3ecf5283f6d340019f..5857b56459ec5fae1054902cb5525da1c5bf9223 100644 --- a/device_attest_lite/services/core/adapter/attest_adapter.c +++ b/device_attest_lite/services/core/adapter/attest_adapter.c @@ -66,12 +66,18 @@ int32_t AttestWriteTicket(const TicketInfo* ticketInfo) // 读取Manufacturekey int32_t AttestGetManufacturekey(uint8_t manufacturekey[], uint32_t len) { + if (ATTEST_MOCK_DEVICE_STUB_FLAG) { + return OsGetAcKeyStub((char*)manufacturekey, len); + } return HalGetAcKey((char*)manufacturekey, len); } // 读取ProductId int32_t AttestGetProductId(uint8_t productId[], uint32_t len) { + if (ATTEST_MOCK_DEVICE_STUB_FLAG) { + return OsGetProdIdStub((char*)productId, len); + } return HalGetProdId((char*)productId, len); } @@ -82,7 +88,13 @@ int32_t AttestReadToken(TokenInfo* tokenInfo) return ATTEST_ERR; } char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - int32_t ret = HalReadToken(token, sizeof(token)); + int32_t ret = 0; + if (ATTEST_MOCK_DEVICE_STUB_FLAG) { + ret = OsReadTokenStub(token, sizeof(token)); + } else { + ret = HalReadToken(token, sizeof(token)); + } + if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[AttestReadToken] Read oem token failed, ret = %d", ret); return ret; @@ -134,7 +146,13 @@ int32_t AttestWriteToken(TokenInfo* tokenInfo) if (memcpy_s(token + offset, sizeof(token), tokenInfo->version, sizeof(tokenInfo->version)) != 0) { return ATTEST_ERR; } - int32_t ret = HalWriteToken(token, sizeof(token)); + int32_t ret = 0; + if (ATTEST_MOCK_DEVICE_STUB_FLAG) { + ret = OsWriteTokenStub(token, sizeof(token)); + } else { + ret = HalWriteToken(token, sizeof(token)); + } + if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[AttestWriteToken] Write token failed, ret = %d", ret); ret = ATTEST_ERR; @@ -143,9 +161,12 @@ int32_t AttestWriteToken(TokenInfo* tokenInfo) } // 读取ProductKey -int32_t AttestGetProductKey(uint8_t productId[], uint32_t len) +int32_t AttestGetProductKey(uint8_t productKey[], uint32_t len) { - return HalGetProdKey((char*)productId, len); + if (ATTEST_MOCK_DEVICE_STUB_FLAG) { + return OsGetProdKeyStub((char*)productKey, len); + } + return HalGetProdKey((char*)productKey, len); } char* AttestGetVersionId(void) diff --git a/device_attest_lite/services/core/adapter/attest_adapter_mock.c b/device_attest_lite/services/core/adapter/attest_adapter_mock.c index 5eee60ce1c1e5ad1d7b244a2dd36930163e60232..7ac13f9249ca7ae9a17f51616ba4dad6f8d99ab6 100644 --- a/device_attest_lite/services/core/adapter/attest_adapter_mock.c +++ b/device_attest_lite/services/core/adapter/attest_adapter_mock.c @@ -190,3 +190,79 @@ char* OsGetUdidStub(void) ATTEST_LOG_INFO_ANONY("[OsGetUdidStub] Sha256(udid) = %s\n", udidSha256); return udidSha256; } + +int OsGetAcKeyStub(char *acKey, unsigned int len) +{ + if ((acKey == NULL) || (len == 0)) { + return ATTEST_ERR; + } + const char manufacturekeyBuf[] = { + 0x13, 0x42, 0x3F, 0x3F, 0x53, 0x3F, 0x72, 0x30, 0x3F, 0x3F, 0x1C, 0x3F, 0x2F, 0x3F, 0x2E, 0x42, + 0x3F, 0x08, 0x3F, 0x57, 0x3F, 0x10, 0x3F, 0x3F, 0x29, 0x17, 0x52, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x57, 0x16, 0x3F, 0x7D, 0x4A, 0x0F, 0x3F, 0x3F, 0x3F, 0x30, 0x0C, 0x3F, 0x3F, 0x4C, 0x3F, 0x47 + }; + uint32_t manufacturekeyBufLen = sizeof(manufacturekeyBuf); + if (len < manufacturekeyBufLen) { + return ATTEST_ERR; + } + + int ret = memcpy_s(acKey, len, manufacturekeyBuf, manufacturekeyBufLen); + return ret; +} + +int OsGetProdIdStub(char* productId, uint32_t len) +{ + if ((productId == NULL) || (len == 0)) { + return ATTEST_ERR; + } + const char productIdBuf[] = "OH00000D"; + uint32_t productIdLen = strlen(productIdBuf); + if (len < productIdLen) { + return ATTEST_ERR; + } + + int ret = memcpy_s(productId, len, productIdBuf, productIdLen); + return ret; +} + +int OsGetProdKeyStub(char* productKey, uint32_t len) +{ + if ((productKey == NULL) || (len == 0)) { + return ATTEST_ERR; + } + const char productKeyBuf[] = "test"; + uint32_t productKeyLen = sizeof(productKeyBuf); + if (len < productKeyLen) { + return ATTEST_ERR; + } + + int ret = memcpy_s(productKey, len, productKeyBuf, productKeyLen); + return ret; +} + +int32_t OsReadTokenStub(char* buffer, uint32_t bufferLen) +{ + if (buffer == NULL || bufferLen == 0) { + return ATTEST_ERR; + } + int32_t ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, buffer, bufferLen); + if (ret != 0) { + return ATTEST_ERR; + } + return ATTEST_OK; +} + +int32_t OsWriteTokenStub(char* buffer, uint32_t bufferLen) +{ + if (buffer == NULL || bufferLen == 0) { + return ATTEST_ERR; + } + if (CreateFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME) != 0) { + return ATTEST_ERR; + } + int32_t ret = WriteFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, buffer, bufferLen); + if (ret != 0) { + return ATTEST_ERR; + } + return ATTEST_OK; +} \ No newline at end of file diff --git a/device_attest_lite/services/core/attest/attest_service_auth.c b/device_attest_lite/services/core/attest/attest_service_auth.c index a54a7acdc864a3239d318f9ed27093a162f7aea5..360a510122dbaaaff99d4d33f4987f21dcf24e5f 100644 --- a/device_attest_lite/services/core/attest/attest_service_auth.c +++ b/device_attest_lite/services/core/attest/attest_service_auth.c @@ -30,7 +30,7 @@ bool IsAuthStatusChg(void) { ATTEST_LOG_DEBUG("[IsAuthStatusChg] Begin."); char* authStatusBase64 = NULL; - if (GetAuthStatus(&authStatusBase64) != 0) { + if (GetAuthStatus(&authStatusBase64) != ATTEST_OK) { ATTEST_LOG_ERROR("[IsAuthStatusChg] Load auth status failed or status file not exist"); return true; } diff --git a/device_attest_lite/services/core/include/adapter/attest_adapter.h b/device_attest_lite/services/core/include/adapter/attest_adapter.h index f6b3f627e0e47b7c83e66c1cef861f36620a217d..0d2d3dc8db1ce4168e91a1152bc627edc9fc47a7 100644 --- a/device_attest_lite/services/core/include/adapter/attest_adapter.h +++ b/device_attest_lite/services/core/include/adapter/attest_adapter.h @@ -64,7 +64,7 @@ int32_t AttestReadToken(TokenInfo* tokenInfo); int32_t AttestWriteToken(TokenInfo* tokenInfo); -int32_t AttestGetProductKey(uint8_t productId[], uint32_t len); +int32_t AttestGetProductKey(uint8_t productKey[], uint32_t len); int32_t AttestSetParameter(const char *key, const char *value); diff --git a/device_attest_lite/services/core/include/adapter/attest_adapter_mock.h b/device_attest_lite/services/core/include/adapter/attest_adapter_mock.h index f04119a6a7eb19aa50dac127cd838c543beb0152..3007516674cdfb6936799553427d1237ed74ff0e 100644 --- a/device_attest_lite/services/core/include/adapter/attest_adapter_mock.h +++ b/device_attest_lite/services/core/include/adapter/attest_adapter_mock.h @@ -37,6 +37,7 @@ extern "C" { #define ATTEST_MOCK_STUB_PATH "/storage/data/attest" #define ATTEST_MOCK_STUB_NETWORK_NAME "attest_mock_network_para" #define ATTEST_MOCK_STUB_DEVICE_NAME "attest_mock_device_para" +#define ATTEST_MOCK_TOKEN_FILE_NAME "token" #define ATTEST_MOCK_STUB_MAX_LEN 512 // 定义打桩数据Json的节点名称 @@ -67,6 +68,15 @@ char* OsGetSecurityPatchTagStub(void); char* OsGetUdidStub(void); +int OsGetAcKeyStub(char *acKey, unsigned int len); + +int OsGetProdIdStub(char* productId, uint32_t len); + +int OsGetProdKeyStub(char* productKey, uint32_t len); + +int32_t OsReadTokenStub(char* buffer, uint32_t bufferLen); + +int32_t OsWriteTokenStub(char* buffer, uint32_t bufferLen); #ifdef __cplusplus #if __cplusplus diff --git a/device_attest_lite/services/core/network/attest_network.c b/device_attest_lite/services/core/network/attest_network.c index 34c7f294e30e51c94f8700f6e4db06607a402c0c..e3fb9824d3a43cb6018235990346115e8001fc46 100644 --- a/device_attest_lite/services/core/network/attest_network.c +++ b/device_attest_lite/services/core/network/attest_network.c @@ -596,7 +596,7 @@ static int32_t GenUdidSHA256HEX(char* udid, char** udidSHA256Hex) if (udidAfterSHA256 == NULL) { return ATTEST_ERR; } - ret = Sha256Value((const unsigned char *)udid, udidAfterSHA256, UDID_SHA256_OUTPUT_SIZE + 1); + ret = Sha256Value((const unsigned char *)udid, UDID_STRING_LEN, udidAfterSHA256, UDID_SHA256_OUTPUT_SIZE + 1); if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[GenUdidSHA256HEX] Sha256 value failed."); ATTEST_MEM_FREE(udidAfterSHA256); diff --git a/device_attest_lite/services/core/security/attest_security.c b/device_attest_lite/services/core/security/attest_security.c index c74f4fefe7d2469469cd663f47eed3df581f3171..9d94d62d2c4f3a9a818168e744329d75cabdadad 100644 --- a/device_attest_lite/services/core/security/attest_security.c +++ b/device_attest_lite/services/core/security/attest_security.c @@ -202,17 +202,17 @@ static int32_t EncryptAesCbc(AesCryptBufferDatas* datas, const uint8_t* aesKey, mbedtls_cipher_info_t cipherInfo; (void)memset_s(&cipherInfo, sizeof(cipherInfo), 0, sizeof(cipherInfo)); - cipherInfo.MBEDTLS_PRIVATE(mode) = MBEDTLS_MODE_CBC; + cipherInfo.mode = MBEDTLS_MODE_CBC; mbedtls_cipher_context_t cipherCtx; mbedtls_cipher_init(&cipherCtx); - cipherCtx.MBEDTLS_PRIVATE(cipher_info) = &cipherInfo; + cipherCtx.cipher_info = &cipherInfo; uint32_t ret = mbedtls_cipher_set_padding_mode(&cipherCtx, MBEDTLS_PADDING_PKCS7); if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[EncryptAesCbc] Set padding mode failed, ret = -0x%x", ret); return ret; } - cipherCtx.MBEDTLS_PRIVATE(add_padding)(datas->input, *(datas->outputLen), datas->inputLen); + cipherCtx.add_padding(datas->input, *(datas->outputLen), datas->inputLen); mbedtls_aes_context aesCtx; mbedtls_aes_init(&aesCtx); @@ -276,17 +276,17 @@ static int32_t DecryptAesCbc(AesCryptBufferDatas* datas, const uint8_t* aesKey, mbedtls_cipher_info_t cipherInfo; (void)memset_s(&cipherInfo, sizeof(cipherInfo), 0, sizeof(cipherInfo)); - cipherInfo.MBEDTLS_PRIVATE(mode) = MBEDTLS_MODE_CBC; + cipherInfo.mode = MBEDTLS_MODE_CBC; mbedtls_cipher_context_t cipherCtx; mbedtls_cipher_init(&cipherCtx); - cipherCtx.MBEDTLS_PRIVATE(cipher_info) = &cipherInfo; + cipherCtx.cipher_info = &cipherInfo; ret = mbedtls_cipher_set_padding_mode(&cipherCtx, MBEDTLS_PADDING_PKCS7); if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[DecryptAesCbc] Set padding mode failed, ret = -0x%x", ret); return ret; } - ret = cipherCtx.MBEDTLS_PRIVATE(get_padding)(datas->output, datas->inputLen, datas->outputLen); + ret = cipherCtx.get_padding(datas->output, datas->inputLen, datas->outputLen); if (ret != ATTEST_OK) { ATTEST_LOG_ERROR("[DecryptAesCbc] Get padding failed, ret = -0x%x", ret); } diff --git a/device_attest_lite/services/core/utils/attest_utils.c b/device_attest_lite/services/core/utils/attest_utils.c index df4485f54af1a68e0d2baef1ed7062649cdc7f98..590e89c2793ee4c8147a8b185963bea4c7e32e2a 100644 --- a/device_attest_lite/services/core/utils/attest_utils.c +++ b/device_attest_lite/services/core/utils/attest_utils.c @@ -35,25 +35,30 @@ int32_t GetRandomNum(void) { - mbedtls_ctr_drbg_context randomContext; - mbedtls_entropy_context randomEntropy; - mbedtls_ctr_drbg_init(&randomContext); - mbedtls_entropy_init(&randomEntropy); + static mbedtls_ctr_drbg_context randomContext; + static mbedtls_entropy_context randomEntropy; + static bool initFlag = false; + const char* pers = "CTR_DRBG"; uint8_t random = 0; + int32_t ret = 0; do { - int32_t ret = mbedtls_ctr_drbg_seed(&randomContext, mbedtls_entropy_func, &randomEntropy, - (const uint8_t*)pers, strlen(pers)); - if (ret != ATTEST_OK) { - break; + if (initFlag == false) { + mbedtls_ctr_drbg_init(&randomContext); + mbedtls_entropy_init(&randomEntropy); + ret = mbedtls_ctr_drbg_seed(&randomContext, mbedtls_entropy_func, &randomEntropy, + (const unsigned char *)pers, strlen(pers)); + if (ret != ATTEST_OK) { + break; + } + initFlag = true; } + ret = mbedtls_ctr_drbg_random(&randomContext, &random, sizeof(random)); if (ret != ATTEST_OK) { break; } } while (0); - mbedtls_ctr_drbg_free(&randomContext); - mbedtls_entropy_free(&randomEntropy); return ABS(random); } diff --git a/device_attest_lite/services/core/utils/attest_utils_file.c b/device_attest_lite/services/core/utils/attest_utils_file.c index 2691fa36362034c66271af294faa634546f7dc75..f13d8ad010269d32fe5113a7cd9f3dd043830fb9 100644 --- a/device_attest_lite/services/core/utils/attest_utils_file.c +++ b/device_attest_lite/services/core/utils/attest_utils_file.c @@ -40,11 +40,11 @@ bool IsOverTemperatureLimit(void) if (ret != HI_ERR_SUCCESS) { ret = hi_tsensor_read_temperature(&temperature); if (ret != HI_ERR_SUCCESS) { - ATTEST_LOG_ERROR("[IsOverTemperatureLimit]: Get temperature fail, ret = %d\n", ret); + ATTEST_LOG_ERROR("[IsOverTemperatureLimit]: Get temperature fail, ret = %d", ret); return true; } } - ATTEST_LOG_DEBUG("[IsOverTemperatureLimit]: device's temperature = %d\n", temperature); + ATTEST_LOG_DEBUG("[IsOverTemperatureLimit]: device's temperature = %d", temperature); return (temperature >= WRITE_FLASH_MAX_TEMPERATURE); } @@ -77,13 +77,13 @@ int32_t WriteFile(const char* path, const char* fileName, const char* data, uint int32_t fd = UtilsFileOpen(fileName, O_CREAT_FS | O_TRUNC_FS | O_RDWR_FS, 0); if (fd < 0) { - ATTEST_LOG_ERROR("[WriteFile] : Open file failed\n"); + ATTEST_LOG_ERROR("[WriteFile] : Open file failed"); return ATTEST_ERR; } int ret = 0; if (UtilsFileWrite(fd, data, dataLen) != (int32_t)dataLen) { - ATTEST_LOG_ERROR("[WriteFile] : Write data failed\n"); + ATTEST_LOG_ERROR("[WriteFile] : Write data failed"); ret = ATTEST_ERR; } (void)UtilsFileClose(fd); @@ -108,7 +108,7 @@ int32_t ReadFile(const char* path, const char* fileName, char* buffer, uint32_t int32_t fd = UtilsFileOpen(fileName, O_EXCL_FS | O_RDWR_FS, 0); if (fd < 0) { - ATTEST_LOG_ERROR("[ReadFile] : Open file failed\n"); + ATTEST_LOG_ERROR("[ReadFile] : Open file failed"); return ATTEST_ERR; } diff --git a/token_L1/BUILD.gn b/token_L1/BUILD.gn deleted file mode 100644 index 3c73622f589dc493fcfe3df98f7daaa1489d7af5..0000000000000000000000000000000000000000 --- a/token_L1/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2020 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -import("//build/lite/config/component/lite_component.gni") - -shared_library("haltoken_shared") { - sources = [ "hal_token.c" ] - cflags = [ "-Wall" ] - include_dirs = [ - "//base/startup/init/interfaces/hals", - "//utils/native/lite/include", - ] - - include_dirs += [ - "//base/hiviewdfx/hilog_lite/interfaces/native/kits", - "//third_party/bounds_checking_function/include/", - "//base/cert_mgr_service/services/core/include/utils", - ] - deps = [] -} diff --git a/token_L1/Readme.txt b/token_L1/Readme.txt new file mode 100644 index 0000000000000000000000000000000000000000..f76d4893ee3948a055ccb1961442e6d906e8748e --- /dev/null +++ b/token_L1/Readme.txt @@ -0,0 +1,22 @@ +1. +把hal_token.c文件,放到对应产品型号下的token文件夹 +liteos-a: +vendor/hisilicon/hispark_taurus/hals/utils/token/hal_token.c + +linux: +vendor/hisilicon/hispark_taurus_linux/hals/utils/token/hal_token.c + +2. +修改 +vendor/hisilicon/hispark_taurus/hals/utils/token/BUILD.gn 或 +vendor/hisilicon/hispark_taurus_linux/hals/utils/token/BUILD.gn + +加上以下代码 +``` + include_dirs += [ + "//base/hiviewdfx/hilog_lite/interfaces/native/kits", + "//third_party/bounds_checking_function/include/", + "//base/cert_mgr_service/services/core/include/utils", + ] +``` + diff --git a/token_L1/file_path.txt b/token_L1/file_path.txt deleted file mode 100644 index 11856cf1e343218292a0ae269d0caf2b96920930..0000000000000000000000000000000000000000 --- a/token_L1/file_path.txt +++ /dev/null @@ -1,3 +0,0 @@ -vendor/hisilicon/hispark_pegasus/hals/utils/token/hal_token.c - - diff --git a/token_L1/hal_token.c b/token_L1/hal_token.c index 769f39dc598581c09ac46a9ae1277435e4050550..6f36a7f37ae54ea0bab211e997f4c7a02f25fcf0 100644 --- a/token_L1/hal_token.c +++ b/token_L1/hal_token.c @@ -428,4 +428,54 @@ int HalWriteToken(const char *token, unsigned int len) return EC_FAILURE; } return OEMWriteToken(token, len); -} \ No newline at end of file +} + +int HalGetAcKey(char *acKey, unsigned int len) +{ + if ((acKey == NULL) || (len == 0)) { + return EC_FAILURE; + } + const char manufacturekeyBuf[] = { + 0x13, 0x42, 0x3F, 0x3F, 0x53, 0x3F, 0x72, 0x30, 0x3F, 0x3F, 0x1C, 0x3F, 0x2F, 0x3F, 0x2E, 0x42, + 0x3F, 0x08, 0x3F, 0x57, 0x3F, 0x10, 0x3F, 0x3F, 0x29, 0x17, 0x52, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x57, 0x16, 0x3F, 0x7D, 0x4A, 0x0F, 0x3F, 0x3F, 0x3F, 0x30, 0x0C, 0x3F, 0x3F, 0x4C, 0x3F, 0x47 + }; + uint32_t manufacturekeyBufLen = sizeof(manufacturekeyBuf); + if (len < manufacturekeyBufLen) { + return EC_FAILURE; + } + + int ret = memcpy_s(acKey, len, manufacturekeyBuf, manufacturekeyBufLen); + return ret; +} + +int HalGetProdId(char* productId, uint32_t len) +{ + if ((productId == NULL) || (len == 0)) { + return EC_FAILURE; + } + const char productIdBuf[] = "OH00000D"; + uint32_t productIdLen = strlen(productIdBuf); + if (len < productIdLen) { + return EC_FAILURE; + } + + int ret = memcpy_s(productId, len, productIdBuf, productIdLen); + return ret; +} + +int HalGetProdKey(char* productKey, uint32_t len) +{ + if ((productKey == NULL) || (len == 0)) { + return EC_FAILURE; + } + const char productKeyBuf[] = "test"; + uint32_t productKeyLen = sizeof(productKeyBuf); + if (len < productKeyLen) { + return EC_FAILURE; + } + + int ret = memcpy_s(productKey, len, productKeyBuf, productKeyLen); + return ret; +} + diff --git a/xts/devattest_lite/devattest_posix/src/devattestTest.cpp b/xts/devattest_lite/devattest_posix/src/devattestTest.cpp index 464eb6b084f8b3c19322ba38fdad57b084fd8b80..8e03d85fa56b9ae41ec392734d3a780c3e1ab2ca 100644 --- a/xts/devattest_lite/devattest_posix/src/devattestTest.cpp +++ b/xts/devattest_lite/devattest_posix/src/devattestTest.cpp @@ -23,10 +23,10 @@ #include "attest_service.h" #include "attest_type.h" #include "attest_adapter.h" +#include "attest_utils.h" #include "attest_utils_file.h" #include "attest_mock.h" #include "devattest_interface.h" -#include "attest_utils.h" using namespace std; using namespace testing::ext; @@ -171,8 +171,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); // 认证成功后,token会变 EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); @@ -392,8 +391,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); // 认证失败,token不变 EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -435,8 +433,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -477,8 +474,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -519,8 +515,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -561,8 +556,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -603,8 +597,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -645,8 +638,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -687,8 +679,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -729,8 +720,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -771,8 +761,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -813,8 +802,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); @@ -855,8 +843,8 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); EXPECT_FALSE(IsFileExist(ATTEST_MOCK_STUB_PATH, AUTH_STATUS_FILE_NAME)); @@ -899,8 +887,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); @@ -941,8 +928,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); @@ -983,8 +969,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_FALSE(IS_WISE_RETRY(-ret)); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); @@ -1025,8 +1010,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); // 检查是否生成reset_flag标签 期望是TRUE @@ -1066,9 +1050,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_TRUE(DeleteFile(ATTEST_MOCK_STUB_PATH, RESET_FLAG_FILE_NAME)); char beforeToken[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, beforeToken, sizeof(beforeToken)); - // TokenA存在,TokenB不存在,下一次Token值会写入TokenB - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, beforeToken, sizeof(beforeToken)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, beforeToken, sizeof(beforeToken)); EXPECT_EQ(ret, ATTEST_OK); // 预置network 重置流程返回值为4999 @@ -1103,8 +1085,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char afterToken[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, afterToken, sizeof(afterToken)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, afterToken, sizeof(afterToken)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, afterToken, sizeof(afterToken)); EXPECT_EQ(ret, ATTEST_OK); // 验证token是否 已更新 EXPECT_STRNE(beforeToken, afterToken); @@ -1144,8 +1125,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = { 0 }; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); EXPECT_FALSE(AttestIsResetFlagExist()); @@ -1183,8 +1163,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = { 0 }; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1221,8 +1200,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = { 0 }; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1259,8 +1237,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1297,8 +1274,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1335,8 +1311,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1455,8 +1430,7 @@ E3NTE4QkYwQzc4MzRBOTNDN0E1QkY0RDUxRjkiLCJ2ZXJzaW9uSWQiOiJkZWZhdWx0L2h1YS13ZWkvSH EXPECT_EQ(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(token, ATTEST_MOCK_TOKEN); // 重置环境 @@ -1493,8 +1467,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", EXPECT_NE(ret, ATTEST_OK); char token[TOKEN_ENCRYPT_LEN + 1] = {0}; - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STREQ(ATTEST_MOCK_TOKEN, token); @@ -1517,8 +1490,7 @@ lZmF1bHQvOC9kZWZhdWx0L2RlZmF1bHQifQ.", ret = ProcAttest(); EXPECT_EQ(ret, ATTEST_OK); - //ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); - ret = ReadTokenMockFile(ATTEST_MOCK_TOKENB_FILE_NAME, token, sizeof(token)); + ret = ReadFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, token, sizeof(token)); EXPECT_EQ(ret, ATTEST_OK); EXPECT_STRNE(ATTEST_MOCK_TOKEN, token); // 重置环境 diff --git a/xts/devattest_lite/devattest_posix/src/utils/attest_mock.c b/xts/devattest_lite/devattest_posix/src/utils/attest_mock.c index 08cdc3d759b9c08b3e69fd82b0b0c08a1767a06d..d9f0e22f38d634e9f9af38be1023a749f3379a05 100644 --- a/xts/devattest_lite/devattest_posix/src/utils/attest_mock.c +++ b/xts/devattest_lite/devattest_posix/src/utils/attest_mock.c @@ -33,44 +33,6 @@ extern "C" { #endif #endif /* __cplusplus */ -#define TOKEN_MAGIC_NUM_SIZE 4 -#define TOKEN_FLAG_SIZE 4 -#define TOKEN_SIZE 151 -#define TOKEN_WITH_FLAG_SIZE (TOKEN_SIZE + TOKEN_FLAG_SIZE) -#define TOKEN_VALUE_SIZE (TOKEN_MAGIC_NUM_SIZE + TOKEN_WITH_FLAG_SIZE) - -int32_t WriteTokenMockFile(void) -{ - const char g_tokenMagicNum[TOKEN_MAGIC_NUM_SIZE] = {1, 2, 3, 4}; - char tokenValue[TOKEN_VALUE_SIZE + 1] = { 0 }; - for (int i = 0; i < TOKEN_MAGIC_NUM_SIZE; i++) { - tokenValue[i] = g_tokenMagicNum[i]; - } - if (memcpy_s(tokenValue + TOKEN_MAGIC_NUM_SIZE, TOKEN_VALUE_SIZE - TOKEN_MAGIC_NUM_SIZE, ATTEST_MOCK_TOKEN, strlen(ATTEST_MOCK_TOKEN)) != 0) { - printf("[WriteTokenMockFile] memcpy_s fail\n\n"); - return ATTEST_ERR; - } - int32_t ret = WriteFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, tokenValue, TOKEN_WITH_FLAG_SIZE); - return ret; -} - -int32_t ReadTokenMockFile(char* fileName, char *token, int tokenSize) -{ - char tokenValue[TOKEN_WITH_FLAG_SIZE + 1] = { 0 }; - int32_t ret = ReadFile(ATTEST_MOCK_STUB_PATH, fileName, tokenValue, sizeof(tokenValue)); - if (ret != ATTEST_OK) { - printf("[ReadTokenMockFile] ReadFile fail\n\n"); - return ATTEST_ERR; - } - - if (memcpy_s(token, tokenSize, tokenValue + TOKEN_FLAG_SIZE, sizeof(tokenValue) - TOKEN_FLAG_SIZE) != 0) { - printf("[ReadTokenMockFile] memcpy_s fail\n\n"); - return ATTEST_ERR; - } - - return ATTEST_OK; -} - int32_t InitMockData(AttestMockData *attestMockData) { // devicePara 数据 @@ -96,8 +58,7 @@ int32_t InitMockData(AttestMockData *attestMockData) } // 写文件 - //ret = WriteFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, ATTEST_MOCK_TOKEN, strlen(ATTEST_MOCK_TOKEN)); - ret = WriteTokenMockFile(); + ret = WriteFile(ATTEST_MOCK_STUB_PATH, ATTEST_MOCK_TOKEN_FILE_NAME, ATTEST_MOCK_TOKEN, strlen(ATTEST_MOCK_TOKEN)); if (ret != ATTEST_OK) { return ATTEST_ERR; } diff --git a/xts/devattest_lite/devattest_posix/src/utils/attest_mock.h b/xts/devattest_lite/devattest_posix/src/utils/attest_mock.h index f8272bdc36d14c1b4a49ea891010eef3d80b765c..738acd3a61729b58d50652e9de9621a948496896 100644 --- a/xts/devattest_lite/devattest_posix/src/utils/attest_mock.h +++ b/xts/devattest_lite/devattest_posix/src/utils/attest_mock.h @@ -26,9 +26,6 @@ extern "C" { #endif #endif /* __cplusplus */ -#define ATTEST_MOCK_TOKEN_FILE_NAME "tokenA" -#define ATTEST_MOCK_TOKENB_FILE_NAME "tokenB" - #define ATTEST_MOCK_TOKEN "6PkCJZDsUfuqqdvxTLv8ZH+FqASsUInUV4y9IPLHtPyJt0v0RrwtVaLHpEunfMjD,\ yCbOb5Y3M4sgXEqhyTqIXwDl4JEWTmEfWr3Vov0NamgsBmzMCHXsM4xH3pNT+ZMd,XXoIPrlEu6EV+/rI,1000" @@ -112,22 +109,12 @@ typedef struct AttestMockData { struct AttestNetworkMockData NetworkMockData; } AttestMockData; -// 写打桩token文件 -int32_t WriteTokenMockFile(void); - -// 读打桩token文件 -int32_t ReadTokenMockFile(char* fileName, char *token, int tokenSize); - // 初始化MOCKData int32_t InitMockData(AttestMockData *attestMockData); // 初始化NetWorkData int32_t WriteNetWorkMock(AttestNetworkMockData *NetworkMockData); -// 删除文件 -bool DeleteFile(const char* path, const char* fileName); - - #ifdef __cplusplus #if __cplusplus }