fix: fix spelling erros-openHiTLS-AtomGit

已合并

fix: fix spelling erros #983

baoyi84930创建于 1月5日从baoyi84930/openhitls： dev 合入到 openHiTLS/openhitls： openhitls-0.2

fix: fix spelling erros #983

已合并

baoyi84930创建于 1月5日

从baoyi84930/openhitls dev合入到openHiTLS/openhitls openhitls-0.2

收起

docs
- en / 5_Developer Guide
  - 2_Secure Communication Application Development Guide.md
- zh / 5_开发指南
  - 2_安全通信应用开发指南.md
testcode
- framework / tls
  - include
    - hlt.h
  - rpc / src
    - hitls_func.c
    - hlt_func.c
- sdv / testcase / tls
  - consistency
    - dtlcp
      - test_suite_sdv_frame_dtlcp_consistency.base.c
    - dtls12
      - test_suite_sdv_frame_dtls12_consistency.base.c
    - tls12
      - test_suite_sdv_frame_tls12_consistency_rfc5246.c
      - test_suite_sdv_frame_tls12_consistency_rfc5246_extensions.c
      - test_suite_sdv_hlt_tls12_consistency_rfc5246_extensions.c
      - test_suite_sdv_hlt_tls12_consistency_rfc7627.c
      - test_suite_tls12_consistency_rfc5246_malformed_msg.base.c
    - tls13
      - test_suite_sdv_frame_tls13_consistency_rfc8446_appendix.c
      - test_suite_sdv_frame_tls13_consistency_rfc8446_cert.c
      - test_suite_sdv_frame_tls13_consistency_rfc8446_extensions_1.c
      - test_suite_sdv_frame_tls13_consistency_rfc8446_extensions_2.c
  - feature
    - test_suite_sdv_frame_servername_function.c
  - interface
    - test_suite_sdv_frame_tls_config_1.c
    - test_suite_sdv_frame_tls_config_1.data
tls / config / src
- config.c

共 20 个文件变更+48-48

Mdocs/en/5_Developer Guide/2_Secure Communication Application Development Guide.md+2-2

Mdocs/zh/5_开发指南/2_安全通信应用开发指南.md+2-2

Mtestcode/framework/tls/include/hlt.h+1-1

	@@ -52,7 +52,7 @@ int HLT_SetFlightTransmitSwitch(HLT_Ctx_Config *ctxConfig, bool support);
52	int HLT_SetClientVerifySupport(HLT_Ctx_Config* ctxConfig, bool support);	52	int HLT_SetClientVerifySupport(HLT_Ctx_Config* ctxConfig, bool support);
53	int HLT_SetNoClientCertSupport(HLT_Ctx_Config* ctxConfig, bool support);	53	int HLT_SetNoClientCertSupport(HLT_Ctx_Config* ctxConfig, bool support);
54	int HLT_SetPostHandshakeAuth(HLT_Ctx_Config *ctxConfig, bool support);	54	int HLT_SetPostHandshakeAuth(HLT_Ctx_Config *ctxConfig, bool support);
55	-int HLT_SetExtenedMasterSecretSupport(HLT_Ctx_Config* ctxConfig, bool support);	55	+int HLT_SetExtendedMasterSecretSupport(HLT_Ctx_Config* ctxConfig, bool support);
56	int HLT_SetEncryptThenMac(HLT_Ctx_Config *ctxConfig, int support);	56	int HLT_SetEncryptThenMac(HLT_Ctx_Config *ctxConfig, int support);
57	int HLT_SetDtlsCookieExchangeSupport(HLT_Ctx_Config *ctxConfig, bool isSupport);	57	int HLT_SetDtlsCookieExchangeSupport(HLT_Ctx_Config *ctxConfig, bool isSupport);
58	int HLT_SetModeSupport(HLT_Ctx_Config *ctxConfig, uint32_t mode);	58	int HLT_SetModeSupport(HLT_Ctx_Config *ctxConfig, uint32_t mode);

Mtestcode/framework/tls/rpc/src/hitls_func.c+2-2

	@@ -521,8 +521,8 @@ int HitlsSetCtx(HITLS_Config outCfg, HLT_Ctx_Config inCtxCfg)
521	#endif	521	#endif
522	// Indicates whether extended master keys are supported.	522	// Indicates whether extended master keys are supported.
523	LOG_DEBUG("HiTLS Set Support Extend Master Secret is %d", inCtxCfg->isSupportExtendMasterSecret);	523	LOG_DEBUG("HiTLS Set Support Extend Master Secret is %d", inCtxCfg->isSupportExtendMasterSecret);
524	- ret = HITLS_CFG_SetExtenedMasterSecretSupport(outCfg, inCtxCfg->isSupportExtendMasterSecret);	524	+ ret = HITLS_CFG_SetExtendedMasterSecretSupport(outCfg, inCtxCfg->isSupportExtendMasterSecret);
525	- ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetExtenedMasterSecretSupport ERROR");	525	+ ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetExtendedMasterSecretSupport ERROR");
526		526
527	#ifdef HITLS_TLS_CONFIG_KEY_USAGE	527	#ifdef HITLS_TLS_CONFIG_KEY_USAGE
528	// Support CloseCheckKeyUsage	528	// Support CloseCheckKeyUsage

