Skip to content

Commit 18b0d31

Browse files
authored
Merge pull request #10227 from douzzer/20260414-fixes
20260414-fixes
2 parents 6ac0f82 + e4fab90 commit 18b0d31

15 files changed

Lines changed: 90 additions & 43 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,6 @@ WOLFSSL_XMSS_LARGE_SECRET_KEY
945945
WOLFSSL_ZEPHYR
946946
WOLF_ALLOW_BUILTIN
947947
WOLF_CRYPTO_CB_CMD
948-
WOLF_CRYPTO_CB_FIND
949948
WOLF_CRYPTO_CB_ONLY_ECC
950949
WOLF_CRYPTO_CB_ONLY_RSA
951950
WOLF_CRYPTO_DEV

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,8 @@ then
15461546
test "$enable_ed448" = "" && enable_ed448=yes
15471547
test "$enable_ed448_stream" = "" && test "$enable_ed448" != "no" && enable_ed448_stream=yes
15481548
test "$enable_aessiv" = "" && enable_aessiv=yes
1549-
test "$enable_aeseax" = "" && enable_aeseax=yes
1549+
# AFALG lacks AES-EAX
1550+
test "$enable_aeseax" = "" && test "$enable_afalg" != "yes" && enable_aeseax=yes
15501551

15511552
if test "$KERNEL_MODE_DEFAULTS" != "yes"
15521553
then

scripts/benchmark.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ remove_ready_file() {
6060
do_cleanup() {
6161
echo "in cleanup"
6262

63-
if [ $server_pid != $no_pid ]
63+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
6464
then
65+
# sleep to give sanitizers time to dump backtraces.
66+
sleep 1
6567
echo "killing server"
6668
kill -9 $server_pid
6769
fi

scripts/crl-revoked.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ remove_ready_file() {
6363
abort_trap() {
6464
echo "script aborted"
6565

66-
if [ $server_pid != $no_pid ]
66+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
6767
then
68+
# sleep to give sanitizers time to dump backtraces.
69+
sleep 1
6870
echo "killing server"
6971
kill -9 $server_pid
7072
fi

scripts/dtls.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ if [ "${AM_BWRAPPED-}" != "yes" ]; then
3939
fi
4040

4141
kill_server() {
42+
sleepseconds=1
4243
for i in $(jobs -pr); do
4344
if [ "$i" != "$TCPDUMP_PID" ]; then
45+
# sleep to give sanitizers time to dump backtraces.
46+
sleep $sleepseconds
47+
sleepseconds=0
4448
kill -9 $i
4549
fi
4650
done

scripts/openssl.test

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,21 @@ do_cleanup() {
141141
echo "in cleanup"
142142

143143
IFS=$OIFS #restore separator
144+
sleepseconds=1
144145
for s in $servers
145146
do
146147
f2=${s%:*}
147148
sname=${f2%:*}
148149
pid=${f2##*:}
149150
port=${s##*:}
150-
echo "killing server: $sname ($port)"
151-
kill -9 "$pid"
151+
if kill -0 "$pid" 2>&-
152+
then
153+
# sleep to give sanitizers time to dump backtraces.
154+
sleep $sleepseconds
155+
sleepseconds=0
156+
echo "killing server: $sname ($port)"
157+
kill -9 "$pid"
158+
fi
152159
done
153160
}
154161

scripts/pkcallbacks.test

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ remove_ready_file() {
5454
do_cleanup() {
5555
echo "in cleanup"
5656

57-
if [ $server_pid != $no_pid ]
57+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
5858
then
59+
# sleep to give sanitizers time to dump backtraces.
60+
sleep 1
5961
echo "killing server"
6062
kill -9 $server_pid
6163
fi
@@ -67,8 +69,10 @@ do_cleanup() {
6769
abort_trap() {
6870
echo "script aborted"
6971

70-
if [ $server_pid != $no_pid ]
72+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
7173
then
74+
# sleep to give sanitizers time to dump backtraces.
75+
sleep 1
7276
echo "killing server"
7377
kill -9 $server_pid
7478
fi

scripts/psk.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ remove_ready_file() {
6363
do_cleanup() {
6464
echo "in cleanup"
6565

66-
if [ $server_pid != $no_pid ]
66+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
6767
then
68+
# sleep to give sanitizers time to dump backtraces.
69+
sleep 1
6870
echo "killing server"
6971
kill -9 $server_pid
7072
fi

scripts/resume.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ remove_ready_file() {
4444
do_cleanup() {
4545
echo "in cleanup"
4646

47-
if [ $server_pid != $no_pid ]
47+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
4848
then
49+
# sleep to give sanitizers time to dump backtraces.
50+
sleep 1
4951
echo "killing server"
5052
kill -9 $server_pid
5153
fi

scripts/tls13.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ remove_ready_file() {
7474
do_cleanup() {
7575
echo "in cleanup"
7676

77-
if [ $server_pid != $no_pid ]
77+
if [ $server_pid != $no_pid ] && kill -0 $server_pid 2>&-
7878
then
79+
# sleep to give sanitizers time to dump backtraces.
80+
sleep 1
7981
echo "killing server"
8082
kill -9 $server_pid 2>/dev/null
8183
server_pid=$no_pid

0 commit comments

Comments
 (0)