From af4e31dc67ab6c2d4acd5a0ff3c8c41e48fb9fbf Mon Sep 17 00:00:00 2001 From: xxx Date: Tue, 15 Nov 2022 11:10:54 +0800 Subject: [PATCH] no message Match-id-40f2b307d198611fbfeee6240db8f6c2319366f6 --- ddk/demo/src/receiver_module/drv_test_module.c | 2 +- ddk/demo/src/sender_module/drv_test_module.c | 2 +- ddk/demo/src/test_module/drv_test_module.c | 2 +- docs/TEE_OS_guide/TEE-安全驱动开发指导.md | 2 +- sdk/test/CA/aes_demo/aes_demo_ca.c | 8 ++++---- sdk/test/CA/mac_demo/mac_demo_ca.c | 2 +- sdk/test/CA/rsa_demo/rsa_demo_ca.c | 8 ++++---- sdk/test/TA/aes_demo/aes_demo_ta.c | 2 +- sdk/test/TA/helloworld/ta_demo.c | 2 +- sdk/test/TA/rsa_demo/rsa_demo_ta.c | 2 +- sdk/test/TA/secstorage_demo/secstorage_demo.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ddk/demo/src/receiver_module/drv_test_module.c b/ddk/demo/src/receiver_module/drv_test_module.c index 22a62a0..a0b0662 100644 --- a/ddk/demo/src/receiver_module/drv_test_module.c +++ b/ddk/demo/src/receiver_module/drv_test_module.c @@ -285,7 +285,7 @@ int64_t open_test(struct drv_data *drv, unsigned long args, uint32_t args_len) uint32_t *input = (uint32_t *)(uintptr_t)args; if (*input == UINT32_MAX) { - tloge("open test input args is UINT32_MAX, just retrun -1\n"); + tloge("open test input args is UINT32_MAX, just return -1\n"); return -1; } diff --git a/ddk/demo/src/sender_module/drv_test_module.c b/ddk/demo/src/sender_module/drv_test_module.c index d670d15..047191b 100644 --- a/ddk/demo/src/sender_module/drv_test_module.c +++ b/ddk/demo/src/sender_module/drv_test_module.c @@ -166,7 +166,7 @@ int64_t open_test(struct drv_data *drv, unsigned long args, uint32_t args_len) uint32_t *input = (uint32_t *)(uintptr_t)args; if (*input == UINT32_MAX) { - tloge("open test input args is UINT32_MAX, just retrun -1\n"); + tloge("open test input args is UINT32_MAX, just return -1\n"); return -1; } diff --git a/ddk/demo/src/test_module/drv_test_module.c b/ddk/demo/src/test_module/drv_test_module.c index 64a8cb2..1b0c78b 100644 --- a/ddk/demo/src/test_module/drv_test_module.c +++ b/ddk/demo/src/test_module/drv_test_module.c @@ -75,7 +75,7 @@ int64_t open_test(struct drv_data *drv, unsigned long args, uint32_t args_len) uint32_t *input = (uint32_t *)(uintptr_t)args; if (*input == UINT32_MAX) { - tloge("open test input args is UINT32_MAX, just retrun -1\n"); + tloge("open test input args is UINT32_MAX, just return -1\n"); return -1; } diff --git a/docs/TEE_OS_guide/TEE-安全驱动开发指导.md b/docs/TEE_OS_guide/TEE-安全驱动开发指导.md index 11d3875..2c29a9b 100644 --- a/docs/TEE_OS_guide/TEE-安全驱动开发指导.md +++ b/docs/TEE_OS_guide/TEE-安全驱动开发指导.md @@ -1583,7 +1583,7 @@ int64_t open_test(struct drv_data *drv, unsigned long args, uint32_t args_len) uint32_t *input = (uint32_t *)args; if (*input == UINT32_MAX) { - tloge("open test input args is UINT32_MAX, just retrun -1\n"); + tloge("open test input args is UINT32_MAX, just return -1\n"); return -1; } diff --git a/sdk/test/CA/aes_demo/aes_demo_ca.c b/sdk/test/CA/aes_demo/aes_demo_ca.c index 615b9d1..0155108 100644 --- a/sdk/test/CA/aes_demo/aes_demo_ca.c +++ b/sdk/test/CA/aes_demo/aes_demo_ca.c @@ -53,7 +53,7 @@ int main(void) printf("AES demo teec open session failed.\n"); goto cleanup_1; } else { - printf("AES demo teec open session successed.\n"); + printf("AES demo teec open session succeed.\n"); } operation.started = 1; @@ -64,14 +64,14 @@ int main(void) printf("AES CBC encrypt and decrypt test failed, result=0x%x, origin=0x%x.\n", result, origin); goto cleanup_2; } else { - printf("AES CBC encrypt and decrypt test successed.\n"); + printf("AES CBC encrypt and decrypt test succeed.\n"); } result = TEEC_InvokeCommand(&session, CMD_AES_CCM_ENCRYPT_DECRYPT, &operation, &origin); if (result != TEEC_SUCCESS) { printf("AES CCM encrypt and decrypt test failed, result=0x%x, origin=0x%x.\n", result, origin); goto cleanup_2; } else { - printf("AES CCM encrypt and decrypt test successed.\n"); + printf("AES CCM encrypt and decrypt test succeed.\n"); } cleanup_2: @@ -79,4 +79,4 @@ cleanup_2: cleanup_1: TEEC_FinalizeContext(&context); return result; -} \ No newline at end of file +} diff --git a/sdk/test/CA/mac_demo/mac_demo_ca.c b/sdk/test/CA/mac_demo/mac_demo_ca.c index 6dd4e47..ede122e 100644 --- a/sdk/test/CA/mac_demo/mac_demo_ca.c +++ b/sdk/test/CA/mac_demo/mac_demo_ca.c @@ -54,7 +54,7 @@ static TEEC_Result teec_init(void) ret = TEEC_OpenSession(&g_context, &g_session, &g_macDemoUuid, TEEC_LOGIN_IDENTIFY, NULL, &operation, &origin); if (ret != TEEC_SUCCESS) { - printf("open session failed: result:%d, orgin: %d\n", (int)ret, origin); + printf("open session failed: result:%d, origin: %d\n", (int)ret, origin); TEEC_FinalizeContext(&g_context); return ret; } diff --git a/sdk/test/CA/rsa_demo/rsa_demo_ca.c b/sdk/test/CA/rsa_demo/rsa_demo_ca.c index 38e3937..657a6c8 100644 --- a/sdk/test/CA/rsa_demo/rsa_demo_ca.c +++ b/sdk/test/CA/rsa_demo/rsa_demo_ca.c @@ -53,7 +53,7 @@ int main(void) printf("RSA demo teec open session failed.\n"); goto cleanup_1; } else { - printf("RSA demo teec open session successed.\n"); + printf("RSA demo teec open session succeed.\n"); } operation.started = 1; @@ -64,7 +64,7 @@ int main(void) printf("RSA encrypt and decrypt test failed, result=0x%x, origin=0x%x.\n", result, origin); goto cleanup_2; } else { - printf("RSA encrypt and decrypt test successed.\n"); + printf("RSA encrypt and decrypt test succeed.\n"); } result = TEEC_InvokeCommand(&session, CMD_RSA_SIGN_VERIFY, &operation, &origin); @@ -72,7 +72,7 @@ int main(void) printf("RSA sign and verify test failed, result=0x%x, origin=0x%x.\n", result, origin); goto cleanup_2; } else { - printf("RSA signature and verify test successed.\n"); + printf("RSA signature and verify test succeed.\n"); } cleanup_2: @@ -80,4 +80,4 @@ cleanup_2: cleanup_1: TEEC_FinalizeContext(&context); return result; -} \ No newline at end of file +} diff --git a/sdk/test/TA/aes_demo/aes_demo_ta.c b/sdk/test/TA/aes_demo/aes_demo_ta.c index c59bc55..9f7b09e 100644 --- a/sdk/test/TA/aes_demo/aes_demo_ta.c +++ b/sdk/test/TA/aes_demo/aes_demo_ta.c @@ -23,7 +23,7 @@ enum DEMO_AES_CRYPTO_CMD { TEE_Result TA_CreateEntryPoint(void) { TEE_Result ret; - tlogd("----- AES TA creat entry point -----\n"); + tlogd("----- AES TA create entry point -----\n"); /* When you develop your own CA, you need to change the name to your own path and CA name. */ ret = AddCaller_CA_exec("/vendor/bin/aes_demo_ca", 0); diff --git a/sdk/test/TA/helloworld/ta_demo.c b/sdk/test/TA/helloworld/ta_demo.c index 051132b..3bdf7bf 100644 --- a/sdk/test/TA/helloworld/ta_demo.c +++ b/sdk/test/TA/helloworld/ta_demo.c @@ -147,5 +147,5 @@ void TA_CloseSessionEntryPoint(void* session_context) */ void TA_DestroyEntryPoint(void) { - tlogd("---- destory TA ---- "); + tlogd("---- destroy TA ---- "); } diff --git a/sdk/test/TA/rsa_demo/rsa_demo_ta.c b/sdk/test/TA/rsa_demo/rsa_demo_ta.c index 7845528..21adc3d 100644 --- a/sdk/test/TA/rsa_demo/rsa_demo_ta.c +++ b/sdk/test/TA/rsa_demo/rsa_demo_ta.c @@ -29,7 +29,7 @@ TEE_Result TA_CreateEntryPoint(void) { TEE_Result ret; - tlogd("----- RSA TA creat entry point -----\n"); + tlogd("----- RSA TA create entry point -----\n"); /* When you develop your own CA, you need to change the name to your own path and CA name. */ ret = AddCaller_CA_exec("/vendor/bin/rsa_demo_ca", 0); diff --git a/sdk/test/TA/secstorage_demo/secstorage_demo.c b/sdk/test/TA/secstorage_demo/secstorage_demo.c index 74fc36d..4110ec9 100644 --- a/sdk/test/TA/secstorage_demo/secstorage_demo.c +++ b/sdk/test/TA/secstorage_demo/secstorage_demo.c @@ -287,5 +287,5 @@ void TA_CloseSessionEntryPoint(void* session_context) void TA_DestroyEntryPoint(void) { - tlogd("---- destory TA ---- "); + tlogd("---- destroy TA ---- "); }