Mtestcode/framework/tls/rpc/src/hlt_func.c+1-1

	@@ -1108,7 +1108,7 @@ int HLT_SetNoClientCertSupport(HLT_Ctx_Config *ctxConfig, bool support)
1108	return SUCCESS;	1108	return SUCCESS;
1109	}	1109	}
1110		1110
1111	-int HLT_SetExtenedMasterSecretSupport(HLT_Ctx_Config *ctxConfig, bool support)	1111	+int HLT_SetExtendedMasterSecretSupport(HLT_Ctx_Config *ctxConfig, bool support)
1112	{	1112	{
1113	ctxConfig->isSupportExtendMasterSecret = support;	1113	ctxConfig->isSupportExtendMasterSecret = support;
1114	return SUCCESS;	1114	return SUCCESS;

Mtestcode/sdv/testcase/tls/consistency/dtlcp/test_suite_sdv_frame_dtlcp_consistency.base.c+1-1

	@@ -336,7 +336,7 @@ int32_t DefaultCfgStatusPark1(HandshakeTestInfo *testInfo)
336	HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));	336	HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
337	HITLS_CFG_SetClientVerifySupport(testInfo->config, testInfo->isSupportClientVerify);	337	HITLS_CFG_SetClientVerifySupport(testInfo->config, testInfo->isSupportClientVerify);
338	HITLS_CFG_SetNoClientCertSupport(testInfo->config, false);	338	HITLS_CFG_SetNoClientCertSupport(testInfo->config, false);
339	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo->config, true);	339	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo->config, true);
340	return StatusPark(testInfo, BSL_UIO_UDP);	340	return StatusPark(testInfo, BSL_UIO_UDP);
341	}	341	}
342		342

Mtestcode/sdv/testcase/tls/consistency/dtls12/test_suite_sdv_frame_dtls12_consistency.base.c+1-1

	@@ -355,7 +355,7 @@ int32_t DefaultCfgStatusPark1(HandshakeTestInfo *testInfo, int uioType)
355	HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));	355	HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
356	HITLS_CFG_SetClientVerifySupport(testInfo->config, testInfo->isSupportClientVerify);	356	HITLS_CFG_SetClientVerifySupport(testInfo->config, testInfo->isSupportClientVerify);
357	HITLS_CFG_SetNoClientCertSupport(testInfo->config, false);	357	HITLS_CFG_SetNoClientCertSupport(testInfo->config, false);
358	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo->config, true);	358	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo->config, true);
359	return StatusPark(testInfo, uioType);	359	return StatusPark(testInfo, uioType);
360	}	360	}
361		361

Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246.c+1-1

	@@ -4087,7 +4087,7 @@ int32_t NewConfig(ResumeTestInfo *testInfo)
4087		4087
4088	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);	4088	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);
4089	HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);	4089	HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
4090	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo->config, true);	4090	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo->config, true);
4091	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);	4091	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);
4092	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);	4092	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);
4093	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);	4093	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);

Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246_extensions.c+2-2

	@@ -520,8 +520,8 @@ void UT_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_TC002(void)
520	HITLS_Config *s_config = HITLS_CFG_NewTLS12Config();	520	HITLS_Config *s_config = HITLS_CFG_NewTLS12Config();
521	ASSERT_TRUE(s_config != NULL);	521	ASSERT_TRUE(s_config != NULL);
522		522
523	- HITLS_CFG_SetExtenedMasterSecretSupport(c_config, true);	523	+ HITLS_CFG_SetExtendedMasterSecretSupport(c_config, true);
524	- HITLS_CFG_SetExtenedMasterSecretSupport(s_config, false);	524	+ HITLS_CFG_SetExtendedMasterSecretSupport(s_config, false);
525		525
526	FRAME_LinkObj *client = FRAME_CreateLink(c_config, BSL_UIO_TCP);	526	FRAME_LinkObj *client = FRAME_CreateLink(c_config, BSL_UIO_TCP);
527	ASSERT_TRUE(client != NULL);	527	ASSERT_TRUE(client != NULL);

Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc5246_extensions.c+3-3

Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc7627.c+5-5

Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_tls12_consistency_rfc5246_malformed_msg.base.c+3-3

Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_appendix.c+1-1

	@@ -61,7 +61,7 @@ int32_t NewConfig(HsTestInfo *testInfo)
61	}	61	}
62		62
63	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);	63	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);
64	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo->config, true);	64	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo->config, true);
65	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);	65	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);
66	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);	66	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);
67	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);	67	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);

Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_cert.c+1-1

	@@ -77,7 +77,7 @@ int32_t NewConfig(HsTestInfo *testInfo)
