Merge pull request #3605 from tmael/cm_free

Free mutex and fix tls13.test script
This commit is contained in:
David Garske
2020-12-31 08:40:35 -08:00
committed by GitHub
2 changed files with 7 additions and 5 deletions

View File

@ -261,7 +261,7 @@ if [ "$early_data" = "yes" ]; then
RESULT=1 RESULT=1
fi fi
if [ $RESULT -ne 0 ]; then if [ $RESULT -ne 0 ]; then
echo -e "\n\nIssue with TLS v1.3 Early DAta - session ticket" echo -e "\n\nIssue with TLS v1.3 Early Data - session ticket"
do_cleanup do_cleanup
exit 1 exit 1
fi fi
@ -280,16 +280,16 @@ if [ "$early_data" = "yes" -a "$psk" = "yes" ]; then
RESULT=$? RESULT=$?
remove_ready_file remove_ready_file
early_data_cnt=`grep 'Early Data' $server_out_file | wc -l` early_data_cnt=`grep 'Early Data' $server_out_file | wc -l`
if [ $early_data_cnt -ne 2 ]; then if [ $early_data_cnt -ne 2 -a $early_data_cnt -ne 4 ]; then
RESULT=1 RESULT=1
fi fi
if [ $RESULT -ne 0 ]; then if [ $RESULT -ne 0 ]; then
echo -e "\n\nIssue with TLS v1.3 Early DAta - session ticket" echo -e "\n\nIssue with TLS v1.3 Early Data - session ticket"
do_cleanup do_cleanup
exit 1 exit 1
fi fi
else else
echo "Early data not available" echo "Early Data not available"
fi fi
do_cleanup do_cleanup

View File

@ -3663,7 +3663,9 @@ void wolfSSL_CertManagerFree(WOLFSSL_CERT_MANAGER* cm)
FreeTrustedPeerTable(cm->tpTable, TP_TABLE_SIZE, cm->heap); FreeTrustedPeerTable(cm->tpTable, TP_TABLE_SIZE, cm->heap);
wc_FreeMutex(&cm->tpLock); wc_FreeMutex(&cm->tpLock);
#endif #endif
if (wc_FreeMutex(&cm->refMutex) != 0) {
WOLFSSL_MSG("Couldn't free refMutex mutex");
}
XFREE(cm, cm->heap, DYNAMIC_TYPE_CERT_MANAGER); XFREE(cm, cm->heap, DYNAMIC_TYPE_CERT_MANAGER);
} }
} }