Star1136
750
代码
代码
Issues31
Pull Requests53
Actions
项目讨论
Wiki
分析
Star1136
750
已合并
fix:spelling error of ems #986
longparty创建于 1月7日
fix:spelling error of ems #986
已合并
longparty创建于 1月7日
从longparty/openhitlsopenhitls-0.2合入到openHiTLS/openhitlsopenhitls-0.2
共 41 个文件变更+290-290
Mtestcode/framework/tls/include/hlt_type.h+1-1
@@ -225,7 +225,7 @@ typedef struct {
225 // The handshake will be continued regardless of the verification result. for server and client225 // The handshake will be continued regardless of the verification result. for server and client
226 bool isSupportVerifyNone;226 bool isSupportVerifyNone;
227 bool isSupportPostHandshakeAuth; // Indicates whether to support post handshake auth. The default value is false.227 bool isSupportPostHandshakeAuth; // Indicates whether to support post handshake auth. The default value is false.
228- bool isSupportExtendMasterSecret; // supports extended master keys. The default value is True228+ bool isSupportExtendedMasterSecret; // supports extended master keys. The default value is True
229 bool isSupportSessionTicket; // Support session ticket229 bool isSupportSessionTicket; // Support session ticket
230 bool isEncryptThenMac; // Encrypt-then-mac is supported230 bool isEncryptThenMac; // Encrypt-then-mac is supported
231 // Users can set the DH parameter to be automatically selected. If the switch is enabled,231 // Users can set the DH parameter to be automatically selected. If the switch is enabled,
Mtestcode/framework/tls/msg/src/pack_frame_msg.c+1-1
@@ -89,7 +89,7 @@ int32_t GenClientHelloExtensionCtx(TLS_Ctx *tlsCtx, FRAME_Msg *msg)
89{89{
90 ClientHelloMsg *clientHello = &msg->body.handshakeMsg.body.clientHello;90 ClientHelloMsg *clientHello = &msg->body.handshakeMsg.body.clientHello;
91 TLS_Config *tlsConfig = &tlsCtx->config.tlsConfig;91 TLS_Config *tlsConfig = &tlsCtx->config.tlsConfig;
92- tlsConfig->isSupportExtendMasterSecret = clientHello->extension.flag.haveExtendedMasterSecret;92+ tlsConfig->isSupportExtendedMasterSecret = clientHello->extension.flag.haveExtendedMasterSecret;
93 tlsConfig->signAlgorithmsSize = clientHello->extension.content.signatureAlgorithmsSize;93 tlsConfig->signAlgorithmsSize = clientHello->extension.content.signatureAlgorithmsSize;
94 if (tlsConfig->signAlgorithmsSize > 0) {94 if (tlsConfig->signAlgorithmsSize > 0) {
95 uint32_t signAlgorithmsLen = tlsConfig->signAlgorithmsSize * sizeof(uint16_t);95 uint32_t signAlgorithmsLen = tlsConfig->signAlgorithmsSize * sizeof(uint16_t);
Mtestcode/framework/tls/process/src/handle_cmd.c+2-2
@@ -247,8 +247,8 @@ int ParseCtxConfigFromString(char (*string)[CONTROL_CHANNEL_MAX_MSG_LEN], HLT_Ct
247 247 
248 // Indicates whether extended master keys are supported.248 // Indicates whether extended master keys are supported.
249 // The twelfth parameter indicates whether the extended master key is supported.249 // The twelfth parameter indicates whether the extended master key is supported.
250- ctxConfig->isSupportExtendMasterSecret = (((int)strtol(string[index++], NULL, 10)) > 0) ? true : false;250+ ctxConfig->isSupportExtendedMasterSecret = (((int)strtol(string[index++], NULL, 10)) > 0) ? true : false;
251- LOG_DEBUG("Remote Process Set Ctx isSupportExtendMasterSecret is %d", ctxConfig->isSupportExtendMasterSecret);251+ LOG_DEBUG("Remote Process Set Ctx isSupportExtendedMasterSecret is %d", ctxConfig->isSupportExtendedMasterSecret);
252 252 
253 // device certificate253 // device certificate
254 // The thirteenth parameter indicates the location of the device certificate.254 // The thirteenth parameter indicates the location of the device certificate.
Mtestcode/framework/tls/rpc/src/hitls_func.c+2-2
@@ -520,8 +520,8 @@ int HitlsSetCtx(HITLS_Config *outCfg, HLT_Ctx_Config *inCtxCfg)
520 ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetPostHandshakeAuth ERROR");520 ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetPostHandshakeAuth ERROR");
521#endif521#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->isSupportExtendedMasterSecret);
524- ret = HITLS_CFG_SetExtendedMasterSecretSupport(outCfg, inCtxCfg->isSupportExtendMasterSecret);524+ ret = HITLS_CFG_SetExtendedMasterSecretSupport(outCfg, inCtxCfg->isSupportExtendedMasterSecret);
525 ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetExtendedMasterSecretSupport ERROR");525 ASSERT_RETURN(ret == SUCCESS, "HITLS_CFG_SetExtendedMasterSecretSupport ERROR");
526 526 
527#ifdef HITLS_TLS_CONFIG_KEY_USAGE527#ifdef HITLS_TLS_CONFIG_KEY_USAGE
Mtestcode/framework/tls/rpc/src/hlt_func.c+3-3
@@ -571,7 +571,7 @@ HLT_Ctx_Config* HLT_NewCtxConfigTLCP(char *setFile, const char *key, bool isClie
571 ctxConfig->allowLegacyRenegotiate = false;571 ctxConfig->allowLegacyRenegotiate = false;
572 ctxConfig->isSupportClientVerify = false;572 ctxConfig->isSupportClientVerify = false;
573 ctxConfig->isSupportNoClientCert = false;573 ctxConfig->isSupportNoClientCert = false;
574- ctxConfig->isSupportExtendMasterSecret = false;574+ ctxConfig->isSupportExtendedMasterSecret = false;
575 ctxConfig->isClient = isClient;575 ctxConfig->isClient = isClient;
576 ctxConfig->setSessionCache = 2;576 ctxConfig->setSessionCache = 2;
577 HLT_SetGroups(ctxConfig, "NULL");577 HLT_SetGroups(ctxConfig, "NULL");
@@ -621,7 +621,7 @@ HLT_Ctx_Config* HLT_NewCtxConfig(char *setFile, const char *key)
621 ctxConfig->isSupportNoClientCert = false;621 ctxConfig->isSupportNoClientCert = false;
622 ctxConfig->isSupportVerifyNone = false;622 ctxConfig->isSupportVerifyNone = false;
623 ctxConfig->isSupportPostHandshakeAuth = false;623 ctxConfig->isSupportPostHandshakeAuth = false;
624- ctxConfig->isSupportExtendMasterSecret = true;624+ ctxConfig->isSupportExtendedMasterSecret = true;
625 ctxConfig->isSupportSessionTicket = false;625 ctxConfig->isSupportSessionTicket = false;
626 ctxConfig->isSupportDhAuto = true;626 ctxConfig->isSupportDhAuto = true;
627 ctxConfig->isEncryptThenMac = true;627 ctxConfig->isEncryptThenMac = true;
@@ -1110,7 +1110,7 @@ int HLT_SetNoClientCertSupport(HLT_Ctx_Config *ctxConfig, bool support)
1110 1110 
1111int HLT_SetExtendedMasterSecretSupport(HLT_Ctx_Config *ctxConfig, bool support)1111int HLT_SetExtendedMasterSecretSupport(HLT_Ctx_Config *ctxConfig, bool support)
1112{1112{
1113- ctxConfig->isSupportExtendMasterSecret = support;1113+ ctxConfig->isSupportExtendedMasterSecret = support;
1114 return SUCCESS;1114 return SUCCESS;
1115}1115}
1116 1116 
Mtestcode/framework/tls/rpc/src/hlt_rpc_func.c+1-1
@@ -183,7 +183,7 @@ int HLT_RpcTlsSetCtx(HLT_Process *peerProcess, int ctxId, HLT_Ctx_Config *config
183 g_cmdIndex, __FUNCTION__, ctxId,183 g_cmdIndex, __FUNCTION__, ctxId,
184 config->minVersion, config->maxVersion, config->cipherSuites, config->tls13CipherSuites,184 config->minVersion, config->maxVersion, config->cipherSuites, config->tls13CipherSuites,
185 config->pointFormats, config->groups, config->signAlgorithms, config->isSupportRenegotiation,185 config->pointFormats, config->groups, config->signAlgorithms, config->isSupportRenegotiation,
186- config->isSupportClientVerify, config->isSupportNoClientCert, config->isSupportExtendMasterSecret, config->eeCert,186+ config->isSupportClientVerify, config->isSupportNoClientCert, config->isSupportExtendedMasterSecret, config->eeCert,
187 config->privKey, config->password, config->caCert, config->chainCert,187 config->privKey, config->password, config->caCert, config->chainCert,
188 config->signCert, config->signPrivKey, config->psk, config->isSupportSessionTicket,188 config->signCert, config->signPrivKey, config->psk, config->isSupportSessionTicket,
189 config->setSessionCache, config->ticketKeyCb, config->isFlightTransmitEnable, config->serverName,189 config->setSessionCache, config->ticketKeyCb, config->isFlightTransmitEnable, config->serverName,
Mtestcode/sdv/testcase/tls/consistency/dtlcp/test_suite_sdv_frame_dtlcp_consistency.base.c+3-3
@@ -71,7 +71,7 @@ typedef struct {
71 FRAME_LinkObj *server;71 FRAME_LinkObj *server;
72 HITLS_HandshakeState state;72 HITLS_HandshakeState state;
73 bool isClient;73 bool isClient;
74- bool isSupportExtendMasterSecret;74+ bool isSupportExtendedMasterSecret;
75 bool isSupportClientVerify;75 bool isSupportClientVerify;
76 bool isSupportNoClientCert;76 bool isSupportNoClientCert;
77 bool isSupportRenegotiation;77 bool isSupportRenegotiation;
@@ -108,7 +108,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo, int uioType)
108 }108 }
109 109 
110 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);110 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
111- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;111+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
112 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;112 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
113 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;113 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
114 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;114 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -130,7 +130,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
130 uint16_t cipherSuits[] = {HITLS_ECDHE_SM4_CBC_SM3,HITLS_ECC_SM4_CBC_SM3};130 uint16_t cipherSuits[] = {HITLS_ECDHE_SM4_CBC_SM3,HITLS_ECC_SM4_CBC_SM3};
131 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));131 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
132 132 
133- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;133+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
134 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;134 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
135 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;135 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
136 136 
Mtestcode/sdv/testcase/tls/consistency/dtlcp/test_suite_sdv_frame_dtlcp_consistency.c+2-2
@@ -411,7 +411,7 @@ void UT_TLS_DTLCP_CONSISTENCY_RFC8422_ECPOINT_TC001(void)
411{411{
412 HandshakeTestInfo testInfo = {0};412 HandshakeTestInfo testInfo = {0};
413 testInfo.state = TRY_RECV_SERVER_HELLO;413 testInfo.state = TRY_RECV_SERVER_HELLO;
414- testInfo.isSupportExtendMasterSecret = true;414+ testInfo.isSupportExtendedMasterSecret = true;
415 testInfo.isClient = true;415 testInfo.isClient = true;
416 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);416 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
417 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);417 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -482,7 +482,7 @@ void UT_TLS_DTLCP_CONSISTENCY_RFC8422_EXTENSION_MISS_TC001(void)
482{482{
483 HandshakeTestInfo testInfo = {0};483 HandshakeTestInfo testInfo = {0};
484 testInfo.state = TRY_RECV_CLIENT_HELLO;484 testInfo.state = TRY_RECV_CLIENT_HELLO;
485- testInfo.isSupportExtendMasterSecret = true;485+ testInfo.isSupportExtendedMasterSecret = true;
486 testInfo.isClient = false;486 testInfo.isClient = false;
487 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);487 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
488 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);488 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
Mtestcode/sdv/testcase/tls/consistency/dtls12/test_suite_sdv_frame_dtls12_consistency.base.c+3-3
@@ -71,7 +71,7 @@ typedef struct {
71 FRAME_LinkObj *server;71 FRAME_LinkObj *server;
72 HITLS_HandshakeState state;72 HITLS_HandshakeState state;
73 bool isClient;73 bool isClient;
74- bool isSupportExtendMasterSecret;74+ bool isSupportExtendedMasterSecret;
75 bool isSupportClientVerify;75 bool isSupportClientVerify;
76 bool isSupportNoClientCert;76 bool isSupportNoClientCert;
77} HandshakeTestInfo;77} HandshakeTestInfo;
@@ -109,7 +109,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo, int uioType)
109 }109 }
110 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);110 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
111 HITLS_CFG_SetDtlsCookieExchangeSupport(testInfo->config, false);111 HITLS_CFG_SetDtlsCookieExchangeSupport(testInfo->config, false);
112- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;112+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
113 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;113 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
114 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;114 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
115 testInfo->config->isSupportDhAuto = true;115 testInfo->config->isSupportDhAuto = true;
@@ -128,7 +128,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo, int uioType)
128 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};128 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};
129 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));129 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
130 130 
131- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;131+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
132 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;132 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
133 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;133 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
134 134 
Mtestcode/sdv/testcase/tls/consistency/dtls12/test_suite_sdv_frame_dtls12_consistency.c+37-37
@@ -44,7 +44,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_UNEXPETED_REORD_TYPE_TC001(void)
44 FRAME_Type frameType = {0};44 FRAME_Type frameType = {0};
45 testInfo.state = HS_STATE_BUTT;45 testInfo.state = HS_STATE_BUTT;
46 testInfo.isClient = false;46 testInfo.isClient = false;
47- testInfo.isSupportExtendMasterSecret = true;47+ testInfo.isSupportExtendedMasterSecret = true;
48 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);48 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
49 frameType.versionType = HITLS_VERSION_DTLS12;49 frameType.versionType = HITLS_VERSION_DTLS12;
50 frameType.recordType = REC_TYPE_HANDSHAKE;50 frameType.recordType = REC_TYPE_HANDSHAKE;
@@ -100,7 +100,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SEQ_NUMBER_TC001(int uioType)
100 HandshakeTestInfo testInfo = {0};100 HandshakeTestInfo testInfo = {0};
101 FRAME_Msg frameMsg = {0};101 FRAME_Msg frameMsg = {0};
102 FRAME_Type frameType = {0};102 FRAME_Type frameType = {0};
103- testInfo.isSupportExtendMasterSecret = true;103+ testInfo.isSupportExtendedMasterSecret = true;
104 testInfo.state = TRY_RECV_CLIENT_HELLO;104 testInfo.state = TRY_RECV_CLIENT_HELLO;
105 testInfo.isClient = false;105 testInfo.isClient = false;
106 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);106 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
@@ -146,7 +146,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SEQ_NUMBER_TC002(int uioType)
146 HandshakeTestInfo testInfo = {0};146 HandshakeTestInfo testInfo = {0};
147 FRAME_Msg frameMsg = {0};147 FRAME_Msg frameMsg = {0};
148 FRAME_Type frameType = {0};148 FRAME_Type frameType = {0};
149- testInfo.isSupportExtendMasterSecret = true;149+ testInfo.isSupportExtendedMasterSecret = true;
150 testInfo.state = TRY_RECV_SERVER_HELLO;150 testInfo.state = TRY_RECV_SERVER_HELLO;
151 testInfo.isClient = true;151 testInfo.isClient = true;
152 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);152 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
@@ -194,7 +194,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SEQ_NUMBER_TC003(int uioType)
194 HandshakeTestInfo testInfo = {0};194 HandshakeTestInfo testInfo = {0};
195 FRAME_Msg frameMsg = {0};195 FRAME_Msg frameMsg = {0};
196 FRAME_Type frameType = {0};196 FRAME_Type frameType = {0};
197- testInfo.isSupportExtendMasterSecret = true;197+ testInfo.isSupportExtendedMasterSecret = true;
198 testInfo.state = TRY_RECV_FINISH;198 testInfo.state = TRY_RECV_FINISH;
199 testInfo.isClient = false;199 testInfo.isClient = false;
200 ASSERT_EQ(DefaultCfgStatusPark(&testInfo, uioType), HITLS_SUCCESS);200 ASSERT_EQ(DefaultCfgStatusPark(&testInfo, uioType), HITLS_SUCCESS);
@@ -256,7 +256,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_TOOLONG_TC001(int uioType)
256{256{
257 HandshakeTestInfo testInfo = {0};257 HandshakeTestInfo testInfo = {0};
258 testInfo.state = TRY_RECV_CERTIFICATE;258 testInfo.state = TRY_RECV_CERTIFICATE;
259- testInfo.isSupportExtendMasterSecret = true;259+ testInfo.isSupportExtendedMasterSecret = true;
260 testInfo.isClient = false;260 testInfo.isClient = false;
261 testInfo.isSupportClientVerify = true;261 testInfo.isSupportClientVerify = true;
262 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);262 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
@@ -323,7 +323,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_TOOLONG_TC002(int uioType)
323 HandshakeTestInfo testInfo = {0};323 HandshakeTestInfo testInfo = {0};
324 testInfo.state = TRY_RECV_CERTIFICATE;324 testInfo.state = TRY_RECV_CERTIFICATE;
325 testInfo.isClient = true;325 testInfo.isClient = true;
326- testInfo.isSupportExtendMasterSecret = true;326+ testInfo.isSupportExtendedMasterSecret = true;
327 testInfo.isSupportClientVerify = true;327 testInfo.isSupportClientVerify = true;
328 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);328 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
329 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);329 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -389,7 +389,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_TOOLONG_TC003(int uioType)
389 HandshakeTestInfo testInfo = {0};389 HandshakeTestInfo testInfo = {0};
390 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;390 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
391 testInfo.isClient = false;391 testInfo.isClient = false;
392- testInfo.isSupportExtendMasterSecret = true;392+ testInfo.isSupportExtendedMasterSecret = true;
393 testInfo.isSupportClientVerify = true;393 testInfo.isSupportClientVerify = true;
394 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);394 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
395 ASSERT_EQ(HITLS_Accept(testInfo.server->ssl), HITLS_REC_NORMAL_RECV_BUF_EMPTY);395 ASSERT_EQ(HITLS_Accept(testInfo.server->ssl), HITLS_REC_NORMAL_RECV_BUF_EMPTY);
@@ -447,7 +447,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC001(void)
447 FRAME_Msg frameMsg = {0};447 FRAME_Msg frameMsg = {0};
448 FRAME_Type frameType = {0};448 FRAME_Type frameType = {0};
449 testInfo.state = TRY_RECV_CLIENT_HELLO;449 testInfo.state = TRY_RECV_CLIENT_HELLO;
450- testInfo.isSupportExtendMasterSecret = true;450+ testInfo.isSupportExtendedMasterSecret = true;
451 testInfo.isClient = false;451 testInfo.isClient = false;
452 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);452 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
453 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);453 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -524,7 +524,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC002(void)
524 FRAME_Msg frameMsg = {0};524 FRAME_Msg frameMsg = {0};
525 FRAME_Type frameType = {0};525 FRAME_Type frameType = {0};
526 testInfo.state = TRY_RECV_SERVER_HELLO;526 testInfo.state = TRY_RECV_SERVER_HELLO;
527- testInfo.isSupportExtendMasterSecret = true;527+ testInfo.isSupportExtendedMasterSecret = true;
528 testInfo.isClient = true;528 testInfo.isClient = true;
529 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);529 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
530 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);530 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -599,7 +599,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC003(void)
599 FRAME_Msg frameMsg = {0};599 FRAME_Msg frameMsg = {0};
600 FRAME_Type frameType = {0};600 FRAME_Type frameType = {0};
601 testInfo.state = TRY_RECV_CERTIFICATE;601 testInfo.state = TRY_RECV_CERTIFICATE;
602- testInfo.isSupportExtendMasterSecret = true;602+ testInfo.isSupportExtendedMasterSecret = true;
603 testInfo.isClient = true;603 testInfo.isClient = true;
604 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);604 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
605 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);605 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -666,7 +666,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC004(void)
666 FRAME_Msg frameMsg = {0};666 FRAME_Msg frameMsg = {0};
667 FRAME_Type frameType = {0};667 FRAME_Type frameType = {0};
668 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;668 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;
669- testInfo.isSupportExtendMasterSecret = true;669+ testInfo.isSupportExtendedMasterSecret = true;
670 testInfo.isClient = true;670 testInfo.isClient = true;
671 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);671 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
672 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);672 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -738,7 +738,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC005(void)
738 FRAME_Msg frameMsg = {0};738 FRAME_Msg frameMsg = {0};
739 FRAME_Type frameType = {0};739 FRAME_Type frameType = {0};
740 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;740 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
741- testInfo.isSupportExtendMasterSecret = true;741+ testInfo.isSupportExtendedMasterSecret = true;
742 testInfo.isClient = false;742 testInfo.isClient = false;
743 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);743 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
744 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);744 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -803,7 +803,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC006(void)
803{803{
804 HandshakeTestInfo testInfo = {0};804 HandshakeTestInfo testInfo = {0};
805 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;805 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
806- testInfo.isSupportExtendMasterSecret = true;806+ testInfo.isSupportExtendedMasterSecret = true;
807 testInfo.isClient = false;807 testInfo.isClient = false;
808 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);808 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
809 ASSERT_TRUE(testInfo.server->ssl != NULL);809 ASSERT_TRUE(testInfo.server->ssl != NULL);
@@ -853,7 +853,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_MSGLENGTH_ZERO_TC007(void)
853{853{
854 HandshakeTestInfo testInfo = {0};854 HandshakeTestInfo testInfo = {0};
855 testInfo.state = TRY_SEND_FINISH;855 testInfo.state = TRY_SEND_FINISH;
856- testInfo.isSupportExtendMasterSecret = true;856+ testInfo.isSupportExtendedMasterSecret = true;
857 testInfo.isClient = true;857 testInfo.isClient = true;
858 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);858 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
859 ASSERT_TRUE(testInfo.server->ssl != NULL);859 ASSERT_TRUE(testInfo.server->ssl != NULL);
@@ -905,7 +905,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_COMPRESSED_TC001(int uioType)
905 FRAME_Msg frameMsg = {0};905 FRAME_Msg frameMsg = {0};
906 FRAME_Type frameType = {0};906 FRAME_Type frameType = {0};
907 testInfo.state = TRY_RECV_CLIENT_HELLO;907 testInfo.state = TRY_RECV_CLIENT_HELLO;
908- testInfo.isSupportExtendMasterSecret = true;908+ testInfo.isSupportExtendedMasterSecret = true;
909 testInfo.isClient = false;909 testInfo.isClient = false;
910 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);910 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
911 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);911 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -972,7 +972,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_COMPRESSED_TC002(int uioType)
972 FRAME_Msg frameMsg = {0};972 FRAME_Msg frameMsg = {0};
973 FRAME_Type frameType = {0};973 FRAME_Type frameType = {0};
974 testInfo.state = TRY_RECV_SERVER_HELLO;974 testInfo.state = TRY_RECV_SERVER_HELLO;
975- testInfo.isSupportExtendMasterSecret = true;975+ testInfo.isSupportExtendedMasterSecret = true;
976 testInfo.isClient = true;976 testInfo.isClient = true;
977 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);977 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
978 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);978 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -1038,7 +1038,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_CIPHER_TC001(void)
1038 FRAME_Msg frameMsg = {0};1038 FRAME_Msg frameMsg = {0};
1039 FRAME_Type frameType = {0};1039 FRAME_Type frameType = {0};
1040 testInfo.state = TRY_RECV_CLIENT_HELLO;1040 testInfo.state = TRY_RECV_CLIENT_HELLO;
1041- testInfo.isSupportExtendMasterSecret = true;1041+ testInfo.isSupportExtendedMasterSecret = true;
1042 testInfo.isClient = false;1042 testInfo.isClient = false;
1043 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1043 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1044 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1044 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1104,7 +1104,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_CIPHER_TC002(void)
1104 FRAME_Msg frameMsg = {0};1104 FRAME_Msg frameMsg = {0};
1105 FRAME_Type frameType = {0};1105 FRAME_Type frameType = {0};
1106 testInfo.state = TRY_RECV_SERVER_HELLO;1106 testInfo.state = TRY_RECV_SERVER_HELLO;
1107- testInfo.isSupportExtendMasterSecret = true;1107+ testInfo.isSupportExtendedMasterSecret = true;
1108 testInfo.isClient = true;1108 testInfo.isClient = true;
1109 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1109 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1110 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);1110 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -1172,7 +1172,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC001(void)
1172 FRAME_Type frameType = {0};1172 FRAME_Type frameType = {0};
1173 testInfo.state = TRY_RECV_CLIENT_HELLO;1173 testInfo.state = TRY_RECV_CLIENT_HELLO;
1174 testInfo.isClient = false;1174 testInfo.isClient = false;
1175- testInfo.isSupportExtendMasterSecret = true;1175+ testInfo.isSupportExtendedMasterSecret = true;
1176 testInfo.isSupportClientVerify = true;1176 testInfo.isSupportClientVerify = true;
1177 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1177 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1178 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1178 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1236,7 +1236,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC002(void)
1236 FRAME_Msg frameMsg = {0};1236 FRAME_Msg frameMsg = {0};
1237 FRAME_Type frameType = {0};1237 FRAME_Type frameType = {0};
1238 testInfo.state = TRY_RECV_SERVER_HELLO;1238 testInfo.state = TRY_RECV_SERVER_HELLO;
1239- testInfo.isSupportExtendMasterSecret = true;1239+ testInfo.isSupportExtendedMasterSecret = true;
1240 testInfo.isClient = true;1240 testInfo.isClient = true;
1241 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1241 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1242 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);1242 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -1307,7 +1307,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC003(int uioType)
1307 FRAME_Msg frameMsg = {0};1307 FRAME_Msg frameMsg = {0};
1308 FRAME_Type frameType = {0};1308 FRAME_Type frameType = {0};
1309 testInfo.state = TRY_RECV_CLIENT_HELLO;1309 testInfo.state = TRY_RECV_CLIENT_HELLO;
1310- testInfo.isSupportExtendMasterSecret = true;1310+ testInfo.isSupportExtendedMasterSecret = true;
1311 testInfo.isClient = false;1311 testInfo.isClient = false;
1312 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);1312 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
1313 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1313 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1374,7 +1374,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC004(void)
1374 FRAME_Msg frameMsg = {0};1374 FRAME_Msg frameMsg = {0};
1375 FRAME_Type frameType = {0};1375 FRAME_Type frameType = {0};
1376 testInfo.state = TRY_RECV_CLIENT_HELLO;1376 testInfo.state = TRY_RECV_CLIENT_HELLO;
1377- testInfo.isSupportExtendMasterSecret = true;1377+ testInfo.isSupportExtendedMasterSecret = true;
1378 testInfo.isClient = false;1378 testInfo.isClient = false;
1379 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1379 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1380 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1380 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1443,7 +1443,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC005(void)
1443 FRAME_Msg frameMsg = {0};1443 FRAME_Msg frameMsg = {0};
1444 FRAME_Type frameType = {0};1444 FRAME_Type frameType = {0};
1445 testInfo.state = TRY_RECV_SERVER_HELLO;1445 testInfo.state = TRY_RECV_SERVER_HELLO;
1446- testInfo.isSupportExtendMasterSecret = true;1446+ testInfo.isSupportExtendedMasterSecret = true;
1447 testInfo.isClient = true;1447 testInfo.isClient = true;
1448 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);1448 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
1449 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);1449 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -1514,7 +1514,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_SIGNATURE_TC007(int uioType)
1514 FRAME_Msg frameMsg = {0};1514 FRAME_Msg frameMsg = {0};
1515 FRAME_Type frameType = {0};1515 FRAME_Type frameType = {0};
1516 testInfo.state = TRY_RECV_CLIENT_HELLO;1516 testInfo.state = TRY_RECV_CLIENT_HELLO;
1517- testInfo.isSupportExtendMasterSecret = true;1517+ testInfo.isSupportExtendedMasterSecret = true;
1518 testInfo.isClient = false;1518 testInfo.isClient = false;
1519 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);1519 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
1520 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1520 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1578,7 +1578,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_CERTIFICATE_TC003(int uioType)
1578 FRAME_Type frameType = {0};1578 FRAME_Type frameType = {0};
1579 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;1579 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
1580 testInfo.isClient = false;1580 testInfo.isClient = false;
1581- testInfo.isSupportExtendMasterSecret = true;1581+ testInfo.isSupportExtendedMasterSecret = true;
1582 testInfo.isSupportClientVerify = false;1582 testInfo.isSupportClientVerify = false;
1583 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);1583 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
1584 frameType.versionType = HITLS_VERSION_DTLS12;1584 frameType.versionType = HITLS_VERSION_DTLS12;
@@ -1636,7 +1636,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_VERSION_TC001(int uioType)
1636 FRAME_Msg frameMsg = {0};1636 FRAME_Msg frameMsg = {0};
1637 FRAME_Type frameType = {0};1637 FRAME_Type frameType = {0};
1638 testInfo.state = TRY_RECV_CLIENT_HELLO;1638 testInfo.state = TRY_RECV_CLIENT_HELLO;
1639- testInfo.isSupportExtendMasterSecret = true;1639+ testInfo.isSupportExtendedMasterSecret = true;
1640 testInfo.isClient = false;1640 testInfo.isClient = false;
1641 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);1641 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, uioType) == HITLS_SUCCESS);
1642 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);1642 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
@@ -1703,14 +1703,14 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC001(int uioType)
1703{1703{
1704 HandshakeTestInfo testInfo = {0};1704 HandshakeTestInfo testInfo = {0};
1705 testInfo.state = TLS_IDLE;1705 testInfo.state = TLS_IDLE;
1706- testInfo.isSupportExtendMasterSecret = true;1706+ testInfo.isSupportExtendedMasterSecret = true;
1707 testInfo.isClient = true;1707 testInfo.isClient = true;
1708 FRAME_Init();1708 FRAME_Init();
1709 testInfo.config = HITLS_CFG_NewDTLS12Config();1709 testInfo.config = HITLS_CFG_NewDTLS12Config();
1710 ASSERT_TRUE(testInfo.config != NULL);1710 ASSERT_TRUE(testInfo.config != NULL);
1711 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};1711 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};
1712 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));1712 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
1713- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;1713+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
1714 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;1714 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
1715 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;1715 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
1716 testInfo.client = FRAME_CreateLink(testInfo.config, uioType);1716 testInfo.client = FRAME_CreateLink(testInfo.config, uioType);
@@ -1763,7 +1763,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC002(int uioType)
1763{1763{
1764 HandshakeTestInfo testInfo = {0};1764 HandshakeTestInfo testInfo = {0};
1765 testInfo.state = TRY_SEND_CLIENT_HELLO;1765 testInfo.state = TRY_SEND_CLIENT_HELLO;
1766- testInfo.isSupportExtendMasterSecret = true;1766+ testInfo.isSupportExtendedMasterSecret = true;
1767 testInfo.isClient = true;1767 testInfo.isClient = true;
1768 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);1768 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);
1769 CONN_Deinit(testInfo.client->ssl);1769 CONN_Deinit(testInfo.client->ssl);
@@ -1806,7 +1806,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC003(int uioType)
1806 FRAME_Msg frameMsg = {0};1806 FRAME_Msg frameMsg = {0};
1807 FRAME_Type frameType = {0};1807 FRAME_Type frameType = {0};
1808 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;1808 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;
1809- testInfo.isSupportExtendMasterSecret = true;1809+ testInfo.isSupportExtendedMasterSecret = true;
1810 testInfo.isClient = false;1810 testInfo.isClient = false;
1811 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);1811 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);
1812 ASSERT_TRUE(testInfo.server->ssl != NULL);1812 ASSERT_TRUE(testInfo.server->ssl != NULL);
@@ -1856,7 +1856,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC004(int uioType)
1856{1856{
1857 HandshakeTestInfo testInfo = {0};1857 HandshakeTestInfo testInfo = {0};
1858 testInfo.state = TRY_SEND_FINISH;1858 testInfo.state = TRY_SEND_FINISH;
1859- testInfo.isSupportExtendMasterSecret = true;1859+ testInfo.isSupportExtendedMasterSecret = true;
1860 testInfo.isClient = true;1860 testInfo.isClient = true;
1861 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);1861 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);
1862 ASSERT_TRUE(testInfo.client->ssl != NULL);1862 ASSERT_TRUE(testInfo.client->ssl != NULL);
@@ -1896,7 +1896,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC005(int uioType)
1896{1896{
1897 HandshakeTestInfo testInfo = {0};1897 HandshakeTestInfo testInfo = {0};
1898 testInfo.state = TRY_SEND_FINISH;1898 testInfo.state = TRY_SEND_FINISH;
1899- testInfo.isSupportExtendMasterSecret = true;1899+ testInfo.isSupportExtendedMasterSecret = true;
1900 testInfo.isClient = false;1900 testInfo.isClient = false;
1901 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);1901 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);
1902 ASSERT_TRUE(testInfo.server->ssl != NULL);1902 ASSERT_TRUE(testInfo.server->ssl != NULL);
@@ -1942,7 +1942,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC006(int uioType)
1942{1942{
1943 HandshakeTestInfo testInfo = {0};1943 HandshakeTestInfo testInfo = {0};
1944 testInfo.state = HS_STATE_BUTT;1944 testInfo.state = HS_STATE_BUTT;
1945- testInfo.isSupportExtendMasterSecret = true;1945+ testInfo.isSupportExtendedMasterSecret = true;
1946 testInfo.isClient = true;1946 testInfo.isClient = true;
1947 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);1947 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo, uioType) == HITLS_SUCCESS);
1948 ASSERT_TRUE(SendHelloReqWithIndex(testInfo.server->ssl, 1) == HITLS_SUCCESS);1948 ASSERT_TRUE(SendHelloReqWithIndex(testInfo.server->ssl, 1) == HITLS_SUCCESS);
@@ -1989,7 +1989,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC007(int uioType)
1989 FRAME_Msg frameMsg = {0};1989 FRAME_Msg frameMsg = {0};
1990 FRAME_Type frameType = {0};1990 FRAME_Type frameType = {0};
1991 testInfo.state = TLS_IDLE;1991 testInfo.state = TLS_IDLE;
1992- testInfo.isSupportExtendMasterSecret = true;1992+ testInfo.isSupportExtendedMasterSecret = true;
1993 testInfo.isClient = false;1993 testInfo.isClient = false;
1994 HandshakeTestInfo testInfo1 = {0};1994 HandshakeTestInfo testInfo1 = {0};
1995 testInfo1.state = TLS_IDLE;1995 testInfo1.state = TLS_IDLE;
@@ -1998,7 +1998,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC5246_HELLO_REQUEST_TC007(int uioType)
1998 ASSERT_TRUE(testInfo.config != NULL);1998 ASSERT_TRUE(testInfo.config != NULL);
1999 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};1999 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};
2000 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));2000 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
2001- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;2001+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
2002 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;2002 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
2003 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;2003 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
2004 testInfo.client = FRAME_CreateLink(testInfo.config, uioType);2004 testInfo.client = FRAME_CreateLink(testInfo.config, uioType);
@@ -2698,7 +2698,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC8422_ECPOINT_TC001(void)
2698{2698{
2699 HandshakeTestInfo testInfo = {0};2699 HandshakeTestInfo testInfo = {0};
2700 testInfo.state = TRY_RECV_SERVER_HELLO;2700 testInfo.state = TRY_RECV_SERVER_HELLO;
2701- testInfo.isSupportExtendMasterSecret = true;2701+ testInfo.isSupportExtendedMasterSecret = true;
2702 testInfo.isClient = true;2702 testInfo.isClient = true;
2703 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);2703 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
2704 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);2704 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.client->io);
@@ -2769,7 +2769,7 @@ void UT_TLS_DTLS_CONSISTENCY_RFC8422_EXTENSION_MISS_TC001(void)
2769{2769{
2770 HandshakeTestInfo testInfo = {0};2770 HandshakeTestInfo testInfo = {0};
2771 testInfo.state = TRY_RECV_CLIENT_HELLO;2771 testInfo.state = TRY_RECV_CLIENT_HELLO;
2772- testInfo.isSupportExtendMasterSecret = true;2772+ testInfo.isSupportExtendedMasterSecret = true;
2773 testInfo.isClient = false;2773 testInfo.isClient = false;
2774 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);2774 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo, BSL_UIO_UDP) == HITLS_SUCCESS);
2775 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);2775 FrameUioUserData *ioUserData = BSL_UIO_GetUserData(testInfo.server->io);
Mtestcode/sdv/testcase/tls/consistency/tlcp/test_suite_sdv_frame_tlcp_consistency.base.c+4-4
@@ -85,10 +85,10 @@ typedef struct {
85 FRAME_LinkObj *server;85 FRAME_LinkObj *server;
86 HITLS_HandshakeState state;86 HITLS_HandshakeState state;
87 bool isClient;87 bool isClient;
88- bool isSupportExtendMasterSecret;88+ bool isSupportExtendedMasterSecret;
89 bool isSupportClientVerify;89 bool isSupportClientVerify;
90 bool isSupportNoClientCert;90 bool isSupportNoClientCert;
91- bool isServerExtendMasterSecret;91+ bool isServerExtendedMasterSecret;
92 bool isSupportRenegotiation; /* Renegotiation support flag */92 bool isSupportRenegotiation; /* Renegotiation support flag */
93 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received. */93 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received. */
94} HandshakeTestInfo;94} HandshakeTestInfo;
@@ -188,7 +188,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
188 return HITLS_INTERNAL_EXCEPTION;188 return HITLS_INTERNAL_EXCEPTION;
189 }189 }
190 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);190 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
191- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;191+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
192 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;192 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
193 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;193 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
194 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;194 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -209,7 +209,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
209 uint16_t cipherSuits[] = {HITLS_ECDHE_SM4_CBC_SM3};209 uint16_t cipherSuits[] = {HITLS_ECDHE_SM4_CBC_SM3};
210 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));210 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
211 211 
212- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;212+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
213 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;213 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
214 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;214 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
215 215 
Mtestcode/sdv/testcase/tls/consistency/tlcp/test_suite_sdv_frame_tlcp_consistency_1.c+11-11
@@ -707,7 +707,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC001(int version)
707 FRAME_LinkObj *server = NULL;707 FRAME_LinkObj *server = NULL;
708 config = HITLS_CFG_NewTLCPConfig();708 config = HITLS_CFG_NewTLCPConfig();
709 ASSERT_TRUE(config != NULL);709 ASSERT_TRUE(config != NULL);
710- config->isSupportExtendMasterSecret = true;710+ config->isSupportExtendedMasterSecret = true;
711 config->isSupportClientVerify = true;711 config->isSupportClientVerify = true;
712 config->isSupportNoClientCert = false;712 config->isSupportNoClientCert = false;
713 config->isSupportRenegotiation = true;713 config->isSupportRenegotiation = true;
@@ -780,7 +780,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC002(int version)
780 FRAME_LinkObj *server = NULL;780 FRAME_LinkObj *server = NULL;
781 config = HITLS_CFG_NewTLCPConfig();781 config = HITLS_CFG_NewTLCPConfig();
782 ASSERT_TRUE(config != NULL);782 ASSERT_TRUE(config != NULL);
783- config->isSupportExtendMasterSecret = true;783+ config->isSupportExtendedMasterSecret = true;
784 config->isSupportClientVerify = true;784 config->isSupportClientVerify = true;
785 config->isSupportNoClientCert = false;785 config->isSupportNoClientCert = false;
786 config->isSupportRenegotiation = true;786 config->isSupportRenegotiation = true;
@@ -853,7 +853,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC003(int version)
853 FRAME_LinkObj *server = NULL;853 FRAME_LinkObj *server = NULL;
854 config = HITLS_CFG_NewTLCPConfig();854 config = HITLS_CFG_NewTLCPConfig();
855 ASSERT_TRUE(config != NULL);855 ASSERT_TRUE(config != NULL);
856- config->isSupportExtendMasterSecret = true;856+ config->isSupportExtendedMasterSecret = true;
857 config->isSupportClientVerify = true;857 config->isSupportClientVerify = true;
858 config->isSupportNoClientCert = false;858 config->isSupportNoClientCert = false;
859 config->isSupportRenegotiation = true;859 config->isSupportRenegotiation = true;
@@ -1129,7 +1129,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC007(int version)
1129 FRAME_LinkObj *server = NULL;1129 FRAME_LinkObj *server = NULL;
1130 config = HITLS_CFG_NewTLCPConfig();1130 config = HITLS_CFG_NewTLCPConfig();
1131 ASSERT_TRUE(config != NULL);1131 ASSERT_TRUE(config != NULL);
1132- config->isSupportExtendMasterSecret = true;1132+ config->isSupportExtendedMasterSecret = true;
1133 config->isSupportClientVerify = true;1133 config->isSupportClientVerify = true;
1134 config->isSupportNoClientCert = false;1134 config->isSupportNoClientCert = false;
1135 config->isSupportRenegotiation = true;1135 config->isSupportRenegotiation = true;
@@ -1209,7 +1209,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC008(int version)
1209 FRAME_LinkObj *server = NULL;1209 FRAME_LinkObj *server = NULL;
1210 config = HITLS_CFG_NewTLCPConfig();1210 config = HITLS_CFG_NewTLCPConfig();
1211 ASSERT_TRUE(config != NULL);1211 ASSERT_TRUE(config != NULL);
1212- config->isSupportExtendMasterSecret = true;1212+ config->isSupportExtendedMasterSecret = true;
1213 config->isSupportClientVerify = true;1213 config->isSupportClientVerify = true;
1214 config->isSupportNoClientCert = false;1214 config->isSupportNoClientCert = false;
1215 config->isSupportRenegotiation = true;1215 config->isSupportRenegotiation = true;
@@ -1289,7 +1289,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC009(int version)
1289 FRAME_LinkObj *server = NULL;1289 FRAME_LinkObj *server = NULL;
1290 config = HITLS_CFG_NewTLCPConfig();1290 config = HITLS_CFG_NewTLCPConfig();
1291 ASSERT_TRUE(config != NULL);1291 ASSERT_TRUE(config != NULL);
1292- config->isSupportExtendMasterSecret = true;1292+ config->isSupportExtendedMasterSecret = true;
1293 config->isSupportClientVerify = true;1293 config->isSupportClientVerify = true;
1294 config->isSupportNoClientCert = false;1294 config->isSupportNoClientCert = false;
1295 config->isSupportRenegotiation = true;1295 config->isSupportRenegotiation = true;
@@ -1370,7 +1370,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC010(int version)
1370 FRAME_LinkObj *server = NULL;1370 FRAME_LinkObj *server = NULL;
1371 config = HITLS_CFG_NewTLCPConfig();1371 config = HITLS_CFG_NewTLCPConfig();
1372 ASSERT_TRUE(config != NULL);1372 ASSERT_TRUE(config != NULL);
1373- config->isSupportExtendMasterSecret = true;1373+ config->isSupportExtendedMasterSecret = true;
1374 config->isSupportClientVerify = true;1374 config->isSupportClientVerify = true;
1375 config->isSupportNoClientCert = false;1375 config->isSupportNoClientCert = false;
1376 config->isSupportRenegotiation = true;1376 config->isSupportRenegotiation = true;
@@ -1449,7 +1449,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC011(int version)
1449 FRAME_LinkObj *server = NULL;1449 FRAME_LinkObj *server = NULL;
1450 config = HITLS_CFG_NewTLCPConfig();1450 config = HITLS_CFG_NewTLCPConfig();
1451 ASSERT_TRUE(config != NULL);1451 ASSERT_TRUE(config != NULL);
1452- config->isSupportExtendMasterSecret = true;1452+ config->isSupportExtendedMasterSecret = true;
1453 config->isSupportClientVerify = true;1453 config->isSupportClientVerify = true;
1454 config->isSupportNoClientCert = false;1454 config->isSupportNoClientCert = false;
1455 config->isSupportRenegotiation = true;1455 config->isSupportRenegotiation = true;
@@ -1526,7 +1526,7 @@ void UT_TLS_TLCP_CONSISTENCY_UNEXPECT_HANDSHAKEMSG_TC012(int version)
1526 FRAME_LinkObj *server = NULL;1526 FRAME_LinkObj *server = NULL;
1527 config = HITLS_CFG_NewTLCPConfig();1527 config = HITLS_CFG_NewTLCPConfig();
1528 ASSERT_TRUE(config != NULL);1528 ASSERT_TRUE(config != NULL);
1529- config->isSupportExtendMasterSecret = true;1529+ config->isSupportExtendedMasterSecret = true;
1530 config->isSupportClientVerify = true;1530 config->isSupportClientVerify = true;
1531 config->isSupportNoClientCert = true;1531 config->isSupportNoClientCert = true;
1532 config->isSupportRenegotiation = true;1532 config->isSupportRenegotiation = true;
@@ -2010,7 +2010,7 @@ EXIT:
2010void UT_TLS_TLCP_CONSISTENCY_SEQ_NUM_TC001(int isClient)2010void UT_TLS_TLCP_CONSISTENCY_SEQ_NUM_TC001(int isClient)
2011{2011{
2012 HandshakeTestInfo testInfo = { 0 };2012 HandshakeTestInfo testInfo = { 0 };
2013- testInfo.isSupportExtendMasterSecret = true;2013+ testInfo.isSupportExtendedMasterSecret = true;
2014 testInfo.state = TRY_SEND_FINISH;2014 testInfo.state = TRY_SEND_FINISH;
2015 testInfo.isClient = isClient;2015 testInfo.isClient = isClient;
2016 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);2016 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -2074,7 +2074,7 @@ EXIT:
2074void UT_TLS_TLCP_CONSISTENCY_SEQ_NUM_TC002(int isClient)2074void UT_TLS_TLCP_CONSISTENCY_SEQ_NUM_TC002(int isClient)
2075{2075{
2076 HandshakeTestInfo testInfo = { 0 };2076 HandshakeTestInfo testInfo = { 0 };
2077- testInfo.isSupportExtendMasterSecret = true;2077+ testInfo.isSupportExtendedMasterSecret = true;
2078 testInfo.state = HS_STATE_BUTT;2078 testInfo.state = HS_STATE_BUTT;
2079 testInfo.isClient = isClient;2079 testInfo.isClient = isClient;
2080 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);2080 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
Mtestcode/sdv/testcase/tls/consistency/tlcp/test_suite_sdv_hlt_tlcp_consistency.c+2-2
@@ -58,10 +58,10 @@ typedef struct {
58 FRAME_LinkObj *server;58 FRAME_LinkObj *server;
59 HITLS_HandshakeState state;59 HITLS_HandshakeState state;
60 bool isClient;60 bool isClient;
61- bool isSupportExtendMasterSecret;61+ bool isSupportExtendedMasterSecret;
62 bool isSupportClientVerify;62 bool isSupportClientVerify;
63 bool isSupportNoClientCert;63 bool isSupportNoClientCert;
64- bool isServerExtendMasterSecret;64+ bool isServerExtendedMasterSecret;
65 bool isSupportRenegotiation; /* Renegotiation support flag */65 bool isSupportRenegotiation; /* Renegotiation support flag */
66 bool needStopBeforeRecvCCS; /* For CCS test, stop at TRY_RECV_FINISH stage before CCS message is received. */66 bool needStopBeforeRecvCCS; /* For CCS test, stop at TRY_RECV_FINISH stage before CCS message is received. */
67} HandshakeTestInfo;67} HandshakeTestInfo;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246.c+49-49
@@ -62,7 +62,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC001(void)
62 FRAME_Msg frameMsg = { 0 };62 FRAME_Msg frameMsg = { 0 };
63 FRAME_Type frameType = { 0 };63 FRAME_Type frameType = { 0 };
64 testInfo.state = TRY_RECV_CLIENT_HELLO;64 testInfo.state = TRY_RECV_CLIENT_HELLO;
65- testInfo.isSupportExtendMasterSecret = true;65+ testInfo.isSupportExtendedMasterSecret = true;
66 testInfo.isClient = false;66 testInfo.isClient = false;
67 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);67 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
68 68 
@@ -144,7 +144,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC002(void)
144 FRAME_Msg frameMsg = { 0 };144 FRAME_Msg frameMsg = { 0 };
145 FRAME_Type frameType = { 0 };145 FRAME_Type frameType = { 0 };
146 testInfo.state = TRY_RECV_SERVER_HELLO;146 testInfo.state = TRY_RECV_SERVER_HELLO;
147- testInfo.isSupportExtendMasterSecret = true;147+ testInfo.isSupportExtendedMasterSecret = true;
148 testInfo.isClient = true;148 testInfo.isClient = true;
149 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);149 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
150 150 
@@ -224,7 +224,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC003(void)
224 FRAME_Msg frameMsg = { 0 };224 FRAME_Msg frameMsg = { 0 };
225 FRAME_Type frameType = { 0 };225 FRAME_Type frameType = { 0 };
226 testInfo.state = TRY_RECV_CERTIFICATE;226 testInfo.state = TRY_RECV_CERTIFICATE;
227- testInfo.isSupportExtendMasterSecret = true;227+ testInfo.isSupportExtendedMasterSecret = true;
228 testInfo.isClient = true;228 testInfo.isClient = true;
229 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);229 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
230 230 
@@ -297,7 +297,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC004(void)
297 FRAME_Msg frameMsg = { 0 };297 FRAME_Msg frameMsg = { 0 };
298 FRAME_Type frameType = { 0 };298 FRAME_Type frameType = { 0 };
299 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;299 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;
300- testInfo.isSupportExtendMasterSecret = true;300+ testInfo.isSupportExtendedMasterSecret = true;
301 testInfo.isClient = true;301 testInfo.isClient = true;
302 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);302 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
303 303 
@@ -374,7 +374,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC005(void)
374 FRAME_Msg frameMsg = { 0 };374 FRAME_Msg frameMsg = { 0 };
375 FRAME_Type frameType = { 0 };375 FRAME_Type frameType = { 0 };
376 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;376 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
377- testInfo.isSupportExtendMasterSecret = true;377+ testInfo.isSupportExtendedMasterSecret = true;
378 testInfo.isClient = false;378 testInfo.isClient = false;
379 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);379 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
380 380 
@@ -445,7 +445,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC006(void)
445 // Use the default configuration items to configure the client and server.445 // Use the default configuration items to configure the client and server.
446 HandshakeTestInfo testInfo = { 0 };446 HandshakeTestInfo testInfo = { 0 };
447 testInfo.state = TRY_RECV_CERTIFICATE_VERIFY;447 testInfo.state = TRY_RECV_CERTIFICATE_VERIFY;
448- testInfo.isSupportExtendMasterSecret = true;448+ testInfo.isSupportExtendedMasterSecret = true;
449 testInfo.isSupportClientVerify = true;449 testInfo.isSupportClientVerify = true;
450 testInfo.isSupportNoClientCert = false;450 testInfo.isSupportNoClientCert = false;
451 testInfo.isClient = false;451 testInfo.isClient = false;
@@ -504,7 +504,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC007(void)
504 // Use the default configuration items to configure the client and server.504 // Use the default configuration items to configure the client and server.
505 HandshakeTestInfo testInfo = { 0 };505 HandshakeTestInfo testInfo = { 0 };
506 testInfo.state = TRY_RECV_NEW_SESSION_TICKET;506 testInfo.state = TRY_RECV_NEW_SESSION_TICKET;
507- testInfo.isSupportExtendMasterSecret = true;507+ testInfo.isSupportExtendedMasterSecret = true;
508 testInfo.isSupportClientVerify = true;508 testInfo.isSupportClientVerify = true;
509 testInfo.isSupportNoClientCert = false;509 testInfo.isSupportNoClientCert = false;
510 testInfo.isClient = true;510 testInfo.isClient = true;
@@ -568,7 +568,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECV_ZEROLENGTH_MSG_TC008(void)
568 FRAME_Msg frameMsg = { 0 };568 FRAME_Msg frameMsg = { 0 };
569 FRAME_Type frameType = { 0 };569 FRAME_Type frameType = { 0 };
570 testInfo.state = TRY_RECV_SERVER_HELLO_DONE;570 testInfo.state = TRY_RECV_SERVER_HELLO_DONE;
571- testInfo.isSupportExtendMasterSecret = true;571+ testInfo.isSupportExtendedMasterSecret = true;
572 testInfo.isSupportClientVerify = true;572 testInfo.isSupportClientVerify = true;
573 testInfo.isSupportNoClientCert = false;573 testInfo.isSupportNoClientCert = false;
574 testInfo.isClient = true;574 testInfo.isClient = true;
@@ -642,7 +642,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC001(void)
642 HandshakeTestInfo testInfo = { 0 };642 HandshakeTestInfo testInfo = { 0 };
643 testInfo.state = TRY_RECV_SERVER_HELLO;643 testInfo.state = TRY_RECV_SERVER_HELLO;
644 testInfo.isClient = true;644 testInfo.isClient = true;
645- testInfo.isSupportExtendMasterSecret = true;645+ testInfo.isSupportExtendedMasterSecret = true;
646 testInfo.isSupportClientVerify = true;646 testInfo.isSupportClientVerify = true;
647 testInfo.isSupportNoClientCert = false;647 testInfo.isSupportNoClientCert = false;
648 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);648 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -706,7 +706,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC002(void)
706 HandshakeTestInfo testInfo = { 0 };706 HandshakeTestInfo testInfo = { 0 };
707 testInfo.state = TRY_RECV_CERTIFICATE;707 testInfo.state = TRY_RECV_CERTIFICATE;
708 testInfo.isClient = true;708 testInfo.isClient = true;
709- testInfo.isSupportExtendMasterSecret = true;709+ testInfo.isSupportExtendedMasterSecret = true;
710 testInfo.isSupportClientVerify = true;710 testInfo.isSupportClientVerify = true;
711 testInfo.isSupportNoClientCert = false;711 testInfo.isSupportNoClientCert = false;
712 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);712 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -775,7 +775,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC003(void)
775 HandshakeTestInfo testInfo = { 0 };775 HandshakeTestInfo testInfo = { 0 };
776 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;776 testInfo.state = TRY_RECV_SERVER_KEY_EXCHANGE;
777 testInfo.isClient = true;777 testInfo.isClient = true;
778- testInfo.isSupportExtendMasterSecret = true;778+ testInfo.isSupportExtendedMasterSecret = true;
779 testInfo.isSupportClientVerify = true;779 testInfo.isSupportClientVerify = true;
780 testInfo.isSupportNoClientCert = false;780 testInfo.isSupportNoClientCert = false;
781 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);781 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -844,7 +844,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC004(void)
844 HandshakeTestInfo testInfo = { 0 };844 HandshakeTestInfo testInfo = { 0 };
845 testInfo.state = TRY_RECV_SERVER_HELLO_DONE;845 testInfo.state = TRY_RECV_SERVER_HELLO_DONE;
846 testInfo.isClient = true;846 testInfo.isClient = true;
847- testInfo.isSupportExtendMasterSecret = true;847+ testInfo.isSupportExtendedMasterSecret = true;
848 testInfo.isSupportClientVerify = true;848 testInfo.isSupportClientVerify = true;
849 testInfo.isSupportNoClientCert = false;849 testInfo.isSupportNoClientCert = false;
850 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);850 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -958,7 +958,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC006(void)
958 HandshakeTestInfo testInfo = { 0 };958 HandshakeTestInfo testInfo = { 0 };
959 testInfo.state = TRY_RECV_CERTIFICATE_REQUEST;959 testInfo.state = TRY_RECV_CERTIFICATE_REQUEST;
960 testInfo.isClient = true;960 testInfo.isClient = true;
961- testInfo.isSupportExtendMasterSecret = true;961+ testInfo.isSupportExtendedMasterSecret = true;
962 testInfo.isSupportClientVerify = true;962 testInfo.isSupportClientVerify = true;
963 testInfo.isSupportNoClientCert = false;963 testInfo.isSupportNoClientCert = false;
964 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);964 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -1027,7 +1027,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC007(void)
1027 FRAME_Msg frameMsg = { 0 };1027 FRAME_Msg frameMsg = { 0 };
1028 FRAME_Type frameType = { 0 };1028 FRAME_Type frameType = { 0 };
1029 testInfo.state = TRY_RECV_SERVER_HELLO;1029 testInfo.state = TRY_RECV_SERVER_HELLO;
1030- testInfo.isSupportExtendMasterSecret = true;1030+ testInfo.isSupportExtendedMasterSecret = true;
1031 testInfo.isClient = true;1031 testInfo.isClient = true;
1032 testInfo.isSupportClientVerify = true;1032 testInfo.isSupportClientVerify = true;
1033 testInfo.isSupportNoClientCert = false;1033 testInfo.isSupportNoClientCert = false;
@@ -1100,7 +1100,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC008(void)
1100 FRAME_Msg frameMsg = { 0 };1100 FRAME_Msg frameMsg = { 0 };
1101 FRAME_Type frameType = { 0 };1101 FRAME_Type frameType = { 0 };
1102 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;1102 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
1103- testInfo.isSupportExtendMasterSecret = true;1103+ testInfo.isSupportExtendedMasterSecret = true;
1104 testInfo.isClient = false;1104 testInfo.isClient = false;
1105 testInfo.isSupportClientVerify = true;1105 testInfo.isSupportClientVerify = true;
1106 testInfo.isSupportNoClientCert = false;1106 testInfo.isSupportNoClientCert = false;
@@ -1174,7 +1174,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC009(void)
1174 FRAME_Msg frameMsg = { 0 };1174 FRAME_Msg frameMsg = { 0 };
1175 FRAME_Type frameType = { 0 };1175 FRAME_Type frameType = { 0 };
1176 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;1176 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
1177- testInfo.isSupportExtendMasterSecret = true;1177+ testInfo.isSupportExtendedMasterSecret = true;
1178 testInfo.isClient = false;1178 testInfo.isClient = false;
1179 testInfo.isSupportClientVerify = true;1179 testInfo.isSupportClientVerify = true;
1180 testInfo.isSupportNoClientCert = false;1180 testInfo.isSupportNoClientCert = false;
@@ -1248,7 +1248,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC010(void)
1248 FRAME_Msg frameMsg = { 0 };1248 FRAME_Msg frameMsg = { 0 };
1249 FRAME_Type frameType = { 0 };1249 FRAME_Type frameType = { 0 };
1250 testInfo.state = TRY_RECV_CERTIFICATE;1250 testInfo.state = TRY_RECV_CERTIFICATE;
1251- testInfo.isSupportExtendMasterSecret = true;1251+ testInfo.isSupportExtendedMasterSecret = true;
1252 testInfo.isClient = false;1252 testInfo.isClient = false;
1253 testInfo.isSupportClientVerify = true;1253 testInfo.isSupportClientVerify = true;
1254 testInfo.isSupportNoClientCert = false;1254 testInfo.isSupportNoClientCert = false;
@@ -1323,7 +1323,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC011(void)
1323 FRAME_Msg frameMsg = { 0 };1323 FRAME_Msg frameMsg = { 0 };
1324 FRAME_Type frameType = { 0 };1324 FRAME_Type frameType = { 0 };
1325 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;1325 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
1326- testInfo.isSupportExtendMasterSecret = true;1326+ testInfo.isSupportExtendedMasterSecret = true;
1327 testInfo.isClient = false;1327 testInfo.isClient = false;
1328 testInfo.isSupportClientVerify = true;1328 testInfo.isSupportClientVerify = true;
1329 testInfo.isSupportNoClientCert = false;1329 testInfo.isSupportNoClientCert = false;
@@ -1396,7 +1396,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_UNEXPECTMSG_TC012(void)
1396 FRAME_Msg frameMsg = { 0 };1396 FRAME_Msg frameMsg = { 0 };
1397 FRAME_Type frameType = { 0 };1397 FRAME_Type frameType = { 0 };
1398 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;1398 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
1399- testInfo.isSupportExtendMasterSecret = true;1399+ testInfo.isSupportExtendedMasterSecret = true;
1400 testInfo.isClient = false;1400 testInfo.isClient = false;
1401 testInfo.isSupportClientVerify = true;1401 testInfo.isSupportClientVerify = true;
1402 testInfo.isSupportNoClientCert = false;1402 testInfo.isSupportNoClientCert = false;
@@ -1848,7 +1848,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_SEQ_NUM_TC001(int isClient)
1848{1848{
1849 /* Configure the client/server to stay in the TRY_SEND_FINISH state. */1849 /* Configure the client/server to stay in the TRY_SEND_FINISH state. */
1850 HandshakeTestInfo testInfo = { 0 };1850 HandshakeTestInfo testInfo = { 0 };
1851- testInfo.isSupportExtendMasterSecret = true;1851+ testInfo.isSupportExtendedMasterSecret = true;
1852 testInfo.state = TRY_SEND_FINISH;1852 testInfo.state = TRY_SEND_FINISH;
1853 testInfo.isClient = isClient;1853 testInfo.isClient = isClient;
1854 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);1854 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -1951,7 +1951,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_SEQ_NUM_TC002(int isClient)
1951{1951{
1952 /* Configure the client/server to the status that the handshake is successful. */1952 /* Configure the client/server to the status that the handshake is successful. */
1953 HandshakeTestInfo testInfo = { 0 };1953 HandshakeTestInfo testInfo = { 0 };
1954- testInfo.isSupportExtendMasterSecret = true;1954+ testInfo.isSupportExtendedMasterSecret = true;
1955 testInfo.state = HS_STATE_BUTT;1955 testInfo.state = HS_STATE_BUTT;
1956 testInfo.isClient = isClient;1956 testInfo.isClient = isClient;
1957 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);1957 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -2050,7 +2050,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_UNEXPECT_RECODETYPE_TC001(void)
2050 HandshakeTestInfo testInfo = { 0 };2050 HandshakeTestInfo testInfo = { 0 };
2051 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;2051 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
2052 testInfo.isClient = false;2052 testInfo.isClient = false;
2053- testInfo.isSupportExtendMasterSecret = true;2053+ testInfo.isSupportExtendedMasterSecret = true;
2054 testInfo.isSupportClientVerify = false;2054 testInfo.isSupportClientVerify = false;
2055 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);2055 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
2056 2056 
@@ -2117,7 +2117,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_UNEXPECT_RECODETYPE_TC002(void)
2117 HandshakeTestInfo testInfo = { 0 };2117 HandshakeTestInfo testInfo = { 0 };
2118 testInfo.state = TRY_RECV_SERVER_HELLO;2118 testInfo.state = TRY_RECV_SERVER_HELLO;
2119 testInfo.isClient = true;2119 testInfo.isClient = true;
2120- testInfo.isSupportExtendMasterSecret = true;2120+ testInfo.isSupportExtendedMasterSecret = true;
2121 testInfo.isSupportClientVerify = false;2121 testInfo.isSupportClientVerify = false;
2122 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);2122 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
2123 2123 
@@ -2184,7 +2184,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_UNEXPECT_RECODETYPE_TC003(void)
2184 HandshakeTestInfo testInfo = { 0 };2184 HandshakeTestInfo testInfo = { 0 };
2185 testInfo.state = TRY_SEND_CHANGE_CIPHER_SPEC;2185 testInfo.state = TRY_SEND_CHANGE_CIPHER_SPEC;
2186 testInfo.isClient = true;2186 testInfo.isClient = true;
2187- testInfo.isSupportExtendMasterSecret = true;2187+ testInfo.isSupportExtendedMasterSecret = true;
2188 testInfo.isSupportClientVerify = false;2188 testInfo.isSupportClientVerify = false;
2189 testInfo.isSupportNoClientCert = false;2189 testInfo.isSupportNoClientCert = false;
2190 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);2190 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
@@ -2570,7 +2570,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC001(void)
2570{2570{
2571 HandshakeTestInfo testInfo = { 0 };2571 HandshakeTestInfo testInfo = { 0 };
2572 testInfo.state = TLS_IDLE;2572 testInfo.state = TLS_IDLE;
2573- testInfo.isSupportExtendMasterSecret = true;2573+ testInfo.isSupportExtendedMasterSecret = true;
2574 testInfo.isClient = true;2574 testInfo.isClient = true;
2575 2575 
2576 FRAME_Init();2576 FRAME_Init();
@@ -2582,7 +2582,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC001(void)
2582 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};2582 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384};
2583 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));2583 HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
2584 2584 
2585- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;2585+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
2586 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;2586 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
2587 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;2587 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
2588 2588 
@@ -2628,7 +2628,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC002(void)
2628 /* Use the configuration items to configure the client and server. */2628 /* Use the configuration items to configure the client and server. */
2629 HandshakeTestInfo testInfo = { 0 };2629 HandshakeTestInfo testInfo = { 0 };
2630 testInfo.state = TRY_SEND_CLIENT_HELLO;2630 testInfo.state = TRY_SEND_CLIENT_HELLO;
2631- testInfo.isSupportExtendMasterSecret = true;2631+ testInfo.isSupportExtendedMasterSecret = true;
2632 testInfo.isClient = true;2632 testInfo.isClient = true;
2633 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);2633 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
2634 2634 
@@ -2678,7 +2678,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC003(void)
2678 /* Use configuration items to configure the client and server. */2678 /* Use configuration items to configure the client and server. */
2679 HandshakeTestInfo testInfo = { 0 };2679 HandshakeTestInfo testInfo = { 0 };
2680 testInfo.state = TRY_SEND_FINISH;2680 testInfo.state = TRY_SEND_FINISH;
2681- testInfo.isSupportExtendMasterSecret = true;2681+ testInfo.isSupportExtendedMasterSecret = true;
2682 testInfo.isClient = true;2682 testInfo.isClient = true;
2683 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);2683 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
2684 2684 
@@ -2932,7 +2932,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC007(void)
2932 HandshakeTestInfo testInfo = { 0 };2932 HandshakeTestInfo testInfo = { 0 };
2933 FRAME_Msg parsedAlert = { 0 };2933 FRAME_Msg parsedAlert = { 0 };
2934 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;2934 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;
2935- testInfo.isSupportExtendMasterSecret = true;2935+ testInfo.isSupportExtendedMasterSecret = true;
2936 testInfo.isClient = false;2936 testInfo.isClient = false;
2937 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);2937 ASSERT_TRUE(DefaultCfgStatusParkWithSuite(&testInfo) == HITLS_SUCCESS);
2938 2938 
@@ -2988,7 +2988,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC008(void)
2988{2988{
2989 HandshakeTestInfo testInfo = { 0 };2989 HandshakeTestInfo testInfo = { 0 };
2990 testInfo.state = TRY_RECV_FINISH;2990 testInfo.state = TRY_RECV_FINISH;
2991- testInfo.isSupportExtendMasterSecret = true;2991+ testInfo.isSupportExtendedMasterSecret = true;
2992 testInfo.isClient = true;2992 testInfo.isClient = true;
2993 2993 
2994 FRAME_Init();2994 FRAME_Init();
@@ -2997,7 +2997,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HELLO_REQUEST_TC008(void)
2997 testInfo.config = HITLS_CFG_NewTLS12Config();2997 testInfo.config = HITLS_CFG_NewTLS12Config();
2998 ASSERT_TRUE(testInfo.config != NULL);2998 ASSERT_TRUE(testInfo.config != NULL);
2999 2999 
3000- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3000+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3001 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3001 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3002 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3002 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3003 testInfo.config->isSupportRenegotiation = true;3003 testInfo.config->isSupportRenegotiation = true;
@@ -3061,7 +3061,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_VERSION_TC001(void)
3061 FRAME_Msg frameMsg = { 0 };3061 FRAME_Msg frameMsg = { 0 };
3062 FRAME_Type frameType = { 0 };3062 FRAME_Type frameType = { 0 };
3063 testInfo.state = TRY_RECV_CLIENT_HELLO;3063 testInfo.state = TRY_RECV_CLIENT_HELLO;
3064- testInfo.isSupportExtendMasterSecret = true;3064+ testInfo.isSupportExtendedMasterSecret = true;
3065 testInfo.isClient = false;3065 testInfo.isClient = false;
3066 testInfo.isSupportClientVerify = true;3066 testInfo.isSupportClientVerify = true;
3067 testInfo.isSupportNoClientCert = false;3067 testInfo.isSupportNoClientCert = false;
@@ -3073,7 +3073,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_VERSION_TC001(void)
3073 testInfo.config = HITLS_CFG_NewTLS12Config();3073 testInfo.config = HITLS_CFG_NewTLS12Config();
3074 ASSERT_TRUE(testInfo.config != NULL);3074 ASSERT_TRUE(testInfo.config != NULL);
3075 3075 
3076- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3076+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3077 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3077 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3078 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3078 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3079 3079 
@@ -3131,7 +3131,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_NOT_SUPPORT_SERVER_VERSION_TC001(void)
3131 FRAME_Msg frameMsg = { 0 };3131 FRAME_Msg frameMsg = { 0 };
3132 FRAME_Type frameType = { 0 };3132 FRAME_Type frameType = { 0 };
3133 testInfo.state = TRY_RECV_SERVER_HELLO;3133 testInfo.state = TRY_RECV_SERVER_HELLO;
3134- testInfo.isSupportExtendMasterSecret = true;3134+ testInfo.isSupportExtendedMasterSecret = true;
3135 testInfo.isClient = true;3135 testInfo.isClient = true;
3136 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);3136 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
3137 3137 
@@ -3207,7 +3207,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_SERVER_CHOSE_VERSION_TC001(void)
3207 FRAME_Msg frameMsg = { 0 };3207 FRAME_Msg frameMsg = { 0 };
3208 FRAME_Type frameType = { 0 };3208 FRAME_Type frameType = { 0 };
3209 testInfo.state = TRY_RECV_SERVER_HELLO;3209 testInfo.state = TRY_RECV_SERVER_HELLO;
3210- testInfo.isSupportExtendMasterSecret = true;3210+ testInfo.isSupportExtendedMasterSecret = true;
3211 testInfo.isClient = true;3211 testInfo.isClient = true;
3212 testInfo.isSupportClientVerify = true;3212 testInfo.isSupportClientVerify = true;
3213 testInfo.isSupportNoClientCert = false;3213 testInfo.isSupportNoClientCert = false;
@@ -3217,7 +3217,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_SERVER_CHOSE_VERSION_TC001(void)
3217 testInfo.config = HITLS_CFG_NewTLSConfig();3217 testInfo.config = HITLS_CFG_NewTLSConfig();
3218 ASSERT_TRUE(testInfo.config != NULL);3218 ASSERT_TRUE(testInfo.config != NULL);
3219 3219 
3220- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3220+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3221 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3221 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3222 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3222 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3223 3223 
@@ -3276,7 +3276,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_DEFAULT_SIGNATURE_EXTENSION_TC001(void)
3276 FRAME_Msg frameMsg = { 0 };3276 FRAME_Msg frameMsg = { 0 };
3277 FRAME_Type frameType = { 0 };3277 FRAME_Type frameType = { 0 };
3278 testInfo.state = TRY_RECV_CLIENT_HELLO;3278 testInfo.state = TRY_RECV_CLIENT_HELLO;
3279- testInfo.isSupportExtendMasterSecret = true;3279+ testInfo.isSupportExtendedMasterSecret = true;
3280 testInfo.isClient = false;3280 testInfo.isClient = false;
3281 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);3281 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
3282 3282 
@@ -3329,7 +3329,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_WITHOUT_SIGNATURE_TC001(void)
3329 FRAME_Msg frameMsg = { 0 };3329 FRAME_Msg frameMsg = { 0 };
3330 FRAME_Type frameType = { 0 };3330 FRAME_Type frameType = { 0 };
3331 testInfo.state = TRY_RECV_CLIENT_HELLO;3331 testInfo.state = TRY_RECV_CLIENT_HELLO;
3332- testInfo.isSupportExtendMasterSecret = true;3332+ testInfo.isSupportExtendedMasterSecret = true;
3333 testInfo.isClient = false;3333 testInfo.isClient = false;
3334 3334 
3335 FRAME_Init();3335 FRAME_Init();
@@ -3341,7 +3341,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_WITHOUT_SIGNATURE_TC001(void)
3341 ASSERT_EQ(HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuite, sizeof(cipherSuite) / sizeof(uint16_t)),3341 ASSERT_EQ(HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuite, sizeof(cipherSuite) / sizeof(uint16_t)),
3342 HITLS_SUCCESS);3342 HITLS_SUCCESS);
3343 3343 
3344- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3344+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3345 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3345 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3346 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3346 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3347 3347 
@@ -3424,7 +3424,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_WITHOUT_SIGNATURE_TC002(void)
3424 FRAME_Msg frameMsg = { 0 };3424 FRAME_Msg frameMsg = { 0 };
3425 FRAME_Type frameType = { 0 };3425 FRAME_Type frameType = { 0 };
3426 testInfo.state = TRY_RECV_CLIENT_HELLO;3426 testInfo.state = TRY_RECV_CLIENT_HELLO;
3427- testInfo.isSupportExtendMasterSecret = true;3427+ testInfo.isSupportExtendedMasterSecret = true;
3428 testInfo.isClient = false;3428 testInfo.isClient = false;
3429 3429 
3430 FRAME_Init();3430 FRAME_Init();
@@ -3436,7 +3436,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CLIENT_HELLO_WITHOUT_SIGNATURE_TC002(void)
3436 ASSERT_EQ(HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuite, sizeof(cipherSuite) / sizeof(uint16_t)),3436 ASSERT_EQ(HITLS_CFG_SetCipherSuites(testInfo.config, cipherSuite, sizeof(cipherSuite) / sizeof(uint16_t)),
3437 HITLS_SUCCESS);3437 HITLS_SUCCESS);
3438 3438 
3439- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3439+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3440 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3440 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3441 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3441 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3442 3442 
@@ -3514,7 +3514,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC001(void)
3514 FRAME_Msg frameMsg = { 0 };3514 FRAME_Msg frameMsg = { 0 };
3515 FRAME_Type frameType = { 0 };3515 FRAME_Type frameType = { 0 };
3516 testInfo.state = TRY_RECV_CLIENT_HELLO;3516 testInfo.state = TRY_RECV_CLIENT_HELLO;
3517- testInfo.isSupportExtendMasterSecret = true;3517+ testInfo.isSupportExtendedMasterSecret = true;
3518 testInfo.isClient = false;3518 testInfo.isClient = false;
3519 testInfo.isSupportClientVerify = true;3519 testInfo.isSupportClientVerify = true;
3520 testInfo.isSupportNoClientCert = false;3520 testInfo.isSupportNoClientCert = false;
@@ -3527,7 +3527,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC001(void)
3527 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};3527 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
3528 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));3528 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
3529 3529 
3530- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3530+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3531 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3531 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3532 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3532 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3533 3533 
@@ -3590,7 +3590,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC002(void)
3590 FRAME_Msg frameMsg = { 0 };3590 FRAME_Msg frameMsg = { 0 };
3591 FRAME_Type frameType = { 0 };3591 FRAME_Type frameType = { 0 };
3592 testInfo.state = TRY_RECV_CLIENT_HELLO;3592 testInfo.state = TRY_RECV_CLIENT_HELLO;
3593- testInfo.isSupportExtendMasterSecret = true;3593+ testInfo.isSupportExtendedMasterSecret = true;
3594 testInfo.isClient = false;3594 testInfo.isClient = false;
3595 testInfo.isSupportClientVerify = true;3595 testInfo.isSupportClientVerify = true;
3596 testInfo.isSupportNoClientCert = false;3596 testInfo.isSupportNoClientCert = false;
@@ -3603,7 +3603,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC002(void)
3603 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};3603 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
3604 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));3604 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
3605 3605 
3606- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3606+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3607 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3607 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3608 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3608 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3609 3609 
@@ -3666,7 +3666,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC003(void)
3666 FRAME_Msg frameMsg = { 0 };3666 FRAME_Msg frameMsg = { 0 };
3667 FRAME_Type frameType = { 0 };3667 FRAME_Type frameType = { 0 };
3668 testInfo.state = TRY_RECV_CLIENT_HELLO;3668 testInfo.state = TRY_RECV_CLIENT_HELLO;
3669- testInfo.isSupportExtendMasterSecret = true;3669+ testInfo.isSupportExtendedMasterSecret = true;
3670 testInfo.isClient = false;3670 testInfo.isClient = false;
3671 testInfo.isSupportClientVerify = true;3671 testInfo.isSupportClientVerify = true;
3672 testInfo.isSupportNoClientCert = false;3672 testInfo.isSupportNoClientCert = false;
@@ -3679,7 +3679,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_RECODE_VERSION_TC003(void)
3679 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};3679 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
3680 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));3680 HITLS_CFG_SetSignature(testInfo.config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
3681 3681 
3682- testInfo.config->isSupportExtendMasterSecret = testInfo.isSupportExtendMasterSecret;3682+ testInfo.config->isSupportExtendedMasterSecret = testInfo.isSupportExtendedMasterSecret;
3683 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;3683 testInfo.config->isSupportClientVerify = testInfo.isSupportClientVerify;
3684 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;3684 testInfo.config->isSupportNoClientCert = testInfo.isSupportNoClientCert;
3685 3685 
@@ -4787,7 +4787,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CM_CLOSE_SEND_ALERT_TC001(void)
4787 HandshakeTestInfo testInfo = { 0 };4787 HandshakeTestInfo testInfo = { 0 };
4788 testInfo.state = TRY_RECV_SERVER_HELLO;4788 testInfo.state = TRY_RECV_SERVER_HELLO;
4789 testInfo.isClient = true;4789 testInfo.isClient = true;
4790- testInfo.isSupportExtendMasterSecret = true;4790+ testInfo.isSupportExtendedMasterSecret = true;
4791 testInfo.isSupportClientVerify = true;4791 testInfo.isSupportClientVerify = true;
4792 testInfo.isSupportNoClientCert = false;4792 testInfo.isSupportNoClientCert = false;
4793 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);4793 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -4867,7 +4867,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_CM_CLOSE_SEND_ALERT_TC002(void)
4867 4867 
4868 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;4868 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
4869 testInfo.isClient = false;4869 testInfo.isClient = false;
4870- testInfo.isSupportExtendMasterSecret = true;4870+ testInfo.isSupportExtendedMasterSecret = true;
4871 testInfo.isSupportClientVerify = false;4871 testInfo.isSupportClientVerify = false;
4872 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);4872 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
4873 4873 
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246_cert.c+1-1
@@ -55,7 +55,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_HANDSHAKE_SEND_CERTFICATE_TC001(void)
55 FRAME_Msg frameMsg = { 0 };55 FRAME_Msg frameMsg = { 0 };
56 FRAME_Type frameType = { 0 };56 FRAME_Type frameType = { 0 };
57 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;57 testInfo.state = TRY_SEND_SERVER_HELLO_DONE;
58- testInfo.isSupportExtendMasterSecret = true;58+ testInfo.isSupportExtendedMasterSecret = true;
59 testInfo.isSupportClientVerify = true;59 testInfo.isSupportClientVerify = true;
60 testInfo.isSupportNoClientCert = false;60 testInfo.isSupportNoClientCert = false;
61 testInfo.isClient = false;61 testInfo.isClient = false;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246_extensions.c+16-16
@@ -45,11 +45,11 @@ typedef struct {
45 FRAME_LinkObj *server;45 FRAME_LinkObj *server;
46 HITLS_HandshakeState state;46 HITLS_HandshakeState state;
47 bool isClient;47 bool isClient;
48- bool isSupportExtendMasterSecret;48+ bool isSupportExtendedMasterSecret;
49 bool isSupportClientVerify;49 bool isSupportClientVerify;
50 bool isSupportNoClientCert;50 bool isSupportNoClientCert;
51 bool isSupportRenegotiation;51 bool isSupportRenegotiation;
52- bool isServerExtendMasterSecret;52+ bool isServerExtendedMasterSecret;
53} HandshakeTestInfo;53} HandshakeTestInfo;
54 54 
55int32_t StatusPark(HandshakeTestInfo *testInfo)55int32_t StatusPark(HandshakeTestInfo *testInfo)
@@ -89,7 +89,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
89 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};89 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
90 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));90 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
91 91 
92- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;92+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
93 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;93 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
94 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;94 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
95 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;95 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -117,7 +117,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_MSGLENGTH_TOOLONG_TC001(void)
117 HandshakeTestInfo testInfo = {0};117 HandshakeTestInfo testInfo = {0};
118 118 
119 testInfo.state = TRY_RECV_CERTIFICATE;119 testInfo.state = TRY_RECV_CERTIFICATE;
120- testInfo.isSupportExtendMasterSecret = true;120+ testInfo.isSupportExtendedMasterSecret = true;
121 testInfo.isClient = false;121 testInfo.isClient = false;
122 testInfo.isSupportClientVerify = true;122 testInfo.isSupportClientVerify = true;
123 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);123 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
@@ -188,7 +188,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_MSGLENGTH_TOOLONG_TC002(void)
188 188 
189 testInfo.state = TRY_RECV_CERTIFICATE;189 testInfo.state = TRY_RECV_CERTIFICATE;
190 testInfo.isClient = true;190 testInfo.isClient = true;
191- testInfo.isSupportExtendMasterSecret = true;191+ testInfo.isSupportExtendedMasterSecret = true;
192 testInfo.isSupportClientVerify = true;192 testInfo.isSupportClientVerify = true;
193 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);193 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
194 194 
@@ -257,7 +257,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_MSGLENGTH_TOOLONG_TC003(void)
257 257 
258 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;258 testInfo.state = TRY_RECV_CLIENT_KEY_EXCHANGE;
259 testInfo.isClient = false;259 testInfo.isClient = false;
260- testInfo.isSupportExtendMasterSecret = true;260+ testInfo.isSupportExtendedMasterSecret = true;
261 testInfo.isSupportClientVerify = true;261 testInfo.isSupportClientVerify = true;
262 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);262 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
263 263 
@@ -316,7 +316,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_MSGLENGTH_TOOLONG_TC004(void)
316{316{
317 HandshakeTestInfo testInfo = {0};317 HandshakeTestInfo testInfo = {0};
318 testInfo.state = TRY_SEND_FINISH;318 testInfo.state = TRY_SEND_FINISH;
319- testInfo.isSupportExtendMasterSecret = true;319+ testInfo.isSupportExtendedMasterSecret = true;
320 testInfo.isClient = true;320 testInfo.isClient = true;
321 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);321 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
322 322 
@@ -366,10 +366,10 @@ EXIT:
366 366 
367int32_t StatusPark1(HandshakeTestInfo *testInfo)367int32_t StatusPark1(HandshakeTestInfo *testInfo)
368{368{
369- if(testInfo->isServerExtendMasterSecret == true){369+ if(testInfo->isServerExtendedMasterSecret == true){
370- testInfo->config->isSupportExtendMasterSecret = true;370+ testInfo->config->isSupportExtendedMasterSecret = true;
371 }else {371 }else {
372- testInfo->config->isSupportExtendMasterSecret = false;372+ testInfo->config->isSupportExtendedMasterSecret = false;
373 }373 }
374 testInfo->config->isSupportRenegotiation = false;374 testInfo->config->isSupportRenegotiation = false;
375 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);375 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -377,10 +377,10 @@ int32_t StatusPark1(HandshakeTestInfo *testInfo)
377 return HITLS_INTERNAL_EXCEPTION;377 return HITLS_INTERNAL_EXCEPTION;
378 }378 }
379 379 
380- if(testInfo->isServerExtendMasterSecret == true){380+ if(testInfo->isServerExtendedMasterSecret == true){
381- testInfo->config->isSupportExtendMasterSecret = false;381+ testInfo->config->isSupportExtendedMasterSecret = false;
382 }else {382 }else {
383- testInfo->config->isSupportExtendMasterSecret = true;383+ testInfo->config->isSupportExtendedMasterSecret = true;
384 }384 }
385 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;385 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
386 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);386 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -410,7 +410,7 @@ int32_t DefaultCfgStatusPark1(HandshakeTestInfo *testInfo)
410 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};410 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
411 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));411 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
412 412 
413- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;413+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
414 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;414 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
415 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;415 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
416 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;416 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -441,7 +441,7 @@ void UT_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_TC001(void)
441 441 
442 FRAME_Msg frameMsg1 = {0};442 FRAME_Msg frameMsg1 = {0};
443 FRAME_Type frameType1 = {0};443 FRAME_Type frameType1 = {0};
444- testInfo.isServerExtendMasterSecret = true;444+ testInfo.isServerExtendedMasterSecret = true;
445 testInfo.state = TRY_RECV_CLIENT_HELLO;445 testInfo.state = TRY_RECV_CLIENT_HELLO;
446 testInfo.isClient = false;446 testInfo.isClient = false;
447 ASSERT_TRUE(DefaultCfgStatusPark1(&testInfo) == HITLS_SUCCESS);447 ASSERT_TRUE(DefaultCfgStatusPark1(&testInfo) == HITLS_SUCCESS);
@@ -593,7 +593,7 @@ void UT_TLS_TLS12_RFC7627_CONSISTENCY_EXTENDED_MASTER_SECRET_TC004(void)
593 593 
594 FRAME_Msg frameMsg1 = {0};594 FRAME_Msg frameMsg1 = {0};
595 FRAME_Type frameType1 = {0};595 FRAME_Type frameType1 = {0};
596- testInfo.isSupportExtendMasterSecret = true;596+ testInfo.isSupportExtendedMasterSecret = true;
597 testInfo.state = TRY_RECV_CLIENT_HELLO;597 testInfo.state = TRY_RECV_CLIENT_HELLO;
598 testInfo.isClient = false;598 testInfo.isClient = false;
599 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);599 ASSERT_TRUE(DefaultCfgStatusPark(&testInfo) == HITLS_SUCCESS);
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5246_malformed_msg.c+1-1
@@ -137,7 +137,7 @@ void UT_TLS_TLS12_RFC5246_CONSISTENCY_MISS_CLIENT_KEYEXCHANGE_TC001(void)
137 /* 1. Configure the single-end authentication. After the server sends the serverhellodone message, the client137 /* 1. Configure the single-end authentication. After the server sends the serverhellodone message, the client
138 * stops in the try send client key exchange state. */138 * stops in the try send client key exchange state. */
139 testInfo.state = TRY_SEND_CLIENT_KEY_EXCHANGE;139 testInfo.state = TRY_SEND_CLIENT_KEY_EXCHANGE;
140- testInfo.isSupportExtendMasterSecret = true;140+ testInfo.isSupportExtendedMasterSecret = true;
141 testInfo.isClient = true;141 testInfo.isClient = true;
142 142 
143 testInfo.isSupportClientVerify = false;143 testInfo.isSupportClientVerify = false;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_frame_tls12_consistency_rfc5746.c+11-11
@@ -60,11 +60,11 @@ typedef struct {
60 FRAME_LinkObj *server;60 FRAME_LinkObj *server;
61 HITLS_HandshakeState state;61 HITLS_HandshakeState state;
62 bool isClient;62 bool isClient;
63- bool isSupportExtendMasterSecret;63+ bool isSupportExtendedMasterSecret;
64 bool isSupportClientVerify;64 bool isSupportClientVerify;
65 bool isSupportNoClientCert;65 bool isSupportNoClientCert;
66 bool isSupportRenegotiation;66 bool isSupportRenegotiation;
67- bool isServerExtendMasterSecret;67+ bool isServerExtendedMasterSecret;
68} HandshakeTestInfo;68} HandshakeTestInfo;
69 69 
70int32_t StatusPark(HandshakeTestInfo *testInfo)70int32_t StatusPark(HandshakeTestInfo *testInfo)
@@ -118,7 +118,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
118 return HITLS_INTERNAL_EXCEPTION;118 return HITLS_INTERNAL_EXCEPTION;
119 }119 }
120 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);120 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
121- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;121+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
122 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;122 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
123 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;123 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
124 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;124 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -128,10 +128,10 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
128 128 
129int32_t StatusPark1(HandshakeTestInfo *testInfo)129int32_t StatusPark1(HandshakeTestInfo *testInfo)
130{130{
131- if (testInfo->isServerExtendMasterSecret == true) {131+ if (testInfo->isServerExtendedMasterSecret == true) {
132- testInfo->config->isSupportExtendMasterSecret = true;132+ testInfo->config->isSupportExtendedMasterSecret = true;
133 } else {133 } else {
134- testInfo->config->isSupportExtendMasterSecret = false;134+ testInfo->config->isSupportExtendedMasterSecret = false;
135 }135 }
136 testInfo->config->isSupportRenegotiation = false;136 testInfo->config->isSupportRenegotiation = false;
137 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);137 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -139,10 +139,10 @@ int32_t StatusPark1(HandshakeTestInfo *testInfo)
139 return HITLS_INTERNAL_EXCEPTION;139 return HITLS_INTERNAL_EXCEPTION;
140 }140 }
141 141 
142- if (testInfo->isServerExtendMasterSecret == true) {142+ if (testInfo->isServerExtendedMasterSecret == true) {
143- testInfo->config->isSupportExtendMasterSecret = false;143+ testInfo->config->isSupportExtendedMasterSecret = false;
144 } else {144 } else {
145- testInfo->config->isSupportExtendMasterSecret = true;145+ testInfo->config->isSupportExtendedMasterSecret = true;
146 }146 }
147 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;147 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
148 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);148 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -172,7 +172,7 @@ int32_t DefaultCfgStatusPark1(HandshakeTestInfo *testInfo)
172 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};172 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
173 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));173 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
174 174 
175- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;175+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
176 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;176 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
177 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;177 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
178 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;178 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -241,7 +241,7 @@ void UT_TLS_TLS12_RFC5746_CONSISTENCY_EXTENDED_RENEGOTIATION_FUNC_TC001(void)
241 HandshakeTestInfo testInfo = {0};241 HandshakeTestInfo testInfo = {0};
242 FRAME_Msg frameMsg = {0};242 FRAME_Msg frameMsg = {0};
243 FRAME_Type frameType = {0};243 FRAME_Type frameType = {0};
244- testInfo.isSupportExtendMasterSecret = true;244+ testInfo.isSupportExtendedMasterSecret = true;
245 testInfo.isSupportRenegotiation = true;245 testInfo.isSupportRenegotiation = true;
246 testInfo.state = TRY_RECV_CLIENT_HELLO;246 testInfo.state = TRY_RECV_CLIENT_HELLO;
247 testInfo.isClient = false;247 testInfo.isClient = false;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc5246.c+8-8
@@ -237,8 +237,8 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_RECV_KEYUPDATE_TC001(void)
237 237 
238 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");238 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");
239 ASSERT_TRUE(clientCtxConfig != NULL);239 ASSERT_TRUE(clientCtxConfig != NULL);
240- clientCtxConfig->isSupportExtendMasterSecret=true;240+ clientCtxConfig->isSupportExtendedMasterSecret=true;
241- serverCtxConfig->isSupportExtendMasterSecret=true;241+ serverCtxConfig->isSupportExtendedMasterSecret=true;
242 serverCtxConfig->isSupportSessionTicket=true;242 serverCtxConfig->isSupportSessionTicket=true;
243 clientCtxConfig->isSupportSessionTicket=true;243 clientCtxConfig->isSupportSessionTicket=true;
244 244 
@@ -307,8 +307,8 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_RECV_NST_TC001(void)
307 307 
308 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");308 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");
309 ASSERT_TRUE(clientCtxConfig != NULL);309 ASSERT_TRUE(clientCtxConfig != NULL);
310- clientCtxConfig->isSupportExtendMasterSecret=true;310+ clientCtxConfig->isSupportExtendedMasterSecret=true;
311- serverCtxConfig->isSupportExtendMasterSecret=true;311+ serverCtxConfig->isSupportExtendedMasterSecret=true;
312 serverCtxConfig->isSupportSessionTicket=true;312 serverCtxConfig->isSupportSessionTicket=true;
313 clientCtxConfig->isSupportSessionTicket=true;313 clientCtxConfig->isSupportSessionTicket=true;
314 314 
@@ -367,8 +367,8 @@ void SDV_TLS_TLS12_StateTrans_FUNC_TC001(void)
367 367 
368 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");368 clientCtxConfig = HLT_NewCtxConfig(NULL, "CLIENT");
369 ASSERT_TRUE(clientCtxConfig != NULL);369 ASSERT_TRUE(clientCtxConfig != NULL);
370- clientCtxConfig->isSupportExtendMasterSecret=true;370+ clientCtxConfig->isSupportExtendedMasterSecret=true;
371- serverCtxConfig->isSupportExtendMasterSecret=true;371+ serverCtxConfig->isSupportExtendedMasterSecret=true;
372 serverCtxConfig->isSupportSessionTicket=true;372 serverCtxConfig->isSupportSessionTicket=true;
373 clientCtxConfig->isSupportSessionTicket=true;373 clientCtxConfig->isSupportSessionTicket=true;
374 374 
@@ -428,14 +428,14 @@ void ClientSendMalformedCipherSuiteLenMsg(HLT_FrameHandle *handle, TestPara *tes
428 HLT_Ctx_Config *serverConfig = HLT_NewCtxConfig(NULL, "SERVER");428 HLT_Ctx_Config *serverConfig = HLT_NewCtxConfig(NULL, "SERVER");
429 ASSERT_TRUE(serverConfig != NULL);429 ASSERT_TRUE(serverConfig != NULL);
430 ASSERT_TRUE(HLT_SetClientVerifySupport(serverConfig, testPara->isSupportClientVerify) == 0);430 ASSERT_TRUE(HLT_SetClientVerifySupport(serverConfig, testPara->isSupportClientVerify) == 0);
431- serverConfig->isSupportExtendMasterSecret = false;431+ serverConfig->isSupportExtendedMasterSecret = false;
432 HLT_Tls_Res *serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);432 HLT_Tls_Res *serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);
433 ASSERT_TRUE(serverRes != NULL);433 ASSERT_TRUE(serverRes != NULL);
434 // Configure the TLS connection on the local client.434 // Configure the TLS connection on the local client.
435 435 
436 HLT_Ctx_Config *clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");436 HLT_Ctx_Config *clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
437 ASSERT_TRUE(clientConfig != NULL);437 ASSERT_TRUE(clientConfig != NULL);
438- serverConfig->isSupportExtendMasterSecret = false;438+ serverConfig->isSupportExtendedMasterSecret = false;
439 HLT_Tls_Res *clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);439 HLT_Tls_Res *clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);
440 ASSERT_TRUE(clientRes != NULL);440 ASSERT_TRUE(clientRes != NULL);
441 // Configure the interface for constructing abnormal messages.441 // Configure the interface for constructing abnormal messages.
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc5246_extensions.c+20-20
@@ -58,7 +58,7 @@ typedef struct {
58 bool alertRecvFlag; // Indicates whether the alert is received. The value fasle indicates the sent alert, and the value true indicates the received alert58 bool alertRecvFlag; // Indicates whether the alert is received. The value fasle indicates the sent alert, and the value true indicates the received alert
59 ALERT_Description expectDescription; // Expected alert description on the test end59 ALERT_Description expectDescription; // Expected alert description on the test end
60 bool isSupportClientVerify;60 bool isSupportClientVerify;
61- bool isSupportExtendMasterSecret;61+ bool isSupportExtendedMasterSecret;
62 bool isSupportRenegotiation;62 bool isSupportRenegotiation;
63 bool isSupportSessionTicket;63 bool isSupportSessionTicket;
64 bool isSupportDhCipherSuites;64 bool isSupportDhCipherSuites;
@@ -78,11 +78,11 @@ typedef struct {
78 FRAME_LinkObj *server;78 FRAME_LinkObj *server;
79 HITLS_HandshakeState state;79 HITLS_HandshakeState state;
80 bool isClient;80 bool isClient;
81- bool isSupportExtendMasterSecret;81+ bool isSupportExtendedMasterSecret;
82 bool isSupportClientVerify;82 bool isSupportClientVerify;
83 bool isSupportNoClientCert;83 bool isSupportNoClientCert;
84 bool isSupportRenegotiation;84 bool isSupportRenegotiation;
85- bool isServerExtendMasterSecret;85+ bool isServerExtendedMasterSecret;
86} HandshakeTestInfo;86} HandshakeTestInfo;
87 87 
88 88 
@@ -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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);153+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);215+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);348+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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 
@@ -484,7 +484,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC010(void)
484 handle.frameCallBack = MalformedServerHelloMsgCallback001; // reconstruction callback484 handle.frameCallBack = MalformedServerHelloMsgCallback001; // reconstruction callback
485 TestPara testPara = {0};485 TestPara testPara = {0};
486 testPara.port = PORT;486 testPara.port = PORT;
487- testPara.isSupportExtendMasterSecret = true;487+ testPara.isSupportExtendedMasterSecret = true;
488 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;488 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
489 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;489 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
490 ServerSendMalformedRecordHeaderMsg(&handle, &testPara);490 ServerSendMalformedRecordHeaderMsg(&handle, &testPara);
@@ -529,7 +529,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC011(void)
529 handle.frameCallBack = MalformedServerHelloMsgCallback002;529 handle.frameCallBack = MalformedServerHelloMsgCallback002;
530 TestPara testPara = {0};530 TestPara testPara = {0};
531 testPara.port = PORT;531 testPara.port = PORT;
532- testPara.isSupportExtendMasterSecret = true;532+ testPara.isSupportExtendedMasterSecret = true;
533 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;533 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
534 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;534 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
535 ServerSendMalformedRecordHeaderMsg(&handle, &testPara);535 ServerSendMalformedRecordHeaderMsg(&handle, &testPara);
@@ -573,7 +573,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC012(void)
573 handle.frameCallBack = MalformedServerHelloMsgCallback003;573 handle.frameCallBack = MalformedServerHelloMsgCallback003;
574 TestPara testPara = {0};574 TestPara testPara = {0};
575 testPara.port = PORT;575 testPara.port = PORT;
576- testPara.isSupportExtendMasterSecret = true;576+ testPara.isSupportExtendedMasterSecret = true;
577 testPara.isSupportRenegotiation = true;577 testPara.isSupportRenegotiation = true;
578 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;578 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
579 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;579 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
@@ -618,7 +618,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC013(void)
618 handle.frameCallBack = MalformedServerHelloMsgCallback004;618 handle.frameCallBack = MalformedServerHelloMsgCallback004;
619 TestPara testPara = {0};619 TestPara testPara = {0};
620 testPara.port = PORT;620 testPara.port = PORT;
621- testPara.isSupportExtendMasterSecret = true;621+ testPara.isSupportExtendedMasterSecret = true;
622 testPara.isSupportSessionTicket = true;622 testPara.isSupportSessionTicket = true;
623 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;623 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
624 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;624 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
@@ -663,7 +663,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC014(void)
663 handle.frameCallBack = MalformedServerHelloMsgCallback005;663 handle.frameCallBack = MalformedServerHelloMsgCallback005;
664 TestPara testPara = {0};664 TestPara testPara = {0};
665 testPara.port = PORT;665 testPara.port = PORT;
666- testPara.isSupportExtendMasterSecret = true;666+ testPara.isSupportExtendedMasterSecret = true;
667 testPara.isSupportSni = true;667 testPara.isSupportSni = true;
668 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;668 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
669 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;669 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
@@ -708,7 +708,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC009(void)
708 handle.frameCallBack = MalformedServerHelloMsgCallback006;708 handle.frameCallBack = MalformedServerHelloMsgCallback006;
709 TestPara testPara = {0};709 TestPara testPara = {0};
710 testPara.port = PORT;710 testPara.port = PORT;
711- testPara.isSupportExtendMasterSecret = true;711+ testPara.isSupportExtendedMasterSecret = true;
712 testPara.isSupportAlpn = true;712 testPara.isSupportAlpn = true;
713 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;713 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
714 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;714 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
@@ -885,7 +885,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC005(void)
885 testPara.port = PORT;885 testPara.port = PORT;
886 testPara.expectHsState = TRY_RECV_SERVER_HELLO;886 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
887 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;887 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
888- testPara.isSupportExtendMasterSecret = true;888+ testPara.isSupportExtendedMasterSecret = true;
889 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);889 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
890 return;890 return;
891}891}
@@ -929,7 +929,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC006(void)
929 testPara.port = PORT;929 testPara.port = PORT;
930 testPara.expectHsState = TRY_RECV_SERVER_HELLO;930 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
931 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;931 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
932- testPara.isSupportExtendMasterSecret = true;932+ testPara.isSupportExtendedMasterSecret = true;
933 testPara.isSupportSessionTicket = true;933 testPara.isSupportSessionTicket = true;
934 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);934 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
935 return;935 return;
@@ -980,7 +980,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC007(void)
980 testPara.port = PORT;980 testPara.port = PORT;
981 testPara.expectHsState = TRY_RECV_SERVER_HELLO;981 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
982 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;982 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
983- testPara.isSupportExtendMasterSecret = true;983+ testPara.isSupportExtendedMasterSecret = true;
984 testPara.isSupportSni = true;984 testPara.isSupportSni = true;
985 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);985 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
986 return;986 return;
@@ -1026,7 +1026,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_REPEAT_EXTENSION_TC008(void)
1026 testPara.port = PORT;1026 testPara.port = PORT;
1027 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1027 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1028 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;1028 testPara.expectDescription = ALERT_ILLEGAL_PARAMETER;
1029- testPara.isSupportExtendMasterSecret = true;1029+ testPara.isSupportExtendedMasterSecret = true;
1030 testPara.isSupportAlpn = true;1030 testPara.isSupportAlpn = true;
1031 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1031 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1032 return;1032 return;
@@ -1840,7 +1840,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC048(void
1840 testPara.port = PORT;1840 testPara.port = PORT;
1841 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1841 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1842 testPara.expectDescription = ALERT_DECODE_ERROR;1842 testPara.expectDescription = ALERT_DECODE_ERROR;
1843- testPara.isSupportExtendMasterSecret = true;1843+ testPara.isSupportExtendedMasterSecret = true;
1844 testPara.isSupportSni = true;1844 testPara.isSupportSni = true;
1845 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1845 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1846 return;1846 return;
@@ -1894,7 +1894,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC047(void
1894 testPara.port = PORT;1894 testPara.port = PORT;
1895 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1895 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1896 testPara.expectDescription = ALERT_DECODE_ERROR;1896 testPara.expectDescription = ALERT_DECODE_ERROR;
1897- testPara.isSupportExtendMasterSecret = true;1897+ testPara.isSupportExtendedMasterSecret = true;
1898 testPara.isSupportSni = true;1898 testPara.isSupportSni = true;
1899 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1899 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1900 return;1900 return;
@@ -1948,7 +1948,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC046(void
1948 testPara.port = PORT;1948 testPara.port = PORT;
1949 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1949 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1950 testPara.expectDescription = ALERT_DECODE_ERROR;1950 testPara.expectDescription = ALERT_DECODE_ERROR;
1951- testPara.isSupportExtendMasterSecret = true;1951+ testPara.isSupportExtendedMasterSecret = true;
1952 testPara.isSupportSni = true;1952 testPara.isSupportSni = true;
1953 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1953 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1954 return;1954 return;
@@ -2000,7 +2000,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC045(void
2000 testPara.port = PORT;2000 testPara.port = PORT;
2001 testPara.expectHsState = TRY_RECV_SERVER_HELLO;2001 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
2002 testPara.expectDescription = ALERT_DECODE_ERROR;2002 testPara.expectDescription = ALERT_DECODE_ERROR;
2003- testPara.isSupportExtendMasterSecret = true;2003+ testPara.isSupportExtendedMasterSecret = true;
2004 testPara.isSupportSni = true;2004 testPara.isSupportSni = true;
2005 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);2005 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
2006 return;2006 return;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc5246_malformed_msg.c+12-12
@@ -1555,7 +1555,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC030(void
1555 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1555 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1556 // 3. Check the status of the tested end.1556 // 3. Check the status of the tested end.
1557 testPara.expectDescription = ALERT_DECODE_ERROR;1557 testPara.expectDescription = ALERT_DECODE_ERROR;
1558- testPara.isSupportExtendMasterSecret = true;1558+ testPara.isSupportExtendedMasterSecret = true;
1559 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1559 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1560 return;1560 return;
1561}1561}
@@ -1761,7 +1761,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC034(void
1761 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1761 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1762 // 3. Check the status of the tested end.1762 // 3. Check the status of the tested end.
1763 testPara.expectDescription = ALERT_DECODE_ERROR;1763 testPara.expectDescription = ALERT_DECODE_ERROR;
1764- testPara.isSupportExtendMasterSecret = true;1764+ testPara.isSupportExtendedMasterSecret = true;
1765 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1765 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1766 return;1766 return;
1767}1767}
@@ -1817,7 +1817,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC035(void
1817 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1817 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1818 // 3. Check the status of the tested end.1818 // 3. Check the status of the tested end.
1819 testPara.expectDescription = ALERT_DECODE_ERROR;1819 testPara.expectDescription = ALERT_DECODE_ERROR;
1820- testPara.isSupportExtendMasterSecret = true;1820+ testPara.isSupportExtendedMasterSecret = true;
1821 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1821 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1822 return;1822 return;
1823}1823}
@@ -1873,7 +1873,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC036(void
1873 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1873 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1874 // 3. Check the status of the tested end.1874 // 3. Check the status of the tested end.
1875 testPara.expectDescription = ALERT_DECODE_ERROR;1875 testPara.expectDescription = ALERT_DECODE_ERROR;
1876- testPara.isSupportExtendMasterSecret = true;1876+ testPara.isSupportExtendedMasterSecret = true;
1877 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1877 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1878 return;1878 return;
1879}1879}
@@ -1927,7 +1927,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC037(void
1927 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1927 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1928 // 3. Check the status of the tested end.1928 // 3. Check the status of the tested end.
1929 testPara.expectDescription = ALERT_DECODE_ERROR;1929 testPara.expectDescription = ALERT_DECODE_ERROR;
1930- testPara.isSupportExtendMasterSecret = true;1930+ testPara.isSupportExtendedMasterSecret = true;
1931 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1931 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1932 return;1932 return;
1933}1933}
@@ -1981,7 +1981,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC038(void
1981 testPara.expectHsState = TRY_RECV_SERVER_HELLO;1981 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
1982 // 3. Check the status of the tested end.1982 // 3. Check the status of the tested end.
1983 testPara.expectDescription = ALERT_DECODE_ERROR;1983 testPara.expectDescription = ALERT_DECODE_ERROR;
1984- testPara.isSupportExtendMasterSecret = true;1984+ testPara.isSupportExtendedMasterSecret = true;
1985 testPara.isSupportALPN = true;1985 testPara.isSupportALPN = true;
1986 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);1986 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
1987 return;1987 return;
@@ -2037,7 +2037,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC039(void
2037 testPara.expectHsState = TRY_RECV_SERVER_HELLO;2037 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
2038 // 3. Check the status of the tested end.2038 // 3. Check the status of the tested end.
2039 testPara.expectDescription = ALERT_DECODE_ERROR;2039 testPara.expectDescription = ALERT_DECODE_ERROR;
2040- testPara.isSupportExtendMasterSecret = true;2040+ testPara.isSupportExtendedMasterSecret = true;
2041 testPara.isSupportALPN = true;2041 testPara.isSupportALPN = true;
2042 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);2042 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
2043 return;2043 return;
@@ -2094,7 +2094,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC040(void
2094 testPara.expectHsState = TRY_RECV_SERVER_HELLO;2094 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
2095 // 3. Check the status of the tested end.2095 // 3. Check the status of the tested end.
2096 testPara.expectDescription = ALERT_DECODE_ERROR;2096 testPara.expectDescription = ALERT_DECODE_ERROR;
2097- testPara.isSupportExtendMasterSecret = true;2097+ testPara.isSupportExtendedMasterSecret = true;
2098 testPara.isSupportALPN = true;2098 testPara.isSupportALPN = true;
2099 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);2099 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
2100 return;2100 return;
@@ -2149,7 +2149,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC041(void
2149 testPara.expectHsState = TRY_RECV_SERVER_HELLO;2149 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
2150 // 3. Check the status of the tested end.2150 // 3. Check the status of the tested end.
2151 testPara.expectDescription = ALERT_DECODE_ERROR;2151 testPara.expectDescription = ALERT_DECODE_ERROR;
2152- testPara.isSupportExtendMasterSecret = true;2152+ testPara.isSupportExtendedMasterSecret = true;
2153 testPara.isSupportALPN = true;2153 testPara.isSupportALPN = true;
2154 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);2154 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
2155 return;2155 return;
@@ -2194,7 +2194,7 @@ void SDV_TLS_TLS12_RFC5246_CONSISTENCY_MALFORMED_CLIENT_HELLO_MSG_FUN_TC042(void
2194 testPara.port = PORT;2194 testPara.port = PORT;
2195 testPara.expectHsState = TRY_RECV_FINISH;2195 testPara.expectHsState = TRY_RECV_FINISH;
2196 testPara.expectDescription = ALERT_DECRYPT_ERROR;2196 testPara.expectDescription = ALERT_DECRYPT_ERROR;
2197- testPara.isSupportExtendMasterSecret = false;2197+ testPara.isSupportExtendedMasterSecret = false;
2198 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);2198 ClientSendMalformedRecordHeaderMsg(&handle, &testPara);
2199 return;2199 return;
2200}2200}
@@ -2439,14 +2439,14 @@ void ClientSendMalformedCipherSuiteLenMsg(HLT_FrameHandle *handle, TestPara *tes
2439 HLT_Ctx_Config *serverConfig = HLT_NewCtxConfig(NULL, "SERVER");2439 HLT_Ctx_Config *serverConfig = HLT_NewCtxConfig(NULL, "SERVER");
2440 ASSERT_TRUE(serverConfig != NULL);2440 ASSERT_TRUE(serverConfig != NULL);
2441 ASSERT_TRUE(HLT_SetClientVerifySupport(serverConfig, testPara->isSupportClientVerify) == 0);2441 ASSERT_TRUE(HLT_SetClientVerifySupport(serverConfig, testPara->isSupportClientVerify) == 0);
2442- serverConfig->isSupportExtendMasterSecret = false;2442+ serverConfig->isSupportExtendedMasterSecret = false;
2443 HLT_Tls_Res *serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);2443 HLT_Tls_Res *serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);
2444 ASSERT_TRUE(serverRes != NULL);2444 ASSERT_TRUE(serverRes != NULL);
2445 // Configure the TLS connection on the local client.2445 // Configure the TLS connection on the local client.
2446 2446 
2447 HLT_Ctx_Config *clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");2447 HLT_Ctx_Config *clientConfig = HLT_NewCtxConfig(NULL, "CLIENT");
2448 ASSERT_TRUE(clientConfig != NULL);2448 ASSERT_TRUE(clientConfig != NULL);
2449- serverConfig->isSupportExtendMasterSecret = false;2449+ serverConfig->isSupportExtendedMasterSecret = false;
2450 HLT_Tls_Res *clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);2450 HLT_Tls_Res *clientRes = HLT_ProcessTlsInit(localProcess, TLS1_2, clientConfig, NULL);
2451 ASSERT_TRUE(clientRes != NULL);2451 ASSERT_TRUE(clientRes != NULL);
2452 // Configure the interface for constructing abnormal messages.2452 // Configure the interface for constructing abnormal messages.
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_sdv_hlt_tls12_consistency_rfc8422.c+2-2
@@ -475,7 +475,7 @@ void SDV_TLS_TLS12_RFC8422_CONSISTENCYECDHE_ERR_POINT_FUNC_TC002(void)
475 handle.frameCallBack = MalformedServerHelloMsgCallback;475 handle.frameCallBack = MalformedServerHelloMsgCallback;
476 TestPara testPara = {0};476 TestPara testPara = {0};
477 testPara.port = g_uiPort;477 testPara.port = g_uiPort;
478- testPara.isSupportExtendMasterSecret = true;478+ testPara.isSupportExtendedMasterSecret = true;
479 // 4. The status of the tested end is alerted.479 // 4. The status of the tested end is alerted.
480 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;480 testPara.expectHsState = TRY_RECV_CLIENT_KEY_EXCHANGE;
481 // 3. Check the status of the tested end.481 // 3. Check the status of the tested end.
@@ -526,7 +526,7 @@ void SDV_TLS_TLS12_RFC8422_CONSISTENCYECDHE_ECDHE_LOSE_CURVE_FUNC_TC001(void)
526 handle.frameCallBack = MalformedNoCurveExternsionCallback;526 handle.frameCallBack = MalformedNoCurveExternsionCallback;
527 TestPara testPara = {0};527 TestPara testPara = {0};
528 testPara.port = g_uiPort;528 testPara.port = g_uiPort;
529- testPara.isSupportExtendMasterSecret = true;529+ testPara.isSupportExtendedMasterSecret = true;
530 testPara.expectHsState = TRY_RECV_SERVER_HELLO;530 testPara.expectHsState = TRY_RECV_SERVER_HELLO;
531 // 3. The server continues to establish a connection.531 // 3. The server continues to establish a connection.
532 testPara.expectDescription = ALERT_HANDSHAKE_FAILURE;532 testPara.expectDescription = ALERT_HANDSHAKE_FAILURE;
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_tls12_consistency_rfc5246.base.c+12-12
@@ -73,10 +73,10 @@ typedef struct {
73 FRAME_LinkObj *server;73 FRAME_LinkObj *server;
74 HITLS_HandshakeState state;74 HITLS_HandshakeState state;
75 bool isClient;75 bool isClient;
76- bool isSupportExtendMasterSecret;76+ bool isSupportExtendedMasterSecret;
77 bool isSupportClientVerify;77 bool isSupportClientVerify;
78 bool isSupportNoClientCert;78 bool isSupportNoClientCert;
79- bool isServerExtendMasterSecret;79+ bool isServerExtendedMasterSecret;
80 bool isSupportRenegotiation; /* Renegotiation support flag */80 bool isSupportRenegotiation; /* Renegotiation support flag */
81 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */81 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */
82} HandshakeTestInfo;82} HandshakeTestInfo;
@@ -94,7 +94,7 @@ typedef struct {
94 bool alertRecvFlag; // Indicates whether the alert is received. The value fasle indicates the sent alert, and the value true indicates the received alert.94 bool alertRecvFlag; // Indicates whether the alert is received. The value fasle indicates the sent alert, and the value true indicates the received alert.
95 ALERT_Description expectDescription; // Expected alert description of the test end.95 ALERT_Description expectDescription; // Expected alert description of the test end.
96 bool isSupportClientVerify; // Indicates whether to use the dual-end verification.96 bool isSupportClientVerify; // Indicates whether to use the dual-end verification.
97- bool isSupportExtendMasterSecret; // Indicates whether to use an extended master key.97+ bool isSupportExtendedMasterSecret; // Indicates whether to use an extended master key.
98 bool isSupportDhCipherSuites; // Indicates whether to use the DHE cipher suite98 bool isSupportDhCipherSuites; // Indicates whether to use the DHE cipher suite
99 bool isExpectRet; // Indicates whether the return value is expected.99 bool isExpectRet; // Indicates whether the return value is expected.
100 int expectRet; // Expected return value. The isExpectRet function needs to be enabled.100 int expectRet; // Expected return value. The isExpectRet function needs to be enabled.
@@ -142,7 +142,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
142 return HITLS_INTERNAL_EXCEPTION;142 return HITLS_INTERNAL_EXCEPTION;
143 }143 }
144 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);144 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
145- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;145+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
146 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;146 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
147 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;147 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
148 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;148 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -163,7 +163,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
163 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};163 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};
164 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));164 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
165 165 
166- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;166+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
167 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;167 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
168 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;168 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
169 169 
@@ -173,10 +173,10 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
173int32_t StatusPark1(HandshakeTestInfo *testInfo)173int32_t StatusPark1(HandshakeTestInfo *testInfo)
174{174{
175 /* Construct a link. */175 /* Construct a link. */
176- if(testInfo->isServerExtendMasterSecret == true){176+ if(testInfo->isServerExtendedMasterSecret == true){
177- testInfo->config->isSupportExtendMasterSecret = true;177+ testInfo->config->isSupportExtendedMasterSecret = true;
178 }else {178 }else {
179- testInfo->config->isSupportExtendMasterSecret = false;179+ testInfo->config->isSupportExtendedMasterSecret = false;
180 }180 }
181 testInfo->config->isSupportRenegotiation = false;181 testInfo->config->isSupportRenegotiation = false;
182 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);182 testInfo->server = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -184,10 +184,10 @@ int32_t StatusPark1(HandshakeTestInfo *testInfo)
184 return HITLS_INTERNAL_EXCEPTION;184 return HITLS_INTERNAL_EXCEPTION;
185 }185 }
186 186 
187- if(testInfo->isServerExtendMasterSecret == true){187+ if(testInfo->isServerExtendedMasterSecret == true){
188- testInfo->config->isSupportExtendMasterSecret = false;188+ testInfo->config->isSupportExtendedMasterSecret = false;
189 }else {189 }else {
190- testInfo->config->isSupportExtendMasterSecret = true;190+ testInfo->config->isSupportExtendedMasterSecret = true;
191 }191 }
192 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;192 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
193 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);193 testInfo->client = FRAME_CreateLink(testInfo->config, BSL_UIO_TCP);
@@ -219,7 +219,7 @@ int32_t DefaultCfgStatusPark1(HandshakeTestInfo *testInfo)
219 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};219 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
220 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));220 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
221 221 
222- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;222+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
223 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;223 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
224 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;224 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
225 225 
Mtestcode/sdv/testcase/tls/consistency/tls12/test_suite_tls12_consistency_rfc5246_malformed_msg.base.c+8-8
@@ -154,7 +154,7 @@ typedef struct {
154 bool alertRecvFlag;154 bool alertRecvFlag;
155 ALERT_Description expectDescription;155 ALERT_Description expectDescription;
156 bool isSupportClientVerify;156 bool isSupportClientVerify;
157- bool isSupportExtendMasterSecret;157+ bool isSupportExtendedMasterSecret;
158 bool isSupportSni;158 bool isSupportSni;
159 bool isSupportALPN;159 bool isSupportALPN;
160 bool isSupportDhCipherSuites;160 bool isSupportDhCipherSuites;
@@ -173,7 +173,7 @@ typedef struct {
173 FRAME_LinkObj *server;173 FRAME_LinkObj *server;
174 HITLS_HandshakeState state;174 HITLS_HandshakeState state;
175 bool isClient;175 bool isClient;
176- bool isSupportExtendMasterSecret;176+ bool isSupportExtendedMasterSecret;
177 bool isSupportClientVerify;177 bool isSupportClientVerify;
178 bool isSupportNoClientCert;178 bool isSupportNoClientCert;
179 bool isSupportRenegotiation;179 bool isSupportRenegotiation;
@@ -218,7 +218,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
218 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};218 uint16_t signAlgs[] = {CERT_SIG_SCHEME_RSA_PKCS1_SHA256, CERT_SIG_SCHEME_ECDSA_SECP256R1_SHA256};
219 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));219 HITLS_CFG_SetSignature(testInfo->config, signAlgs, sizeof(signAlgs) / sizeof(uint16_t));
220 220 
221- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;221+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
222 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;222 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
223 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;223 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
224 testInfo->config->isSupportSessionTicket = testInfo->isSupportSessionTicket;224 testInfo->config->isSupportSessionTicket = testInfo->isSupportSessionTicket;
@@ -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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);255+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);306+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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);
@@ -385,7 +385,7 @@ void ClientSendMalformedRecordHeaderMsg(HLT_FrameHandle *handle, TestPara *testP
385 if (testPara->serverSignature != NULL) {385 if (testPara->serverSignature != NULL) {
386 ASSERT_TRUE(HLT_SetSignature(serverConfig, testPara->serverSignature) == 0);386 ASSERT_TRUE(HLT_SetSignature(serverConfig, testPara->serverSignature) == 0);
387 }387 }
388- serverConfig->isSupportExtendMasterSecret = false;388+ serverConfig->isSupportExtendedMasterSecret = false;
389 serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);389 serverRes = HLT_ProcessTlsAccept(remoteProcess, TLS1_2, serverConfig, NULL);
390 ASSERT_TRUE(serverRes != NULL);390 ASSERT_TRUE(serverRes != NULL);
391 // Configure the TLS connection on the local client.391 // Configure the TLS connection on the local client.
@@ -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_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendMasterSecret) == 0);418+ ASSERT_TRUE(HLT_SetExtendedMasterSecretSupport(clientConfig, testPara->isSupportExtendedMasterSecret) == 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.
@@ -588,7 +588,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
588 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);588 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
589 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};589 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};
590 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));590 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
591- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;591+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
592 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;592 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
593 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;593 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
594 594 
Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_1.c+9-9
@@ -1466,7 +1466,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC001(void)
1466 FRAME_Init();1466 FRAME_Init();
1467 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1467 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1468 ASSERT_TRUE(tlsConfig != NULL);1468 ASSERT_TRUE(tlsConfig != NULL);
1469- tlsConfig->isSupportExtendMasterSecret = true;1469+ tlsConfig->isSupportExtendedMasterSecret = true;
1470 tlsConfig->isSupportClientVerify = true;1470 tlsConfig->isSupportClientVerify = true;
1471 tlsConfig->isSupportNoClientCert = true;1471 tlsConfig->isSupportNoClientCert = true;
1472 FRAME_LinkObj *client = NULL;1472 FRAME_LinkObj *client = NULL;
@@ -1525,7 +1525,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC002(int isClient
1525 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1525 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1526 ASSERT_TRUE(tlsConfig != NULL);1526 ASSERT_TRUE(tlsConfig != NULL);
1527 1527 
1528- tlsConfig->isSupportExtendMasterSecret = true;1528+ tlsConfig->isSupportExtendedMasterSecret = true;
1529 tlsConfig->isSupportClientVerify = true;1529 tlsConfig->isSupportClientVerify = true;
1530 tlsConfig->isSupportNoClientCert = true;1530 tlsConfig->isSupportNoClientCert = true;
1531 FRAME_LinkObj *client = NULL;1531 FRAME_LinkObj *client = NULL;
@@ -2431,7 +2431,7 @@ int32_t DefaultCfgStatusParkWithSuite_1_3(HandshakeTestInfo *testInfo)
2431 }2431 }
2432 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};2432 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};
2433 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));2433 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
2434- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;2434+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
2435 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;2435 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
2436 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;2436 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
2437 return StatusPark(testInfo);2437 return StatusPark(testInfo);
@@ -2815,7 +2815,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_MSGLENGTH_TOOLONG_FUNC_TC003(void)
2815 HandshakeTestInfo testInfo = {0};2815 HandshakeTestInfo testInfo = {0};
2816 testInfo.state = TRY_RECV_FINISH;2816 testInfo.state = TRY_RECV_FINISH;
2817 testInfo.isClient = false;2817 testInfo.isClient = false;
2818- testInfo.isSupportExtendMasterSecret = true;2818+ testInfo.isSupportExtendedMasterSecret = true;
2819 testInfo.isSupportClientVerify = true;2819 testInfo.isSupportClientVerify = true;
2820 /* 1. Use the default configuration items to configure the client and server. */2820 /* 1. Use the default configuration items to configure the client and server. */
2821 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);2821 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
@@ -2890,7 +2890,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_MSGLENGTH_TOOLONG_FUNC_TC004(void)
2890 HandshakeTestInfo testInfo = {0};2890 HandshakeTestInfo testInfo = {0};
2891 testInfo.state = TRY_RECV_FINISH;2891 testInfo.state = TRY_RECV_FINISH;
2892 testInfo.isClient = true;2892 testInfo.isClient = true;
2893- testInfo.isSupportExtendMasterSecret = true;2893+ testInfo.isSupportExtendedMasterSecret = true;
2894 testInfo.isSupportClientVerify = true;2894 testInfo.isSupportClientVerify = true;
2895 /* 1. Use the default configuration items to configure the client and server. */2895 /* 1. Use the default configuration items to configure the client and server. */
2896 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);2896 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
@@ -2965,7 +2965,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_MSGLENGTH_TOOLONG_FUNC_TC001(void)
2965 FRAME_Msg frameMsg = {0};2965 FRAME_Msg frameMsg = {0};
2966 FRAME_Type frameType = {0};2966 FRAME_Type frameType = {0};
2967 testInfo.state = TRY_RECV_CLIENT_HELLO;2967 testInfo.state = TRY_RECV_CLIENT_HELLO;
2968- testInfo.isSupportExtendMasterSecret = true;2968+ testInfo.isSupportExtendedMasterSecret = true;
2969 testInfo.isClient = false;2969 testInfo.isClient = false;
2970 /* 1. Use the default configuration items to configure the client and server. */2970 /* 1. Use the default configuration items to configure the client and server. */
2971 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);2971 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
@@ -3046,7 +3046,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_MSGLENGTH_TOOLONG_FUNC_TC002(void)
3046 FRAME_Msg frameMsg = {0};3046 FRAME_Msg frameMsg = {0};
3047 FRAME_Type frameType = {0};3047 FRAME_Type frameType = {0};
3048 testInfo.state = TRY_RECV_SERVER_HELLO;3048 testInfo.state = TRY_RECV_SERVER_HELLO;
3049- testInfo.isSupportExtendMasterSecret = true;3049+ testInfo.isSupportExtendedMasterSecret = true;
3050 testInfo.isClient = true;3050 testInfo.isClient = true;
3051 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);3051 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
3052 3052 
@@ -3302,7 +3302,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECV_ZEROLENGTH_MSG_FUNC_TC001(void)
3302 FRAME_Msg frameMsg = {0};3302 FRAME_Msg frameMsg = {0};
3303 FRAME_Type frameType = {0};3303 FRAME_Type frameType = {0};
3304 testInfo.state = TRY_RECV_CLIENT_HELLO;3304 testInfo.state = TRY_RECV_CLIENT_HELLO;
3305- testInfo.isSupportExtendMasterSecret = true;3305+ testInfo.isSupportExtendedMasterSecret = true;
3306 testInfo.isClient = false;3306 testInfo.isClient = false;
3307 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);3307 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
3308 3308 
@@ -3364,7 +3364,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECV_ZEROLENGTH_MSG_FUNC_TC002(void)
3364 FRAME_Msg frameMsg = {0};3364 FRAME_Msg frameMsg = {0};
3365 FRAME_Type frameType = {0};3365 FRAME_Type frameType = {0};
3366 testInfo.state = TRY_RECV_SERVER_HELLO;3366 testInfo.state = TRY_RECV_SERVER_HELLO;
3367- testInfo.isSupportExtendMasterSecret = true;3367+ testInfo.isSupportExtendedMasterSecret = true;
3368 testInfo.isClient = true;3368 testInfo.isClient = true;
3369 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);3369 ASSERT_TRUE(DefaultCfgStatusParkWithSuite_1_3(&testInfo) == HITLS_SUCCESS);
3370 3370 
Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_2.c+5-5
@@ -2835,7 +2835,7 @@ void UT_TLS1_3_RFC8446_Legacy_Version_TC001(int statehs)
2835 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2835 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2836 ASSERT_TRUE(tlsConfig != NULL);2836 ASSERT_TRUE(tlsConfig != NULL);
2837 2837 
2838- tlsConfig->isSupportExtendMasterSecret = true;2838+ tlsConfig->isSupportExtendedMasterSecret = true;
2839 tlsConfig->isSupportClientVerify = true;2839 tlsConfig->isSupportClientVerify = true;
2840 tlsConfig->isSupportNoClientCert = true;2840 tlsConfig->isSupportNoClientCert = true;
2841 2841 
@@ -2893,7 +2893,7 @@ void UT_TLS1_3_RFC8446_Legacy_Version_TC002(int statehs)
2893 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2893 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2894 ASSERT_TRUE(tlsConfig != NULL);2894 ASSERT_TRUE(tlsConfig != NULL);
2895 2895 
2896- tlsConfig->isSupportExtendMasterSecret = true;2896+ tlsConfig->isSupportExtendedMasterSecret = true;
2897 tlsConfig->isSupportClientVerify = true;2897 tlsConfig->isSupportClientVerify = true;
2898 tlsConfig->isSupportNoClientCert = true;2898 tlsConfig->isSupportNoClientCert = true;
2899 2899 
@@ -2952,7 +2952,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_ALERT_PROCESS_TC001()
2952 FRAME_Init();2952 FRAME_Init();
2953 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2953 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2954 2954 
2955- tlsConfig->isSupportExtendMasterSecret = true;2955+ tlsConfig->isSupportExtendedMasterSecret = true;
2956 tlsConfig->isSupportClientVerify = true;2956 tlsConfig->isSupportClientVerify = true;
2957 tlsConfig->isSupportNoClientCert = false;2957 tlsConfig->isSupportNoClientCert = false;
2958 2958 
@@ -3211,7 +3211,7 @@ void UT_TLS_SDV_TLS1_3_RFC8446_CONSISTENCY_RECEIVES_ENCRYPTED_CCS_TC001(void)
3211 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();3211 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
3212 ASSERT_TRUE(tlsConfig != NULL);3212 ASSERT_TRUE(tlsConfig != NULL);
3213 3213 
3214- tlsConfig->isSupportExtendMasterSecret = true;3214+ tlsConfig->isSupportExtendedMasterSecret = true;
3215 tlsConfig->isSupportClientVerify = true;3215 tlsConfig->isSupportClientVerify = true;
3216 tlsConfig->isSupportNoClientCert = true;3216 tlsConfig->isSupportNoClientCert = true;
3217 FRAME_LinkObj *client = NULL;3217 FRAME_LinkObj *client = NULL;
@@ -3395,7 +3395,7 @@ void UT_TLS_SDV_TLS1_3_RFC8446_CONSISTENCY_Legacy_Version_TC001(int statehs)
3395 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();3395 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
3396 ASSERT_TRUE(tlsConfig != NULL);3396 ASSERT_TRUE(tlsConfig != NULL);
3397 3397 
3398- tlsConfig->isSupportExtendMasterSecret = true;3398+ tlsConfig->isSupportExtendedMasterSecret = true;
3399 tlsConfig->isSupportClientVerify = true;3399 tlsConfig->isSupportClientVerify = true;
3400 tlsConfig->isSupportNoClientCert = true;3400 tlsConfig->isSupportNoClientCert = true;
3401 3401 
Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_kex.c+4-4
@@ -2416,7 +2416,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_DATA_AFTER_COMPRESSION_FUNC_TC001()
2416{2416{
2417 FRAME_Init();2417 FRAME_Init();
2418 HITLS_Config *tlsConfig_s = HITLS_CFG_NewTLSConfig();2418 HITLS_Config *tlsConfig_s = HITLS_CFG_NewTLSConfig();
2419- tlsConfig_s->isSupportExtendMasterSecret = false;2419+ tlsConfig_s->isSupportExtendedMasterSecret = false;
2420 tlsConfig_s->isSupportClientVerify = true;2420 tlsConfig_s->isSupportClientVerify = true;
2421 HITLS_CFG_SetKeyExchMode(tlsConfig_s, TLS13_KE_MODE_PSK_WITH_DHE);2421 HITLS_CFG_SetKeyExchMode(tlsConfig_s, TLS13_KE_MODE_PSK_WITH_DHE);
2422 HITLS_CFG_SetVersionSupport(tlsConfig_s, 0x00000030U);2422 HITLS_CFG_SetVersionSupport(tlsConfig_s, 0x00000030U);
@@ -2443,7 +2443,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_DATA_AFTER_COMPRESSION_FUNC_TC001()
2443 /* Set tls1.2 on the client and tls1.3 on the server. Construct the clienthello compression algorithm without2443 /* Set tls1.2 on the client and tls1.3 on the server. Construct the clienthello compression algorithm without
2444 * any extension. */2444 * any extension. */
2445 HITLS_Config *tlsConfig_c = HITLS_CFG_NewTLS12Config();2445 HITLS_Config *tlsConfig_c = HITLS_CFG_NewTLS12Config();
2446- tlsConfig_c->isSupportExtendMasterSecret = false;2446+ tlsConfig_c->isSupportExtendedMasterSecret = false;
2447 tlsConfig_c->isSupportClientVerify = true;2447 tlsConfig_c->isSupportClientVerify = true;
2448 ASSERT_TRUE(tlsConfig_c != NULL);2448 ASSERT_TRUE(tlsConfig_c != NULL);
2449 2449 
@@ -3097,7 +3097,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SERVER_EXTENSION_FUNC_TC002()
3097 FRAME_Init();3097 FRAME_Init();
3098 3098 
3099 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();3099 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
3100- tlsConfig->isSupportExtendMasterSecret = false;3100+ tlsConfig->isSupportExtendedMasterSecret = false;
3101 tlsConfig->isSupportClientVerify = true;3101 tlsConfig->isSupportClientVerify = true;
3102 HITLS_CFG_SetKeyExchMode(tlsConfig, TLS13_KE_MODE_PSK_WITH_DHE);3102 HITLS_CFG_SetKeyExchMode(tlsConfig, TLS13_KE_MODE_PSK_WITH_DHE);
3103 ASSERT_TRUE(tlsConfig != NULL);3103 ASSERT_TRUE(tlsConfig != NULL);
@@ -3544,7 +3544,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_HRR_EXTENSION_FUNC_TC001()
3544 FRAME_Init();3544 FRAME_Init();
3545 3545 
3546 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();3546 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
3547- tlsConfig->isSupportExtendMasterSecret = false;3547+ tlsConfig->isSupportExtendedMasterSecret = false;
3548 tlsConfig->isSupportClientVerify = true;3548 tlsConfig->isSupportClientVerify = true;
3549 HITLS_CFG_SetKeyExchMode(tlsConfig, TLS13_KE_MODE_PSK_WITH_DHE);3549 HITLS_CFG_SetKeyExchMode(tlsConfig, TLS13_KE_MODE_PSK_WITH_DHE);
3550 ASSERT_TRUE(tlsConfig != NULL);3550 ASSERT_TRUE(tlsConfig != NULL);
Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_sdv_frame_tls13_consistency_rfc8446_record.c+36-36
@@ -136,7 +136,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC001(void)
136 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();136 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
137 ASSERT_TRUE(tlsConfig != NULL);137 ASSERT_TRUE(tlsConfig != NULL);
138 138 
139- tlsConfig->isSupportExtendMasterSecret = true;139+ tlsConfig->isSupportExtendedMasterSecret = true;
140 tlsConfig->isSupportClientVerify = true;140 tlsConfig->isSupportClientVerify = true;
141 tlsConfig->isSupportNoClientCert = true;141 tlsConfig->isSupportNoClientCert = true;
142 FRAME_LinkObj *client = NULL;142 FRAME_LinkObj *client = NULL;
@@ -201,7 +201,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC002(void)
201 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();201 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
202 ASSERT_TRUE(tlsConfig != NULL);202 ASSERT_TRUE(tlsConfig != NULL);
203 203 
204- tlsConfig->isSupportExtendMasterSecret = true;204+ tlsConfig->isSupportExtendedMasterSecret = true;
205 tlsConfig->isSupportClientVerify = true;205 tlsConfig->isSupportClientVerify = true;
206 tlsConfig->isSupportNoClientCert = true;206 tlsConfig->isSupportNoClientCert = true;
207 FRAME_LinkObj *client = NULL;207 FRAME_LinkObj *client = NULL;
@@ -268,7 +268,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC003(void)
268 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();268 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
269 ASSERT_TRUE(tlsConfig != NULL);269 ASSERT_TRUE(tlsConfig != NULL);
270 270 
271- tlsConfig->isSupportExtendMasterSecret = true;271+ tlsConfig->isSupportExtendedMasterSecret = true;
272 tlsConfig->isSupportClientVerify = true;272 tlsConfig->isSupportClientVerify = true;
273 tlsConfig->isSupportNoClientCert = true;273 tlsConfig->isSupportNoClientCert = true;
274 274 
@@ -344,7 +344,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC004(void)
344 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();344 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
345 ASSERT_TRUE(tlsConfig != NULL);345 ASSERT_TRUE(tlsConfig != NULL);
346 346 
347- tlsConfig->isSupportExtendMasterSecret = true;347+ tlsConfig->isSupportExtendedMasterSecret = true;
348 tlsConfig->isSupportClientVerify = true;348 tlsConfig->isSupportClientVerify = true;
349 tlsConfig->isSupportNoClientCert = true;349 tlsConfig->isSupportNoClientCert = true;
350 350 
@@ -430,7 +430,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC005(void)
430 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();430 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
431 ASSERT_TRUE(tlsConfig != NULL);431 ASSERT_TRUE(tlsConfig != NULL);
432 432 
433- tlsConfig->isSupportExtendMasterSecret = true;433+ tlsConfig->isSupportExtendedMasterSecret = true;
434 tlsConfig->isSupportClientVerify = true;434 tlsConfig->isSupportClientVerify = true;
435 tlsConfig->isSupportNoClientCert = true;435 tlsConfig->isSupportNoClientCert = true;
436 FRAME_LinkObj *client = NULL;436 FRAME_LinkObj *client = NULL;
@@ -497,7 +497,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_IGNORE_CCS_FUNC_TC006(void)
497 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();497 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
498 ASSERT_TRUE(tlsConfig != NULL);498 ASSERT_TRUE(tlsConfig != NULL);
499 499 
500- tlsConfig->isSupportExtendMasterSecret = true;500+ tlsConfig->isSupportExtendedMasterSecret = true;
501 tlsConfig->isSupportClientVerify = true;501 tlsConfig->isSupportClientVerify = true;
502 tlsConfig->isSupportNoClientCert = true;502 tlsConfig->isSupportNoClientCert = true;
503 FRAME_LinkObj *client = NULL;503 FRAME_LinkObj *client = NULL;
@@ -564,7 +564,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC001(void)
564 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();564 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
565 ASSERT_TRUE(tlsConfig != NULL);565 ASSERT_TRUE(tlsConfig != NULL);
566 566 
567- tlsConfig->isSupportExtendMasterSecret = true;567+ tlsConfig->isSupportExtendedMasterSecret = true;
568 tlsConfig->isSupportClientVerify = true;568 tlsConfig->isSupportClientVerify = true;
569 tlsConfig->isSupportNoClientCert = true;569 tlsConfig->isSupportNoClientCert = true;
570 FRAME_LinkObj *client = NULL;570 FRAME_LinkObj *client = NULL;
@@ -627,7 +627,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC002(void)
627 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();627 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
628 ASSERT_TRUE(tlsConfig != NULL);628 ASSERT_TRUE(tlsConfig != NULL);
629 629 
630- tlsConfig->isSupportExtendMasterSecret = true;630+ tlsConfig->isSupportExtendedMasterSecret = true;
631 tlsConfig->isSupportClientVerify = true;631 tlsConfig->isSupportClientVerify = true;
632 tlsConfig->isSupportNoClientCert = true;632 tlsConfig->isSupportNoClientCert = true;
633 FRAME_LinkObj *client = NULL;633 FRAME_LinkObj *client = NULL;
@@ -689,7 +689,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC003(void)
689 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();689 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
690 ASSERT_TRUE(tlsConfig != NULL);690 ASSERT_TRUE(tlsConfig != NULL);
691 691 
692- tlsConfig->isSupportExtendMasterSecret = true;692+ tlsConfig->isSupportExtendedMasterSecret = true;
693 tlsConfig->isSupportClientVerify = true;693 tlsConfig->isSupportClientVerify = true;
694 tlsConfig->isSupportNoClientCert = true;694 tlsConfig->isSupportNoClientCert = true;
695 FRAME_LinkObj *client = NULL;695 FRAME_LinkObj *client = NULL;
@@ -748,7 +748,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC004(void)
748 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();748 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
749 ASSERT_TRUE(tlsConfig != NULL);749 ASSERT_TRUE(tlsConfig != NULL);
750 750 
751- tlsConfig->isSupportExtendMasterSecret = true;751+ tlsConfig->isSupportExtendedMasterSecret = true;
752 tlsConfig->isSupportClientVerify = true;752 tlsConfig->isSupportClientVerify = true;
753 tlsConfig->isSupportNoClientCert = true;753 tlsConfig->isSupportNoClientCert = true;
754 FRAME_LinkObj *client = NULL;754 FRAME_LinkObj *client = NULL;
@@ -808,7 +808,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC005(void)
808 FRAME_Init();808 FRAME_Init();
809 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();809 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
810 ASSERT_TRUE(tlsConfig != NULL);810 ASSERT_TRUE(tlsConfig != NULL);
811- tlsConfig->isSupportExtendMasterSecret = true;811+ tlsConfig->isSupportExtendedMasterSecret = true;
812 tlsConfig->isSupportClientVerify = true;812 tlsConfig->isSupportClientVerify = true;
813 tlsConfig->isSupportNoClientCert = true;813 tlsConfig->isSupportNoClientCert = true;
814 FRAME_LinkObj *client = NULL;814 FRAME_LinkObj *client = NULL;
@@ -874,7 +874,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC006(void)
874 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();874 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
875 ASSERT_TRUE(tlsConfig != NULL);875 ASSERT_TRUE(tlsConfig != NULL);
876 876 
877- tlsConfig->isSupportExtendMasterSecret = true;877+ tlsConfig->isSupportExtendedMasterSecret = true;
878 tlsConfig->isSupportClientVerify = true;878 tlsConfig->isSupportClientVerify = true;
879 tlsConfig->isSupportNoClientCert = true;879 tlsConfig->isSupportNoClientCert = true;
880 FRAME_LinkObj *client = NULL;880 FRAME_LinkObj *client = NULL;
@@ -933,7 +933,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC007(void)
933 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();933 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
934 ASSERT_TRUE(tlsConfig != NULL);934 ASSERT_TRUE(tlsConfig != NULL);
935 935 
936- tlsConfig->isSupportExtendMasterSecret = true;936+ tlsConfig->isSupportExtendedMasterSecret = true;
937 tlsConfig->isSupportClientVerify = true;937 tlsConfig->isSupportClientVerify = true;
938 tlsConfig->isSupportNoClientCert = true;938 tlsConfig->isSupportNoClientCert = true;
939 FRAME_LinkObj *client = NULL;939 FRAME_LinkObj *client = NULL;
@@ -994,7 +994,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC008(void)
994 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();994 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
995 ASSERT_TRUE(tlsConfig != NULL);995 ASSERT_TRUE(tlsConfig != NULL);
996 996 
997- tlsConfig->isSupportExtendMasterSecret = true;997+ tlsConfig->isSupportExtendedMasterSecret = true;
998 tlsConfig->isSupportClientVerify = true;998 tlsConfig->isSupportClientVerify = true;
999 tlsConfig->isSupportNoClientCert = true;999 tlsConfig->isSupportNoClientCert = true;
1000 FRAME_LinkObj *client = NULL;1000 FRAME_LinkObj *client = NULL;
@@ -1069,7 +1069,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC009(void)
1069 FRAME_Init();1069 FRAME_Init();
1070 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1070 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1071 ASSERT_TRUE(tlsConfig != NULL);1071 ASSERT_TRUE(tlsConfig != NULL);
1072- tlsConfig->isSupportExtendMasterSecret = true;1072+ tlsConfig->isSupportExtendedMasterSecret = true;
1073 tlsConfig->isSupportClientVerify = true;1073 tlsConfig->isSupportClientVerify = true;
1074 tlsConfig->isSupportNoClientCert = true;1074 tlsConfig->isSupportNoClientCert = true;
1075 FRAME_LinkObj *client = NULL;1075 FRAME_LinkObj *client = NULL;
@@ -1150,7 +1150,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC010(void)
1150 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1150 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1151 ASSERT_TRUE(tlsConfig != NULL);1151 ASSERT_TRUE(tlsConfig != NULL);
1152 1152 
1153- tlsConfig->isSupportExtendMasterSecret = true;1153+ tlsConfig->isSupportExtendedMasterSecret = true;
1154 tlsConfig->isSupportClientVerify = true;1154 tlsConfig->isSupportClientVerify = true;
1155 tlsConfig->isSupportNoClientCert = true;1155 tlsConfig->isSupportNoClientCert = true;
1156 FRAME_LinkObj *client = NULL;1156 FRAME_LinkObj *client = NULL;
@@ -1228,7 +1228,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC011(void)
1228 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1228 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1229 ASSERT_TRUE(tlsConfig != NULL);1229 ASSERT_TRUE(tlsConfig != NULL);
1230 1230 
1231- tlsConfig->isSupportExtendMasterSecret = true;1231+ tlsConfig->isSupportExtendedMasterSecret = true;
1232 tlsConfig->isSupportClientVerify = true;1232 tlsConfig->isSupportClientVerify = true;
1233 tlsConfig->isSupportNoClientCert = true;1233 tlsConfig->isSupportNoClientCert = true;
1234 FRAME_LinkObj *client = NULL;1234 FRAME_LinkObj *client = NULL;
@@ -1313,7 +1313,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC012(void)
1313 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1313 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1314 ASSERT_TRUE(tlsConfig != NULL);1314 ASSERT_TRUE(tlsConfig != NULL);
1315 1315 
1316- tlsConfig->isSupportExtendMasterSecret = true;1316+ tlsConfig->isSupportExtendedMasterSecret = true;
1317 tlsConfig->isSupportClientVerify = true;1317 tlsConfig->isSupportClientVerify = true;
1318 tlsConfig->isSupportNoClientCert = true;1318 tlsConfig->isSupportNoClientCert = true;
1319 FRAME_LinkObj *client = NULL;1319 FRAME_LinkObj *client = NULL;
@@ -1397,7 +1397,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC013(void)
1397 FRAME_Init();1397 FRAME_Init();
1398 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1398 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1399 ASSERT_TRUE(tlsConfig != NULL);1399 ASSERT_TRUE(tlsConfig != NULL);
1400- tlsConfig->isSupportExtendMasterSecret = true;1400+ tlsConfig->isSupportExtendedMasterSecret = true;
1401 tlsConfig->isSupportClientVerify = true;1401 tlsConfig->isSupportClientVerify = true;
1402 tlsConfig->isSupportNoClientCert = true;1402 tlsConfig->isSupportNoClientCert = true;
1403 FRAME_LinkObj *client = NULL;1403 FRAME_LinkObj *client = NULL;
@@ -1467,7 +1467,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC014(void)
1467 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1467 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1468 ASSERT_TRUE(tlsConfig != NULL);1468 ASSERT_TRUE(tlsConfig != NULL);
1469 1469 
1470- tlsConfig->isSupportExtendMasterSecret = true;1470+ tlsConfig->isSupportExtendedMasterSecret = true;
1471 tlsConfig->isSupportClientVerify = true;1471 tlsConfig->isSupportClientVerify = true;
1472 tlsConfig->isSupportNoClientCert = true;1472 tlsConfig->isSupportNoClientCert = true;
1473 FRAME_LinkObj *client = NULL;1473 FRAME_LinkObj *client = NULL;
@@ -1541,7 +1541,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC015(void)
1541 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1541 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1542 ASSERT_TRUE(tlsConfig != NULL);1542 ASSERT_TRUE(tlsConfig != NULL);
1543 1543 
1544- tlsConfig->isSupportExtendMasterSecret = true;1544+ tlsConfig->isSupportExtendedMasterSecret = true;
1545 tlsConfig->isSupportClientVerify = true;1545 tlsConfig->isSupportClientVerify = true;
1546 tlsConfig->isSupportNoClientCert = true;1546 tlsConfig->isSupportNoClientCert = true;
1547 FRAME_LinkObj *client = NULL;1547 FRAME_LinkObj *client = NULL;
@@ -1612,7 +1612,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_RECEIVES_OTHER_CCS_FUNC_TC016(void)
1612 FRAME_Init();1612 FRAME_Init();
1613 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1613 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1614 ASSERT_TRUE(tlsConfig != NULL);1614 ASSERT_TRUE(tlsConfig != NULL);
1615- tlsConfig->isSupportExtendMasterSecret = true;1615+ tlsConfig->isSupportExtendedMasterSecret = true;
1616 tlsConfig->isSupportClientVerify = true;1616 tlsConfig->isSupportClientVerify = true;
1617 tlsConfig->isSupportNoClientCert = true;1617 tlsConfig->isSupportNoClientCert = true;
1618 FRAME_LinkObj *client = NULL;1618 FRAME_LinkObj *client = NULL;
@@ -1684,7 +1684,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_HANDSHAKE_RECORD_TYPE_FUNC_TC001(void)
1684 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1684 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1685 ASSERT_TRUE(tlsConfig != NULL);1685 ASSERT_TRUE(tlsConfig != NULL);
1686 1686 
1687- tlsConfig->isSupportExtendMasterSecret = true;1687+ tlsConfig->isSupportExtendedMasterSecret = true;
1688 tlsConfig->isSupportClientVerify = true;1688 tlsConfig->isSupportClientVerify = true;
1689 tlsConfig->isSupportNoClientCert = true;1689 tlsConfig->isSupportNoClientCert = true;
1690 FRAME_LinkObj *client = NULL;1690 FRAME_LinkObj *client = NULL;
@@ -1737,7 +1737,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_HANDSHAKE_RECORD_TYPE_FUNC_TC002(void)
1737 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1737 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1738 ASSERT_TRUE(tlsConfig != NULL);1738 ASSERT_TRUE(tlsConfig != NULL);
1739 1739 
1740- tlsConfig->isSupportExtendMasterSecret = true;1740+ tlsConfig->isSupportExtendedMasterSecret = true;
1741 tlsConfig->isSupportClientVerify = true;1741 tlsConfig->isSupportClientVerify = true;
1742 tlsConfig->isSupportNoClientCert = true;1742 tlsConfig->isSupportNoClientCert = true;
1743 FRAME_LinkObj *client = NULL;1743 FRAME_LinkObj *client = NULL;
@@ -1777,7 +1777,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SINGLE_ALERT_FUNC_TC001(void)
1777 FRAME_Init();1777 FRAME_Init();
1778 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1778 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1779 ASSERT_TRUE(tlsConfig != NULL);1779 ASSERT_TRUE(tlsConfig != NULL);
1780- tlsConfig->isSupportExtendMasterSecret = true;1780+ tlsConfig->isSupportExtendedMasterSecret = true;
1781 tlsConfig->isSupportClientVerify = true;1781 tlsConfig->isSupportClientVerify = true;
1782 tlsConfig->isSupportNoClientCert = true;1782 tlsConfig->isSupportNoClientCert = true;
1783 FRAME_LinkObj *client = NULL;1783 FRAME_LinkObj *client = NULL;
@@ -1819,7 +1819,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SINGLE_ALERT_FUNC_TC002(void)
1819 FRAME_Init();1819 FRAME_Init();
1820 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1820 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1821 ASSERT_TRUE(tlsConfig != NULL);1821 ASSERT_TRUE(tlsConfig != NULL);
1822- tlsConfig->isSupportExtendMasterSecret = true;1822+ tlsConfig->isSupportExtendedMasterSecret = true;
1823 tlsConfig->isSupportClientVerify = true;1823 tlsConfig->isSupportClientVerify = true;
1824 tlsConfig->isSupportNoClientCert = true;1824 tlsConfig->isSupportNoClientCert = true;
1825 FRAME_LinkObj *client = NULL;1825 FRAME_LinkObj *client = NULL;
@@ -1872,7 +1872,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_LEGACY_RECORD_VERSION_FUNC_TC001(void)
1872 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1872 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1873 ASSERT_TRUE(tlsConfig != NULL);1873 ASSERT_TRUE(tlsConfig != NULL);
1874 1874 
1875- tlsConfig->isSupportExtendMasterSecret = true;1875+ tlsConfig->isSupportExtendedMasterSecret = true;
1876 tlsConfig->isSupportClientVerify = true;1876 tlsConfig->isSupportClientVerify = true;
1877 tlsConfig->isSupportNoClientCert = true;1877 tlsConfig->isSupportNoClientCert = true;
1878 FRAME_LinkObj *client = NULL;1878 FRAME_LinkObj *client = NULL;
@@ -1928,7 +1928,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_LEGACY_RECORD_VERSION_FUNC_TC002(void)
1928 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1928 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1929 ASSERT_TRUE(tlsConfig != NULL);1929 ASSERT_TRUE(tlsConfig != NULL);
1930 1930 
1931- tlsConfig->isSupportExtendMasterSecret = true;1931+ tlsConfig->isSupportExtendedMasterSecret = true;
1932 tlsConfig->isSupportClientVerify = true;1932 tlsConfig->isSupportClientVerify = true;
1933 tlsConfig->isSupportNoClientCert = true;1933 tlsConfig->isSupportNoClientCert = true;
1934 FRAME_LinkObj *client = NULL;1934 FRAME_LinkObj *client = NULL;
@@ -1987,7 +1987,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_LEGACY_RECORD_VERSION_FUNC_TC003(void)
1987 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();1987 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
1988 ASSERT_TRUE(tlsConfig != NULL);1988 ASSERT_TRUE(tlsConfig != NULL);
1989 1989 
1990- tlsConfig->isSupportExtendMasterSecret = true;1990+ tlsConfig->isSupportExtendedMasterSecret = true;
1991 tlsConfig->isSupportClientVerify = true;1991 tlsConfig->isSupportClientVerify = true;
1992 tlsConfig->isSupportNoClientCert = true;1992 tlsConfig->isSupportNoClientCert = true;
1993 FRAME_LinkObj *client = NULL;1993 FRAME_LinkObj *client = NULL;
@@ -2073,7 +2073,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_LEGACY_RECORD_VERSION_FUNC_TC004(void)
2073 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2073 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2074 ASSERT_TRUE(tlsConfig != NULL);2074 ASSERT_TRUE(tlsConfig != NULL);
2075 2075 
2076- tlsConfig->isSupportExtendMasterSecret = true;2076+ tlsConfig->isSupportExtendedMasterSecret = true;
2077 tlsConfig->isSupportClientVerify = true;2077 tlsConfig->isSupportClientVerify = true;
2078 tlsConfig->isSupportNoClientCert = true;2078 tlsConfig->isSupportNoClientCert = true;
2079 FRAME_LinkObj *client = NULL;2079 FRAME_LinkObj *client = NULL;
@@ -2148,7 +2148,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_LEGACY_RECORD_VERSION_FUNC_TC005(void)
2148 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2148 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2149 ASSERT_TRUE(tlsConfig != NULL);2149 ASSERT_TRUE(tlsConfig != NULL);
2150 2150 
2151- tlsConfig->isSupportExtendMasterSecret = true;2151+ tlsConfig->isSupportExtendedMasterSecret = true;
2152 tlsConfig->isSupportClientVerify = true;2152 tlsConfig->isSupportClientVerify = true;
2153 tlsConfig->isSupportNoClientCert = true;2153 tlsConfig->isSupportNoClientCert = true;
2154 FRAME_LinkObj *client = NULL;2154 FRAME_LinkObj *client = NULL;
@@ -2312,7 +2312,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_CIPHERTEXT_LENGTH_FUNC_TC001(void)
2312 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2312 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2313 ASSERT_TRUE(tlsConfig != NULL);2313 ASSERT_TRUE(tlsConfig != NULL);
2314 2314 
2315- tlsConfig->isSupportExtendMasterSecret = true;2315+ tlsConfig->isSupportExtendedMasterSecret = true;
2316 tlsConfig->isSupportClientVerify = true;2316 tlsConfig->isSupportClientVerify = true;
2317 tlsConfig->isSupportNoClientCert = true;2317 tlsConfig->isSupportNoClientCert = true;
2318 FRAME_LinkObj *client = NULL;2318 FRAME_LinkObj *client = NULL;
@@ -2366,7 +2366,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_CIPHERTEXT_LENGTH_FUNC_TC002(void)
2366 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2366 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2367 ASSERT_TRUE(tlsConfig != NULL);2367 ASSERT_TRUE(tlsConfig != NULL);
2368 2368 
2369- tlsConfig->isSupportExtendMasterSecret = true;2369+ tlsConfig->isSupportExtendedMasterSecret = true;
2370 tlsConfig->isSupportClientVerify = true;2370 tlsConfig->isSupportClientVerify = true;
2371 tlsConfig->isSupportNoClientCert = true;2371 tlsConfig->isSupportNoClientCert = true;
2372 FRAME_LinkObj *client = NULL;2372 FRAME_LinkObj *client = NULL;
@@ -2419,7 +2419,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SEQUENCE_NUMBER_FUNC_TC001(void)
2419 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2419 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2420 ASSERT_TRUE(tlsConfig != NULL);2420 ASSERT_TRUE(tlsConfig != NULL);
2421 2421 
2422- tlsConfig->isSupportExtendMasterSecret = true;2422+ tlsConfig->isSupportExtendedMasterSecret = true;
2423 tlsConfig->isSupportClientVerify = true;2423 tlsConfig->isSupportClientVerify = true;
2424 tlsConfig->isSupportNoClientCert = true;2424 tlsConfig->isSupportNoClientCert = true;
2425 FRAME_LinkObj *client = NULL;2425 FRAME_LinkObj *client = NULL;
@@ -2471,7 +2471,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SEQUENCE_NUMBER_FUNC_TC002(void)
2471 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2471 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2472 ASSERT_TRUE(tlsConfig != NULL);2472 ASSERT_TRUE(tlsConfig != NULL);
2473 2473 
2474- tlsConfig->isSupportExtendMasterSecret = true;2474+ tlsConfig->isSupportExtendedMasterSecret = true;
2475 tlsConfig->isSupportClientVerify = true;2475 tlsConfig->isSupportClientVerify = true;
2476 tlsConfig->isSupportNoClientCert = true;2476 tlsConfig->isSupportNoClientCert = true;
2477 FRAME_LinkObj *client = NULL;2477 FRAME_LinkObj *client = NULL;
@@ -2524,7 +2524,7 @@ void UT_TLS_TLS13_RFC8446_CONSISTENCY_SEQUENCE_NUMBER_FUNC_TC003(void)
2524 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();2524 HITLS_Config *tlsConfig = HITLS_CFG_NewTLS13Config();
2525 ASSERT_TRUE(tlsConfig != NULL);2525 ASSERT_TRUE(tlsConfig != NULL);
2526 2526 
2527- tlsConfig->isSupportExtendMasterSecret = true;2527+ tlsConfig->isSupportExtendedMasterSecret = true;
2528 tlsConfig->isSupportClientVerify = true;2528 tlsConfig->isSupportClientVerify = true;
2529 tlsConfig->isSupportNoClientCert = true;2529 tlsConfig->isSupportNoClientCert = true;
2530 FRAME_LinkObj *client = NULL;2530 FRAME_LinkObj *client = NULL;
Mtestcode/sdv/testcase/tls/consistency/tls13/test_suite_tls13_consistency_rfc8446.base.c+4-4
@@ -64,10 +64,10 @@ typedef struct {
64 FRAME_LinkObj *server;64 FRAME_LinkObj *server;
65 HITLS_HandshakeState state;65 HITLS_HandshakeState state;
66 bool isClient;66 bool isClient;
67- bool isSupportExtendMasterSecret;67+ bool isSupportExtendedMasterSecret;
68 bool isSupportClientVerify;68 bool isSupportClientVerify;
69 bool isSupportNoClientCert;69 bool isSupportNoClientCert;
70- bool isServerExtendMasterSecret;70+ bool isServerExtendedMasterSecret;
71 bool isSupportRenegotiation; /* Renegotiation support flag */71 bool isSupportRenegotiation; /* Renegotiation support flag */
72 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */72 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */
73} HandshakeTestInfo;73} HandshakeTestInfo;
@@ -110,7 +110,7 @@ int32_t DefaultCfgStatusPark(HandshakeTestInfo *testInfo)
110 return HITLS_INTERNAL_EXCEPTION;110 return HITLS_INTERNAL_EXCEPTION;
111 }111 }
112 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);112 HITLS_CFG_SetCheckKeyUsage(testInfo->config, false);
113- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;113+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
114 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;114 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
115 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;115 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
116 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;116 testInfo->config->isSupportRenegotiation = testInfo->isSupportRenegotiation;
@@ -131,7 +131,7 @@ int32_t DefaultCfgStatusParkWithSuite(HandshakeTestInfo *testInfo)
131 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};131 uint16_t cipherSuits[] = {HITLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256};
132 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));132 HITLS_CFG_SetCipherSuites(testInfo->config, cipherSuits, sizeof(cipherSuits) / sizeof(uint16_t));
133 133 
134- testInfo->config->isSupportExtendMasterSecret = testInfo->isSupportExtendMasterSecret;134+ testInfo->config->isSupportExtendedMasterSecret = testInfo->isSupportExtendedMasterSecret;
135 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;135 testInfo->config->isSupportClientVerify = testInfo->isSupportClientVerify;
136 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;136 testInfo->config->isSupportNoClientCert = testInfo->isSupportNoClientCert;
137 137 
Mtestcode/sdv/testcase/tls/interface/test_suite_sdv_frame_tls_config_1.c+2-2
@@ -316,8 +316,8 @@ EXIT:
316* 3. Transfer the non-null configuration information and the isSupport pointer is not null. Expected result 3 is316* 3. Transfer the non-null configuration information and the isSupport pointer is not null. Expected result 3 is
317* obtained.317* obtained.
318* @expect 1. Returns HITLS_NULL_INPUT318* @expect 1. Returns HITLS_NULL_INPUT
319-* 2. HITLS_SUCCES is returned and config->isSupportExtendMasterSecret is true.319+* 2. HITLS_SUCCES is returned and config->isSupportExtendedMasterSecret is true.
320-* 3. Returns HITLS_SUCCES and config->isSupportExtendMasterSecret is true or false.320+* 3. Returns HITLS_SUCCES and config->isSupportExtendedMasterSecret is true or false.
321@ */321@ */
322 322 
323/* BEGIN_CASE */323/* BEGIN_CASE */
Mtestcode/sdv/testcase/tls/interface_tlcp/test_suite_interface.base.c+2-2
@@ -61,10 +61,10 @@ typedef struct {
61 FRAME_LinkObj *server;61 FRAME_LinkObj *server;
62 HITLS_HandshakeState state;62 HITLS_HandshakeState state;
63 bool isClient;63 bool isClient;
64- bool isSupportExtendMasterSecret;64+ bool isSupportExtendedMasterSecret;
65 bool isSupportClientVerify;65 bool isSupportClientVerify;
66 bool isSupportNoClientCert;66 bool isSupportNoClientCert;
67- bool isServerExtendMasterSecret;67+ bool isServerExtendedMasterSecret;
68 bool isSupportRenegotiation; /* Renegotiation support flag */68 bool isSupportRenegotiation; /* Renegotiation support flag */
69 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */69 bool needStopBeforeRecvCCS; /* CCS test, so that the TRY_RECV_FINISH stops before the CCS message is received */
70} HandshakeTestInfo;70} HandshakeTestInfo;
Mtestcode/sdv/testcase/tls/interface_tlcp/test_suite_sdv_frame_cm_interface.c+1-1
@@ -91,7 +91,7 @@ typedef struct {
91 FRAME_LinkObj *server;91 FRAME_LinkObj *server;
92 HITLS_HandshakeState state;92 HITLS_HandshakeState state;
93 bool isClient;93 bool isClient;
94- bool isSupportExtendMasterSecret;94+ bool isSupportExtendedMasterSecret;
95 bool isSupportClientVerify;95 bool isSupportClientVerify;
96 bool isSupportNoClientCert;96 bool isSupportNoClientCert;
97 bool isSupportRenegotiation;97 bool isSupportRenegotiation;
Mtestcode/sdv/testcase/tls/interface_tlcp/test_suite_sdv_frame_config_interface.c+1-1
@@ -1122,7 +1122,7 @@ typedef struct {
1122 FRAME_LinkObj *server;1122 FRAME_LinkObj *server;
1123 HITLS_HandshakeState state;1123 HITLS_HandshakeState state;
1124 bool isClient;1124 bool isClient;
1125- bool isSupportExtendMasterSecret;1125+ bool isSupportExtendedMasterSecret;
1126 bool isSupportClientVerify;1126 bool isSupportClientVerify;
1127 bool isSupportNoClientCert;1127 bool isSupportNoClientCert;
1128 bool isSupportRenegotiation;1128 bool isSupportRenegotiation;
Mtls/config/src/config.c+3-3
@@ -143,7 +143,7 @@ static void ShallowCopy(HITLS_Ctx *ctx, const HITLS_Config *srcConfig)
143 destConfig->isQuietShutdown = srcConfig->isQuietShutdown;143 destConfig->isQuietShutdown = srcConfig->isQuietShutdown;
144 destConfig->isSupportServerPreference = srcConfig->isSupportServerPreference;144 destConfig->isSupportServerPreference = srcConfig->isSupportServerPreference;
145 destConfig->maxCertList = srcConfig->maxCertList;145 destConfig->maxCertList = srcConfig->maxCertList;
146- destConfig->isSupportExtendMasterSecret = srcConfig->isSupportExtendMasterSecret;146+ destConfig->isSupportExtendedMasterSecret = srcConfig->isSupportExtendedMasterSecret;
147 destConfig->emptyRecordsNum = srcConfig->emptyRecordsNum;147 destConfig->emptyRecordsNum = srcConfig->emptyRecordsNum;
148 destConfig->isKeepPeerCert = srcConfig->isKeepPeerCert;148 destConfig->isKeepPeerCert = srcConfig->isKeepPeerCert;
149 destConfig->version = srcConfig->version;149 destConfig->version = srcConfig->version;
@@ -1496,7 +1496,7 @@ int32_t HITLS_CFG_SetExtendedMasterSecretSupport(HITLS_Config *config, bool supp
1496 if (config == NULL) {1496 if (config == NULL) {
1497 return HITLS_NULL_INPUT;1497 return HITLS_NULL_INPUT;
1498 }1498 }
1499- config->isSupportExtendMasterSecret = support;1499+ config->isSupportExtendedMasterSecret = support;
1500 return HITLS_SUCCESS;1500 return HITLS_SUCCESS;
1501}1501}
1502 1502 
@@ -1578,7 +1578,7 @@ int32_t HITLS_CFG_GetExtendedMasterSecretSupport(HITLS_Config *config, bool *isS
1578 return HITLS_NULL_INPUT;1578 return HITLS_NULL_INPUT;
1579 }1579 }
1580 1580 
1581- *isSupport = config->isSupportExtendMasterSecret;1581+ *isSupport = config->isSupportExtendedMasterSecret;
1582 return HITLS_SUCCESS;1582 return HITLS_SUCCESS;
1583}1583}
1584 1584 
Mtls/config/src/config_default.c+2-2
@@ -164,7 +164,7 @@ static int32_t SetDefaultPointFormats(HITLS_Config *config)
164 164 
165static void BasicInitConfig(HITLS_Config *config)165static void BasicInitConfig(HITLS_Config *config)
166{166{
167- config->isSupportExtendMasterSecret = false;167+ config->isSupportExtendedMasterSecret = false;
168 config->emptyRecordsNum = HITLS_MAX_EMPTY_RECORDS;168 config->emptyRecordsNum = HITLS_MAX_EMPTY_RECORDS;
169#if defined(HITLS_TLS_PROTO_TLS_BASIC) || defined(HITLS_TLS_PROTO_DTLS12)169#if defined(HITLS_TLS_PROTO_TLS_BASIC) || defined(HITLS_TLS_PROTO_DTLS12)
170 config->allowLegacyRenegotiate = false;170 config->allowLegacyRenegotiate = false;
@@ -194,7 +194,7 @@ static void InitConfig(HITLS_Config *config)
194 config->isSupportDhAuto = false;194 config->isSupportDhAuto = false;
195#endif195#endif
196 if (config->maxVersion == HITLS_VERSION_TLCP_DTLCP11) {196 if (config->maxVersion == HITLS_VERSION_TLCP_DTLCP11) {
197- config->isSupportExtendMasterSecret = false;197+ config->isSupportExtendedMasterSecret = false;
198 }198 }
199#ifdef HITLS_TLS_FEATURE_FLIGHT199#ifdef HITLS_TLS_FEATURE_FLIGHT
200 config->isFlightTransmitEnable = true;200 config->isFlightTransmitEnable = true;
Mtls/feature/session/src/session_dec.c+2-2
@@ -225,7 +225,7 @@ static int32_t DecSessObjSessionId(HITLS_Session *sess, SessionObjType type, con
225 return HITLS_SUCCESS;225 return HITLS_SUCCESS;
226}226}
227 227 
228-static int32_t DecSessObjExtendMasterSecret(HITLS_Session *sess, SessionObjType type, const uint8_t *data,228+static int32_t DecSessObjExtendedMasterSecret(HITLS_Session *sess, SessionObjType type, const uint8_t *data,
229 uint32_t length, uint32_t *readLen)229 uint32_t length, uint32_t *readLen)
230{230{
231 int32_t ret;231 int32_t ret;
@@ -369,7 +369,7 @@ static const SessObjDecFunc OBJ_LIST[] = {
369#endif369#endif
370 {SESS_OBJ_SESSION_ID_CTX, DecSessObjSessionIdCtx},370 {SESS_OBJ_SESSION_ID_CTX, DecSessObjSessionIdCtx},
371 {SESS_OBJ_SESSION_ID, DecSessObjSessionId},371 {SESS_OBJ_SESSION_ID, DecSessObjSessionId},
372- {SESS_OBJ_SUPPORT_EXTEND_MASTER_SECRET, DecSessObjExtendMasterSecret},372+ {SESS_OBJ_SUPPORT_EXTEND_MASTER_SECRET, DecSessObjExtendedMasterSecret},
373 {SESS_OBJ_VERIFY_RESULT, DecSessObjVerifyResult},373 {SESS_OBJ_VERIFY_RESULT, DecSessObjVerifyResult},
374 {SESS_OBJ_AGE_ADD, DecSessObjTicketAgeAdd},374 {SESS_OBJ_AGE_ADD, DecSessObjTicketAgeAdd},
375};375};
Mtls/feature/session/src/session_enc.c+2-2
@@ -262,7 +262,7 @@ static int32_t EncSessObjSessionId(const HITLS_Session *sess, SessionObjType typ
262 return HITLS_SUCCESS;262 return HITLS_SUCCESS;
263}263}
264 264 
265-static int32_t EncSessObjExtendMasterSecret(const HITLS_Session *sess, SessionObjType type, uint8_t *data,265+static int32_t EncSessObjExtendedMasterSecret(const HITLS_Session *sess, SessionObjType type, uint8_t *data,
266 uint32_t length, uint32_t *encLen)266 uint32_t length, uint32_t *encLen)
267{267{
268 int ret;268 int ret;
@@ -461,7 +461,7 @@ static const SessObjEncFunc OBJ_LIST[] = {
461#endif461#endif
462 {SESS_OBJ_SESSION_ID_CTX, EncSessObjSessionIdCtx},462 {SESS_OBJ_SESSION_ID_CTX, EncSessObjSessionIdCtx},
463 {SESS_OBJ_SESSION_ID, EncSessObjSessionId},463 {SESS_OBJ_SESSION_ID, EncSessObjSessionId},
464- {SESS_OBJ_SUPPORT_EXTEND_MASTER_SECRET, EncSessObjExtendMasterSecret},464+ {SESS_OBJ_SUPPORT_EXTEND_MASTER_SECRET, EncSessObjExtendedMasterSecret},
465 {SESS_OBJ_VERIFY_RESULT, EncSessObjVerifyResult},465 {SESS_OBJ_VERIFY_RESULT, EncSessObjVerifyResult},
466 {SESS_OBJ_AGE_ADD, EncSessObjTicketAgeAdd},466 {SESS_OBJ_AGE_ADD, EncSessObjTicketAgeAdd},
467};467};
Mtls/handshake/recv/src/recv_client_hello.c+2-2
@@ -861,7 +861,7 @@ static int32_t ResumeCheckExtendedMasterScret(TLS_Ctx *ctx, const ClientHelloMsg
861 if (clientHello->extension.flag.haveExtendedMasterSecret) {861 if (clientHello->extension.flag.haveExtendedMasterSecret) {
862 HITLS_SESS_Free(*sess);862 HITLS_SESS_Free(*sess);
863 *sess = NULL;863 *sess = NULL;
864- } else if (ctx->config.tlsConfig.isSupportExtendMasterSecret) {864+ } else if (ctx->config.tlsConfig.isSupportExtendedMasterSecret) {
865 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID17052, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,865 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID17052, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,
866 "ExtendedMasterSecret err", 0, 0, 0, 0);866 "ExtendedMasterSecret err", 0, 0, 0, 0);
867 ctx->method.sendAlert(ctx, ALERT_LEVEL_FATAL, ALERT_HANDSHAKE_FAILURE);867 ctx->method.sendAlert(ctx, ALERT_LEVEL_FATAL, ALERT_HANDSHAKE_FAILURE);
@@ -1091,7 +1091,7 @@ static int32_t ServerProcessClientHelloExt(TLS_Ctx *ctx, const ClientHelloMsg *c
1091 (void)clientHello;1091 (void)clientHello;
1092 (void)ctx;1092 (void)ctx;
1093 /* Sets the extended master key flag */1093 /* Sets the extended master key flag */
1094- if (ctx->negotiatedInfo.version > HITLS_VERSION_SSL30 && ctx->config.tlsConfig.isSupportExtendMasterSecret &&1094+ if (ctx->negotiatedInfo.version > HITLS_VERSION_SSL30 && ctx->config.tlsConfig.isSupportExtendedMasterSecret &&
1095 !clientHello->extension.flag.haveExtendedMasterSecret) {1095 !clientHello->extension.flag.haveExtendedMasterSecret) {
1096 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID16196, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,1096 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID16196, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,
1097 "The peer does not support the extended master key.", 0, 0, 0, 0);1097 "The peer does not support the extended master key.", 0, 0, 0, 0);
Mtls/handshake/recv/src/recv_server_hello.c+1-1
@@ -157,7 +157,7 @@ static int32_t ClientCheckExtendedMasterSecret(TLS_Ctx *ctx, const ServerHelloMs
157 }157 }
158 }158 }
159#endif /* HITLS_TLS_FEATURE_SESSION */159#endif /* HITLS_TLS_FEATURE_SESSION */
160- if (ctx->config.tlsConfig.isSupportExtendMasterSecret && !serverHello->haveExtendedMasterSecret) {160+ if (ctx->config.tlsConfig.isSupportExtendedMasterSecret && !serverHello->haveExtendedMasterSecret) {
161 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID17084, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,161 BSL_LOG_BINLOG_FIXLEN(BINLOG_ID17084, BSL_LOG_LEVEL_ERR, BSL_LOG_BINLOG_TYPE_RUN,
162 "ExtendedMasterSecret err", 0, 0, 0, 0);162 "ExtendedMasterSecret err", 0, 0, 0, 0);
163 ctx->method.sendAlert(ctx, ALERT_LEVEL_FATAL, ALERT_HANDSHAKE_FAILURE);163 ctx->method.sendAlert(ctx, ALERT_LEVEL_FATAL, ALERT_HANDSHAKE_FAILURE);
Mtls/handshake/send/src/send_client_hello.c+1-1
@@ -61,7 +61,7 @@ static int32_t ClientPrepareSession(TLS_Ctx *ctx)
61 if (ctx->session != NULL) {61 if (ctx->session != NULL) {
62 bool haveExtMasterSecret = false;62 bool haveExtMasterSecret = false;
63 HITLS_SESS_GetHaveExtMasterSecret(ctx->session, &haveExtMasterSecret);63 HITLS_SESS_GetHaveExtMasterSecret(ctx->session, &haveExtMasterSecret);
64- if (!haveExtMasterSecret && ctx->config.tlsConfig.isSupportExtendMasterSecret) {64+ if (!haveExtMasterSecret && ctx->config.tlsConfig.isSupportExtendedMasterSecret) {
65 HITLS_SESS_Free(ctx->session);65 HITLS_SESS_Free(ctx->session);
66 ctx->session = NULL;66 ctx->session = NULL;
67 return HITLS_SUCCESS;67 return HITLS_SUCCESS;
Mtls/include/tls_config.h+1-1
@@ -213,7 +213,7 @@ typedef struct TlsConfig {
213 bool isEncryptThenMac; /* is EncryptThenMac on */213 bool isEncryptThenMac; /* is EncryptThenMac on */
214 bool isFlightTransmitEnable; /* sending of handshake information in one flighttransmit */214 bool isFlightTransmitEnable; /* sending of handshake information in one flighttransmit */
215 215 
216- bool isSupportExtendMasterSecret; /* is support extended master secret */216+ bool isSupportExtendedMasterSecret; /* is support extended master secret */
217 bool isSupportSessionTicket; /* is support session ticket */217 bool isSupportSessionTicket; /* is support session ticket */
218 bool isSupportServerPreference; /* server cipher suites can be preferentially selected */218 bool isSupportServerPreference; /* server cipher suites can be preferentially selected */
219 219