77	}	77	}
78		78
79	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);	79	HITLS_CFG_SetClientVerifySupport(testInfo->config, true);
80	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo->config, true);	80	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo->config, true);
81	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);	81	HITLS_CFG_SetNoClientCertSupport(testInfo->config, true);
82	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);	82	HITLS_CFG_SetRenegotiationSupport(testInfo->config, true);
83	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);	83	HITLS_CFG_SetPskServerCallback(testInfo->config, (HITLS_PskServerCb)ExampleServerCb);

Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_extensions_1.c+1-1

	@@ -1142,7 +1142,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_CHECK_SERVERHELLO_MASTER_SECRET_FUNC_TC001
1142	testInfo.c_config = HITLS_CFG_NewTLS13Config();	1142	testInfo.c_config = HITLS_CFG_NewTLS13Config();
1143	ASSERT_TRUE(testInfo.c_config != NULL);	1143	ASSERT_TRUE(testInfo.c_config != NULL);
1144		1144
1145	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo.c_config, true);	1145	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo.c_config, true);
1146		1146
1147	testInfo.client = FRAME_CreateLink(testInfo.c_config, testInfo.uioType);	1147	testInfo.client = FRAME_CreateLink(testInfo.c_config, testInfo.uioType);
1148	ASSERT_TRUE(testInfo.client != NULL);	1148	ASSERT_TRUE(testInfo.client != NULL);

Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_extensions_2.c+1-1

	@@ -304,7 +304,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_CERTICATE_VERIFY_FAIL_FUNC_TC001()
304	testInfo.c_config = HITLS_CFG_NewTLS13Config();	304	testInfo.c_config = HITLS_CFG_NewTLS13Config();
305	ASSERT_TRUE(testInfo.c_config != NULL);	305	ASSERT_TRUE(testInfo.c_config != NULL);
306		306
307	- HITLS_CFG_SetExtenedMasterSecretSupport(testInfo.c_config, false);	307	+ HITLS_CFG_SetExtendedMasterSecretSupport(testInfo.c_config, false);
308		308
309	testInfo.client = FRAME_CreateLink(testInfo.c_config, testInfo.uioType);	309	testInfo.client = FRAME_CreateLink(testInfo.c_config, testInfo.uioType);
310	ASSERT_TRUE(testInfo.client != NULL);	310	ASSERT_TRUE(testInfo.client != NULL);

Mtestcode/sdv/testcase/tls/feature/test_suite_sdv_frame_servername_function.c+1-1

	@@ -156,7 +156,7 @@ void SetCommonConfig(HITLS_Config **config)
156	HITLS_DHE_RSA_WITH_AES_128_GCM_SHA256};	156	HITLS_DHE_RSA_WITH_AES_128_GCM_SHA256};
157	HITLS_CFG_SetCipherSuites(*config, cipherSuites, sizeof(cipherSuites) / sizeof(uint16_t));	157	HITLS_CFG_SetCipherSuites(*config, cipherSuites, sizeof(cipherSuites) / sizeof(uint16_t));
158	HITLS_CFG_SetClientVerifySupport(*config, true);	158	HITLS_CFG_SetClientVerifySupport(*config, true);
159	- HITLS_CFG_SetExtenedMasterSecretSupport(*config, true);	159	+ HITLS_CFG_SetExtendedMasterSecretSupport(*config, true);
160	HITLS_CFG_SetNoClientCertSupport(*config, true);	160	HITLS_CFG_SetNoClientCertSupport(*config, true);
161	HITLS_CFG_SetRenegotiationSupport(*config, true);	161	HITLS_CFG_SetRenegotiationSupport(*config, true);
162	HITLS_CFG_SetPskServerCallback(*config, (HITLS_PskServerCb)ExampleServerCb);	162	HITLS_CFG_SetPskServerCallback(*config, (HITLS_PskServerCb)ExampleServerCb);

Mtestcode/sdv/testcase/tls/interface/test_suite_sdv_frame_tls_config_1.c+13-13

	@@ -302,15 +302,15 @@ EXIT:
