Merge pull request #5506 from dgarske/dtlscid

Fixes for build warnings and string macros for DTLS CID
This commit is contained in:
Sean Parkinson
2022-08-25 13:52:55 +10:00
committed by GitHub
2 changed files with 6 additions and 5 deletions

View File

@ -2189,7 +2189,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case 262: case 262:
useDtlsCID = 1; useDtlsCID = 1;
if (myoptarg != NULL) { if (myoptarg != NULL) {
if (strlen(myoptarg) >= DTLS_CID_BUFFER_SIZE) { if (XSTRLEN(myoptarg) >= DTLS_CID_BUFFER_SIZE) {
err_sys("provided connection ID is too big"); err_sys("provided connection ID is too big");
} }
else { else {
@ -3733,8 +3733,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
ret = wolfSSL_dtls_cid_use(ssl); ret = wolfSSL_dtls_cid_use(ssl);
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
err_sys("Can't enable DTLS ConnectionID"); err_sys("Can't enable DTLS ConnectionID");
ret = ret = wolfSSL_dtls_cid_set(ssl, (unsigned char*)dtlsCID,
wolfSSL_dtls_cid_set(ssl, (unsigned char*)dtlsCID, strlen(dtlsCID)); (word32)XSTRLEN(dtlsCID));
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
err_sys("Can't set DTLS ConnectionID"); err_sys("Can't set DTLS ConnectionID");
} }

View File

@ -2303,7 +2303,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
case 263: case 263:
useDtlsCID = 1; useDtlsCID = 1;
if (myoptarg != NULL) { if (myoptarg != NULL) {
if (strlen(myoptarg) >= DTLS_CID_BUFFER_SIZE) { if (XSTRLEN(myoptarg) >= DTLS_CID_BUFFER_SIZE) {
err_sys("provided connection ID is too big"); err_sys("provided connection ID is too big");
} }
else { else {
@ -3288,7 +3288,8 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
ret = wolfSSL_dtls_cid_use(ssl); ret = wolfSSL_dtls_cid_use(ssl);
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
err_sys("Can't enable DTLS ConnectionID"); err_sys("Can't enable DTLS ConnectionID");
ret = wolfSSL_dtls_cid_set(ssl, (byte*)dtlsCID, strlen(dtlsCID)); ret = wolfSSL_dtls_cid_set(ssl, (byte*)dtlsCID,
(word32)XSTRLEN(dtlsCID));
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
err_sys("Can't set DTLS ConnectionID"); err_sys("Can't set DTLS ConnectionID");
} }