302	/* END_CASE */	302	/* END_CASE */
303		303
304	/** @	304	/** @
305	-* @test UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001	305	+* @test UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001
306	* @spec -	306	* @spec -
307	-* @title Test the HITLS_CFG_SetExtenedMasterSecretSupport and HITLS_CFG_GetExtenedMasterSecretSupport interfaces.	307	+* @title Test the HITLS_CFG_SetExtendedMasterSecretSupport and HITLS_CFG_GetExtendedMasterSecretSupport interfaces.
308	* @precon nan	308	* @precon nan
309	-* @brief HITLS_CFG_SetExtenedMasterSecretSupport	309	+* @brief HITLS_CFG_SetExtendedMasterSecretSupport
310	* 1. Import empty configuration information. Expected result 1.	310	* 1. Import empty configuration information. Expected result 1.
311	* 2. Transfer non-empty configuration information and set support to an invalid value. Expected result 2.	311	* 2. Transfer non-empty configuration information and set support to an invalid value. Expected result 2.
312	* 3. Transfer non-empty configuration information and set support to a valid value. Expected result 3.	312	* 3. Transfer non-empty configuration information and set support to a valid value. Expected result 3.
313	-* HITLS_CFG_GetExtenedMasterSecretSupport	313	+* HITLS_CFG_GetExtendedMasterSecretSupport
314	* 1. Import empty configuration information. Expected result 1.	314	* 1. Import empty configuration information. Expected result 1.
315	* 2. Transfer an empty isSupport pointer. Expected result 1.	315	* 2. Transfer an empty isSupport pointer. Expected result 1.
316	* 3. Transfer the non-null configuration information and the isSupport pointer is not null. Expected result 3 is	316	* 3. Transfer the non-null configuration information and the isSupport pointer is not null. Expected result 3 is
	@@ -321,14 +321,14 @@ EXIT:
321	@ */	321	@ */
322		322
323	/* BEGIN_CASE */	323	/* BEGIN_CASE */
324	-void UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001(int tlsVersion)	324	+void UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001(int tlsVersion)
325	{	325	{
326	FRAME_Init();	326	FRAME_Init();
327	HITLS_Config *config = NULL;	327	HITLS_Config *config = NULL;
328	bool support = -1;	328	bool support = -1;
329	bool isSupport = -1;	329	bool isSupport = -1;
330	- ASSERT_TRUE(HITLS_CFG_SetExtenedMasterSecretSupport(config, support) == HITLS_NULL_INPUT);	330	+ ASSERT_TRUE(HITLS_CFG_SetExtendedMasterSecretSupport(config, support) == HITLS_NULL_INPUT);
331	- ASSERT_TRUE(HITLS_CFG_GetExtenedMasterSecretSupport(config, &isSupport) == HITLS_NULL_INPUT);	331	+ ASSERT_TRUE(HITLS_CFG_GetExtendedMasterSecretSupport(config, &isSupport) == HITLS_NULL_INPUT);
332		332
333	switch (tlsVersion) {	333	switch (tlsVersion) {
334	case HITLS_VERSION_TLS12:	334	case HITLS_VERSION_TLS12:
	@@ -342,19 +342,19 @@ void UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001(int tlsVersion)
342	break;	342	break;
343	}	343	}
344		344
345	- ASSERT_TRUE(HITLS_CFG_GetExtenedMasterSecretSupport(config, NULL) == HITLS_NULL_INPUT);	345	+ ASSERT_TRUE(HITLS_CFG_GetExtendedMasterSecretSupport(config, NULL) == HITLS_NULL_INPUT);
346		346
347	support = true;	347	support = true;
348	- ASSERT_TRUE(HITLS_CFG_SetExtenedMasterSecretSupport(config, support) == HITLS_SUCCESS);	348	+ ASSERT_TRUE(HITLS_CFG_SetExtendedMasterSecretSupport(config, support) == HITLS_SUCCESS);
349		349
350	support = -1;	350	support = -1;
351	- ASSERT_TRUE(HITLS_CFG_SetExtenedMasterSecretSupport(config, support) == HITLS_SUCCESS);	351	+ ASSERT_TRUE(HITLS_CFG_SetExtendedMasterSecretSupport(config, support) == HITLS_SUCCESS);
352	- ASSERT_TRUE(HITLS_CFG_GetExtenedMasterSecretSupport(config, &isSupport) == HITLS_SUCCESS);	352	+ ASSERT_TRUE(HITLS_CFG_GetExtendedMasterSecretSupport(config, &isSupport) == HITLS_SUCCESS);
353	ASSERT_TRUE(isSupport == true);	353	ASSERT_TRUE(isSupport == true);
354		354
355	support = false;	355	support = false;
356	- ASSERT_TRUE(HITLS_CFG_SetExtenedMasterSecretSupport(config, support) == HITLS_SUCCESS);	356	+ ASSERT_TRUE(HITLS_CFG_SetExtendedMasterSecretSupport(config, support) == HITLS_SUCCESS);
357	- ASSERT_TRUE(HITLS_CFG_GetExtenedMasterSecretSupport(config, &isSupport) == HITLS_SUCCESS);	357	+ ASSERT_TRUE(HITLS_CFG_GetExtendedMasterSecretSupport(config, &isSupport) == HITLS_SUCCESS);
358	ASSERT_TRUE(isSupport == false);	358	ASSERT_TRUE(isSupport == false);
359	EXIT:	359	EXIT:
360	HITLS_CFG_FreeConfig(config);	360	HITLS_CFG_FreeConfig(config);

Mtestcode/sdv/testcase/tls/interface/test_suite_sdv_frame_tls_config_1.data+4-4

	@@ -4,11 +4,11 @@ UT_TLS_CFG_SET_VERSION_API_TC001:
4	UT_TLS_CFG_SET_GET_VERSIONFORBID_API_TC001	4	UT_TLS_CFG_SET_GET_VERSIONFORBID_API_TC001
5	UT_TLS_CFG_SET_GET_VERSIONFORBID_API_TC001:	5	UT_TLS_CFG_SET_GET_VERSIONFORBID_API_TC001:
6		6
7	-UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001	7	+UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001
8	-UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001:HITLS_VERSION_TLS12	8	+UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001:HITLS_VERSION_TLS12
9		9
10	-UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001	10	+UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001
11	-UT_TLS_CFG_SET_GET_EXTENEDMASTERSECRETSUPPORT_API_TC001:HITLS_VERSION_TLS13	11	+UT_TLS_CFG_SET_GET_ExtendedMasterSecretSUPPORT_API_TC001:HITLS_VERSION_TLS13
12		12
13	UT_TLS_CFG_SET_GET_POSTHANDSHAKEAUTHSUPPORT_API_TC001	13	UT_TLS_CFG_SET_GET_POSTHANDSHAKEAUTHSUPPORT_API_TC001
14	UT_TLS_CFG_SET_GET_POSTHANDSHAKEAUTHSUPPORT_API_TC001:HITLS_VERSION_TLS13	14	UT_TLS_CFG_SET_GET_POSTHANDSHAKEAUTHSUPPORT_API_TC001:HITLS_VERSION_TLS13

Mtls/config/src/config.c+2-2

	@@ -1491,7 +1491,7 @@ int32_t HITLS_CFG_SetResumptionOnRenegoSupport(HITLS_Config *config, bool suppor
1491	}	1491	}
1492	#endif	1492	#endif
1493		1493
1494	-int32_t HITLS_CFG_SetExtenedMasterSecretSupport(HITLS_Config *config, bool support)	1494	+int32_t HITLS_CFG_SetExtendedMasterSecretSupport(HITLS_Config *config, bool support)
1495	{	1495	{
1496	if (config == NULL) {	1496	if (config == NULL) {
1497	return HITLS_NULL_INPUT;	1497	return HITLS_NULL_INPUT;
	@@ -1572,7 +1572,7 @@ int32_t HITLS_CFG_GetRenegotiationSupport(const HITLS_Config config, bool isSu
1572	}	1572	}
1573	#endif	1573	#endif
1574		1574
1575	-int32_t HITLS_CFG_GetExtenedMasterSecretSupport(HITLS_Config config, bool isSupport)	1575	+int32_t HITLS_CFG_GetExtendedMasterSecretSupport(HITLS_Config config, bool isSupport)
1576	{	1576	{
1577	if (config == NULL \|\| isSupport == NULL) {	1577	if (config == NULL \|\| isSupport == NULL) {
1578	return HITLS_NULL_INPUT;	1578	return HITLS_NULL_INPUT;

	@@ -27,7 +27,7 @@ Currently, openHiTLS supports the following protocol versions:
27	\| Verify client certificate only once\| HITLS_CFG_SetClientOnceVerifySupport (disabled by default)\|	27	\| Verify client certificate only once\| HITLS_CFG_SetClientOnceVerifySupport (disabled by default)\|
28	\| Send handshake packets in a single flight\| HITLS_CFG_SetFlightTransmitSwitch (disabled by default)\|	28	\| Send handshake packets in a single flight\| HITLS_CFG_SetFlightTransmitSwitch (disabled by default)\|
29	\| Quiet shutdown mode\| HITLS_CFG_SetQuietShutdown (disabled by default)\|	29	\| Quiet shutdown mode\| HITLS_CFG_SetQuietShutdown (disabled by default)\|
30	-\| Extend primary key\| HITLS_CFG_SetExtenedMasterSecretSupport (enabled by default)\|	30	+\| Extend primary key\| HITLS_CFG_SetExtendedMasterSecretSupport (enabled by default)\|
31	\| Support sessionTicket\| HITLS_CFG_SetSessionTicketSupport (enabled by default)\|	31	\| Support sessionTicket\| HITLS_CFG_SetSessionTicketSupport (enabled by default)\|
32	\| Verify keyUsage\| HITLS_CFG_SetCheckKeyUsage (enabled by default)\|	32	\| Verify keyUsage\| HITLS_CFG_SetCheckKeyUsage (enabled by default)\|
33	\| Auto-generate DH parameter\| HITLS_CFG_SetDhAutoSupport (enabled by default)\|	33	\| Auto-generate DH parameter\| HITLS_CFG_SetDhAutoSupport (enabled by default)\|
	@@ -48,7 +48,7 @@ Currently, openHiTLS supports the following protocol versions:
48	\| Authentication after handshake\| HITLS_CFG_SetPostHandshakeAuthSupport (disabled by default)\|	48	\| Authentication after handshake\| HITLS_CFG_SetPostHandshakeAuthSupport (disabled by default)\|
49	\| Send handshake packets in a single flight\| HITLS_CFG_SetFlightTransmitSwitch (disabled by default)\|	49	\| Send handshake packets in a single flight\| HITLS_CFG_SetFlightTransmitSwitch (disabled by default)\|
50	\| Quiet shutdown mode\| HITLS_CFG_SetQuietShutdown (disabled by default)\|	50	\| Quiet shutdown mode\| HITLS_CFG_SetQuietShutdown (disabled by default)\|
51	-\| Extend primary key\| HITLS_CFG_SetExtenedMasterSecretSupport (enabled by default)\|	51	+\| Extend primary key\| HITLS_CFG_SetExtendedMasterSecretSupport (enabled by default)\|
52	\| Support sessionTicket\| HITLS_CFG_SetSessionTicketSupport (enabled by default)\|	52	\| Support sessionTicket\| HITLS_CFG_SetSessionTicketSupport (enabled by default)\|
53	\| Verify keyUsage\| HITLS_CFG_SetCheckKeyUsage (enabled by default)\|	53	\| Verify keyUsage\| HITLS_CFG_SetCheckKeyUsage (enabled by default)\|
54	\| Auto-generate DH parameter\| HITLS_CFG_SetDhAutoSupport (enabled by default)\|	54	\| Auto-generate DH parameter\| HITLS_CFG_SetDhAutoSupport (enabled by default)\|

	@@ -27,7 +27,7 @@ openHiTLS目前支持协议版本如下：
27	\| 是否只校验一次客户端证书 \| HITLS_CFG_SetClientOnceVerifySupport（默认关闭） \|	27	\| 是否只校验一次客户端证书 \| HITLS_CFG_SetClientOnceVerifySupport（默认关闭） \|
28	\| 是否开启单航程发送握手报文 \| HITLS_CFG_SetFlightTransmitSwitch（默认关闭） \|	28	\| 是否开启单航程发送握手报文 \| HITLS_CFG_SetFlightTransmitSwitch（默认关闭） \|
29	\| 是否开启安静断链模式 \| HITLS_CFG_SetQuietShutdown（默认关闭） \|	29	\| 是否开启安静断链模式 \| HITLS_CFG_SetQuietShutdown（默认关闭） \|
30	-\| 是否支持扩展主密钥 \| HITLS_CFG_SetExtenedMasterSecretSupport（默认开启） \|	30	+\| 是否支持扩展主密钥 \| HITLS_CFG_SetExtendedMasterSecretSupport（默认开启） \|
31	\| 是否支持sessionTicket \| HITLS_CFG_SetSessionTicketSupport（默认开启） \|	31	\| 是否支持sessionTicket \| HITLS_CFG_SetSessionTicketSupport（默认开启） \|
32	\| 是否校验证书keyUsage \| HITLS_CFG_SetCheckKeyUsage（默认开启） \|	32	\| 是否校验证书keyUsage \| HITLS_CFG_SetCheckKeyUsage（默认开启） \|
33	\| 是否支持自动生成DH参数 \| HITLS_CFG_SetDhAutoSupport（默认开启） \|	33	\| 是否支持自动生成DH参数 \| HITLS_CFG_SetDhAutoSupport（默认开启） \|
	@@ -48,7 +48,7 @@ openHiTLS目前支持协议版本如下：
48	\| 是否开启握手后认证 \| HITLS_CFG_SetPostHandshakeAuthSupport（默认关闭） \|	48	\| 是否开启握手后认证 \| HITLS_CFG_SetPostHandshakeAuthSupport（默认关闭） \|
49	\| 是否开启单航程发送握手报文 \| HITLS_CFG_SetFlightTransmitSwitch（默认关闭） \|	49	\| 是否开启单航程发送握手报文 \| HITLS_CFG_SetFlightTransmitSwitch（默认关闭） \|
50	\| 是否开启安静断链模式 \| HITLS_CFG_SetQuietShutdown（默认关闭） \|	50	\| 是否开启安静断链模式 \| HITLS_CFG_SetQuietShutdown（默认关闭） \|
51	-\| 是否支持扩展主密钥 \| HITLS_CFG_SetExtenedMasterSecretSupport（默认开启） \|	51	+\| 是否支持扩展主密钥 \| HITLS_CFG_SetExtendedMasterSecretSupport（默认开启） \|
52	\| 是否支持sessionTicket \| HITLS_CFG_SetSessionTicketSupport（默认开启） \|	52	\| 是否支持sessionTicket \| HITLS_CFG_SetSessionTicketSupport（默认开启） \|
53	\| 是否校验证书keyUsage \| HITLS_CFG_SetCheckKeyUsage（默认开启） \|	53	\| 是否校验证书keyUsage \| HITLS_CFG_SetCheckKeyUsage（默认开启） \|
54	\| 是否支持自动生成DH参数 \| HITLS_CFG_SetDhAutoSupport（默认开启） \|	54	\| 是否支持自动生成DH参数 \| HITLS_CFG_SetDhAutoSupport（默认开启） \|

	@@ -150,7 +150,7 @@ void ServerAccept(HLT_FrameHandle handle, TestPara testPara)
150	//Set up a TLS link on the remote client.	150	//Set up a TLS link on the remote client.
151	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");	151	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
152	ASSERT_TRUE(clientConfig != NULL);	152	ASSERT_TRUE(clientConfig != NULL);
153	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	153	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
154	clientRes = HLT_ProcessTlsInit(remoteProcess, TLS1_2, clientConfig, NULL);	154	clientRes = HLT_ProcessTlsInit(remoteProcess, TLS1_2, clientConfig, NULL);
155	ASSERT_TRUE(clientRes != NULL);	155	ASSERT_TRUE(clientRes != NULL);
156	HLT_RpcTlsConnect(remoteProcess, clientRes->sslId);	156	HLT_RpcTlsConnect(remoteProcess, clientRes->sslId);
	@@ -212,7 +212,7 @@ void ServerSendMalformedRecordHeaderMsg(HLT_FrameHandle handle, TestPara testP
212	//Set up a TLS link on the remote client.	212	//Set up a TLS link on the remote client.
213	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");	213	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
214	ASSERT_TRUE(clientConfig != NULL);	214	ASSERT_TRUE(clientConfig != NULL);
215	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	215	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
216	ASSERT_TRUE(HLT_SetRenegotiationSupport(clientConfig, testPara->isSupportRenegotiation) == 0);	216	ASSERT_TRUE(HLT_SetRenegotiationSupport(clientConfig, testPara->isSupportRenegotiation) == 0);
217	clientConfig->isSupportSessionTicket = testPara->isSupportSessionTicket;	217	clientConfig->isSupportSessionTicket = testPara->isSupportSessionTicket;
218	if (testPara->isSupportSni) {	218	if (testPara->isSupportSni) {
	@@ -345,7 +345,7 @@ void ClientSendMalformedRecordHeaderMsg(HLT_FrameHandle handle, TestPara testP
345	if (testPara->clientSignature != NULL) {	345	if (testPara->clientSignature != NULL) {
346	ASSERT_TRUE(HLT_SetSignature(clientConfig, testPara->clientSignature) == 0);	346	ASSERT_TRUE(HLT_SetSignature(clientConfig, testPara->clientSignature) == 0);
347	}	347	}
348	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	348	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
349	clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);	349	clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);
350	ASSERT_TRUE(clientRes != NULL);	350	ASSERT_TRUE(clientRes != NULL);
351		351

	@@ -115,7 +115,7 @@ void SDV_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_FUNC_TC006(int ver
115	ASSERT_TRUE(clientConfig != NULL);	115	ASSERT_TRUE(clientConfig != NULL);
116		116
117	HLT_Ctx_Config *clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");	117	HLT_Ctx_Config *clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");
118	- HLT_SetExtenedMasterSecretSupport(clientCtxConfig, false);	118	+ HLT_SetExtendedMasterSecretSupport(clientCtxConfig, false);
119		119
120	HLT_Ctx_Config *serverCtxConfig = HLT_NewCtxConfig(NULL, "SERVER");	120	HLT_Ctx_Config *serverCtxConfig = HLT_NewCtxConfig(NULL, "SERVER");
121	#ifdef HITLS_TLS_FEATURE_PROVIDER	121	#ifdef HITLS_TLS_FEATURE_PROVIDER
	@@ -124,7 +124,7 @@ void SDV_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_FUNC_TC006(int ver
124	serverConfigId = HLT_RpcTlsNewCtx(remoteProcess, version, false);	124	serverConfigId = HLT_RpcTlsNewCtx(remoteProcess, version, false);
125	#endif	125	#endif
126	// 1. The client and server do not support the extension connection establishment.	126	// 1. The client and server do not support the extension connection establishment.
127	- HLT_SetExtenedMasterSecretSupport(clientCtxConfig, false);	127	+ HLT_SetExtendedMasterSecretSupport(clientCtxConfig, false);
128		128
129	ASSERT_TRUE(HLT_TlsSetCtx(clientConfig, clientCtxConfig) == 0);	129	ASSERT_TRUE(HLT_TlsSetCtx(clientConfig, clientCtxConfig) == 0);
130	ASSERT_TRUE(HLT_RpcTlsSetCtx(remoteProcess, serverConfigId, serverCtxConfig) == 0);	130	ASSERT_TRUE(HLT_RpcTlsSetCtx(remoteProcess, serverConfigId, serverCtxConfig) == 0);
	@@ -371,7 +371,7 @@ void SDV_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_FUNC_TC008(int ver
371	serverConfigId2 = HLT_RpcTlsNewCtx(remoteProcess, version, false);	371	serverConfigId2 = HLT_RpcTlsNewCtx(remoteProcess, version, false);
372	#endif	372	#endif
373	// 2. Apply for another server that does not support the extension and establish a connection.	373	// 2. Apply for another server that does not support the extension and establish a connection.
374	- HLT_SetExtenedMasterSecretSupport(serverCtxConfig2, false);	374	+ HLT_SetExtendedMasterSecretSupport(serverCtxConfig2, false);
375	ASSERT_TRUE(HLT_TlsSetCtx(clientConfig, clientCtxConfig) == 0);	375	ASSERT_TRUE(HLT_TlsSetCtx(clientConfig, clientCtxConfig) == 0);
376	ASSERT_TRUE(HLT_RpcTlsSetCtx(remoteProcess, serverConfigId, serverCtxConfig) == 0);	376	ASSERT_TRUE(HLT_RpcTlsSetCtx(remoteProcess, serverConfigId, serverCtxConfig) == 0);
377	do {	377	do {
	@@ -513,10 +513,10 @@ void SDV_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_FUNC_TC009(int ver
513	ASSERT_TRUE(clientConfig != NULL);	513	ASSERT_TRUE(clientConfig != NULL);
514		514
515	clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");	515	clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");
516	- HLT_SetExtenedMasterSecretSupport(clientCtxConfig, false);	516	+ HLT_SetExtendedMasterSecretSupport(clientCtxConfig, false);
517		517
518	serverCtxConfig = HLT_NewCtxConfig(NULL, "SERVER");	518	serverCtxConfig = HLT_NewCtxConfig(NULL, "SERVER");
519	- HLT_SetExtenedMasterSecretSupport(serverCtxConfig, false);	519	+ HLT_SetExtendedMasterSecretSupport(serverCtxConfig, false);
520		520
521	#ifdef HITLS_TLS_FEATURE_PROVIDER	521	#ifdef HITLS_TLS_FEATURE_PROVIDER
522	serverConfigId = HLT_RpcProviderTlsNewCtx(remoteProcess, version, false, NULL, NULL, NULL, 0, NULL);	522	serverConfigId = HLT_RpcProviderTlsNewCtx(remoteProcess, version, false, NULL, NULL, NULL, 0, NULL);

	@@ -252,7 +252,7 @@ void ServerAccept(HLT_FrameHandle handle, TestPara testPara)
252		252
253	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");	253	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
254	ASSERT_TRUE(clientConfig != NULL);	254	ASSERT_TRUE(clientConfig != NULL);
255	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	255	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
256	clientRes = HLT_ProcessTlsInit(remoteProcess, TLS1_2, clientConfig, NULL);	256	clientRes = HLT_ProcessTlsInit(remoteProcess, TLS1_2, clientConfig, NULL);
257	ASSERT_TRUE(clientRes != NULL);	257	ASSERT_TRUE(clientRes != NULL);
258	HLT_RpcTlsConnect(remoteProcess, clientRes->sslId);	258	HLT_RpcTlsConnect(remoteProcess, clientRes->sslId);
	@@ -303,7 +303,7 @@ void ServerSendMalformedRecordHeaderMsg(HLT_FrameHandle handle, TestPara testP
303		303
304	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");	304	clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
305	ASSERT_TRUE(clientConfig != NULL);	305	ASSERT_TRUE(clientConfig != NULL);
306	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	306	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
307	ASSERT_TRUE(HLT_SetSessionTicketSupport(clientConfig, testPara->isSupportSessionTicket) == 0);	307	ASSERT_TRUE(HLT_SetSessionTicketSupport(clientConfig, testPara->isSupportSessionTicket) == 0);
308	if (testPara->isSupportDhCipherSuites) {	308	if (testPara->isSupportDhCipherSuites) {
309	ASSERT_TRUE(HLT_SetCipherSuites(clientConfig, "HITLS_DHE_RSA_WITH_AES_128_GCM_SHA256") == 0);	309	ASSERT_TRUE(HLT_SetCipherSuites(clientConfig, "HITLS_DHE_RSA_WITH_AES_128_GCM_SHA256") == 0);
	@@ -415,7 +415,7 @@ void ClientSendMalformedRecordHeaderMsg(HLT_FrameHandle handle, TestPara testP
415	if (testPara->clientSignature != NULL) {	415	if (testPara->clientSignature != NULL) {
416	ASSERT_TRUE(HLT_SetSignature(clientConfig, testPara->clientSignature) == 0);	416	ASSERT_TRUE(HLT_SetSignature(clientConfig, testPara->clientSignature) == 0);
417	}	417	}
418	- ASSERT_TRUE(HLT_SetExtenedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);	418	+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);
419	clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);	419	clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);
420	ASSERT_TRUE(clientRes != NULL);	420	ASSERT_TRUE(clientRes != NULL);
421	// Configure the interface for constructing abnormal messages.	421	// Configure the interface for constructing abnormal messages.