Skip to content

Commit abfc788

Browse files
committed
script cleanup: use #!/bin/bash on all scripts that use "echo -e" (/bin/sh is sometimes a non-Bourne/non-POSIX shell, e.g. dash/ash, with no support for "echo -e"); fix whitespace.
1 parent 67cc8ed commit abfc788

29 files changed

+138
-140
lines changed

async-check.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# async-check.sh
44

5-
# This script creates symbolic links to the required asynchronous
5+
# This script creates symbolic links to the required asynchronous
66
# file for using the asynchronous simulator and make check
77
#
88
# $ ./async-check [keep]
@@ -32,7 +32,7 @@ then
3232
else
3333
# make a clone of the wolfAsyncCrypt repository
3434
git clone --depth 1 $ASYNC_REPO async
35-
[ $? -ne 0 ] && echo "\n\nCouldn't checkout the wolfAsyncCrypt repository\n\n" && exit 1
35+
[ $? -ne 0 ] && echo "\n\nCouldn't checkout the wolfAsyncCrypt repository\n\n" && exit 1
3636
fi
3737

3838
# setup auto-conf

autogen.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
# Git hooks should come before autoreconf.
77
if [ -d .git ]; then
88
if [ ! -d .git/hooks ]; then
9-
mkdir .git/hooks || exit $?
9+
mkdir .git/hooks || exit $?
1010
fi
1111
if [ ! -e .git/hooks/pre-commit ]; then
12-
ln -s ../../pre-commit.sh .git/hooks/pre-commit || exit $?
12+
ln -s ../../pre-commit.sh .git/hooks/pre-commit || exit $?
1313
fi
1414
if [ ! -e .git/hooks/pre-push ]; then
15-
ln -s ../../pre-push.sh .git/hooks/pre-push || exit $?
15+
ln -s ../../pre-push.sh .git/hooks/pre-push || exit $?
1616
fi
1717
fi
1818

certs/ecc/genecc.sh

+18-18
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ echo 2000 > ./certs/ecc/crlnumber
1414
# generate ECC 256-bit CA
1515
if [ -f ./certs/ca-ecc-key.pem ]; then
1616
openssl req -config ./certs/ecc/wolfssl.cnf -extensions v3_ca -x509 -nodes -key ./certs/ca-ecc-key.pem -out ./certs/ca-ecc-cert.pem -sha256 \
17-
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
17+
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
1818
else
1919
openssl ecparam -out ./certs/ca-ecc-key.par -name prime256v1
2020
openssl req -config ./certs/ecc/wolfssl.cnf -extensions v3_ca -x509 -nodes -newkey ec:./certs/ca-ecc-key.par -keyout ./certs/ca-ecc-key.pem -out ./certs/ca-ecc-cert.pem -sha256 \
21-
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
21+
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
2222
fi
2323

2424
openssl x509 -in ./certs/ca-ecc-cert.pem -inform PEM -out ./certs/ca-ecc-cert.der -outform DER
@@ -43,18 +43,18 @@ openssl x509 -in ./certs/server-ecc.pem -outform der -out ./certs/server-ecc.der
4343
openssl x509 -req -in ./certs/server-ecc-req.pem -days 3650 -extfile ./certs/ecc/wolfssl.cnf -extensions server_cert -signkey ./certs/ecc-key.pem -text -out ./certs/server-ecc-self.pem
4444
openssl x509 -inform pem -in ./certs/server-ecc-self.pem -outform der -out ./certs/server-ecc-self.der
4545

46-
rm ./certs/server-ecc-req.pem
46+
rm ./certs/server-ecc-req.pem
4747

4848

4949

5050
# generate ECC 384-bit CA
5151
if [ -f ./certs/ca-ecc384-key.pem ]; then
5252
openssl req -config ./certs/ecc/wolfssl_384.cnf -extensions v3_ca -x509 -nodes -key ./certs/ca-ecc384-key.pem -out ./certs/ca-ecc384-cert.pem -sha384 \
53-
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
53+
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
5454
else
5555
openssl ecparam -out ./certs/ca-ecc384-key.par -name secp384r1
5656
openssl req -config ./certs/ecc/wolfssl_384.cnf -extensions v3_ca -x509 -nodes -newkey ec:./certs/ca-ecc384-key.par -keyout ./certs/ca-ecc384-key.pem -out ./certs/ca-ecc384-cert.pem -sha384 \
57-
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
57+
-days 7300 -batch -subj "/C=US/ST=Washington/L=Seattle/O=wolfSSL/OU=Development/CN=www.wolfssl.com/[email protected]"
5858
fi
5959

6060
openssl x509 -in ./certs/ca-ecc384-cert.pem -inform PEM -out ./certs/ca-ecc384-cert.der -outform DER
@@ -70,48 +70,48 @@ openssl ca -batch -config ./certs/ecc/wolfssl_384.cnf -gencrl -crldays 1000 -out
7070
# Generate ECC 384-bit server cert
7171
if [ -f ./certs/server-ecc384-key.pem ]; then
7272
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -x509 -nodes -key ./certs/server-ecc384-key.pem -out ./certs/server-ecc384-req.pem \
73-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
73+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
7474
else
7575
openssl ecparam -out ./certs/server-ecc384-key.par -name secp384r1
7676
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -x509 -nodes -newkey ec:./certs/server-ecc384-key.par -keyout ./certs/server-ecc384-key.pem -out ./certs/server-ecc384-req.pem \
77-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
77+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
7878
fi
7979
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -new -key ./certs/server-ecc384-key.pem -out ./certs/server-ecc384-req.pem \
80-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
80+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Srv/CN=www.wolfssl.com/[email protected]/"
8181
openssl ec -in ./certs/server-ecc384-key.pem -inform PEM -out ./certs/server-ecc384-key.der -outform DER
8282

8383
# Sign server certificate
8484
openssl ca -batch -config ./certs/ecc/wolfssl_384.cnf -extensions server_cert -days 10950 -notext -md sha384 -in ./certs/server-ecc384-req.pem -out ./certs/server-ecc384-cert.pem
8585
openssl x509 -in ./certs/server-ecc384-cert.pem -outform der -out ./certs/server-ecc384-cert.der
8686

87-
rm ./certs/server-ecc384-req.pem
87+
rm ./certs/server-ecc384-req.pem
8888
rm ./certs/server-ecc384-key.par
8989

9090
# Generate ECC 384-bit client cert
9191
if [ -f ./certs/client-ecc384-key.pem ]; then
9292
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -x509 -nodes -key ./certs/client-ecc384-key.pem -out ./certs/client-ecc384-req.pem \
93-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Cli/CN=www.wolfssl.com/[email protected]/"
93+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Cli/CN=www.wolfssl.com/[email protected]/"
9494
else
9595
openssl ecparam -out ./certs/client-ecc384-key.par -name secp384r1
9696
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -x509 -nodes -newkey ec:./certs/client-ecc384-key.par -keyout ./certs/client-ecc384-key.pem -out ./certs/client-ecc384-req.pem \
97-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Cli/CN=www.wolfssl.com/[email protected]/"
97+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Cli/CN=www.wolfssl.com/[email protected]/"
9898
fi
9999
openssl req -config ./certs/ecc/wolfssl_384.cnf -sha384 -new -key ./certs/client-ecc384-key.pem -out ./certs/client-ecc384-req.pem \
100-
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Clit/CN=www.wolfssl.com/[email protected]/"
100+
-subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC384Clit/CN=www.wolfssl.com/[email protected]/"
101101
openssl ec -in ./certs/client-ecc384-key.pem -inform PEM -out ./certs/client-ecc384-key.der -outform DER
102102

103103
# Sign client certificate
104104
openssl ca -batch -config ./certs/ecc/wolfssl_384.cnf -extensions usr_cert -days 10950 -notext -md sha384 -in ./certs/client-ecc384-req.pem -out ./certs/client-ecc384-cert.pem
105105
openssl x509 -in ./certs/client-ecc384-cert.pem -outform der -out ./certs/client-ecc384-cert.der
106106

107-
rm ./certs/client-ecc384-req.pem
107+
rm ./certs/client-ecc384-req.pem
108108
rm ./certs/client-ecc384-key.par
109109

110110

111111
# Generate ECC Kerberos Keys
112112
if [ -f ./certs/ecc/secp256k1-key.pem ]; then
113-
openssl ecparam -name secp256k1 -genkey -noout -out ./certs/ecc/secp256k1-key.pem
114-
openssl ec -in ./certs/ecc/secp256k1-key.pem -inform PEM -out ./certs/ecc/secp256k1-key.der -outform DER
113+
openssl ecparam -name secp256k1 -genkey -noout -out ./certs/ecc/secp256k1-key.pem
114+
openssl ec -in ./certs/ecc/secp256k1-key.pem -inform PEM -out ./certs/ecc/secp256k1-key.der -outform DER
115115
fi
116116
# Create self-signed ECC Kerberos certificates
117117
openssl req -config ./certs/ecc/wolfssl.cnf -sha256 -new -key ./certs/ecc/secp256k1-key.pem -out ./certs/ecc/server-secp256k1-req.pem -subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC256K1-SRV/CN=www.wolfssl.com/[email protected]/"
@@ -126,8 +126,8 @@ rm ./certs/ecc/client-secp256k1-req.pem
126126

127127
# Generate ECC Brainpool Keys
128128
if [ -f ./certs/ecc/bp256r1-key.pem ]; then
129-
openssl ecparam -name brainpoolP256r1 -genkey -noout -out ./certs/ecc/bp256r1-key.pem
130-
openssl ec -in ./certs/ecc/bp256r1-key.pem -inform PEM -out ./certs/ecc/bp256r1-key.der -outform DER
129+
openssl ecparam -name brainpoolP256r1 -genkey -noout -out ./certs/ecc/bp256r1-key.pem
130+
openssl ec -in ./certs/ecc/bp256r1-key.pem -inform PEM -out ./certs/ecc/bp256r1-key.der -outform DER
131131
fi
132132
# Create self-signed ECC Brainpool certificates
133133
openssl req -config ./certs/ecc/wolfssl.cnf -sha256 -new -key ./certs/ecc/bp256r1-key.pem -out ./certs/ecc/server-bp256r1-req.pem -subj "/C=US/ST=Washington/L=Seattle/O=Eliptic/OU=ECC256BPR1-SRV/CN=www.wolfssl.com/[email protected]/"
@@ -143,7 +143,7 @@ rm ./certs/ecc/client-bp256r1-req.pem
143143

144144
# update bad certificate with last byte in signature changed
145145
cp ./certs/server-ecc.der ./certs/test/server-cert-ecc-badsig.der
146-
sed '$s/.$/W/' ./certs/test/server-cert-ecc-badsig.der >> ./certs/test/server-cert-ecc-badsig-altered.der
146+
sed '$s/.$/W/' ./certs/test/server-cert-ecc-badsig.der >> ./certs/test/server-cert-ecc-badsig-altered.der
147147
mv ./certs/test/server-cert-ecc-badsig-altered.der ./certs/test/server-cert-ecc-badsig.der
148148
openssl x509 -inform der -in ./certs/test/server-cert-ecc-badsig.der -outform pem -out ./certs/test/server-cert-ecc-badsig.pem
149149

certs/gen_revoked.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
###########################################################
44
########## update and sign server-revoked-key.pem ################

certs/intermediate/genintcerts.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
# RSA Server
77
# ROOT: ./certs/ca-cert.pem
88
# C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/[email protected])
9-
# INTERMEDIATE: ./certs/intermediate/ca-int-cert.pem
9+
# INTERMEDIATE: ./certs/intermediate/ca-int-cert.pem
1010
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate CA/[email protected]
11-
# INTERMEDIATE2: ./certs/intermediate/ca-int2-cert.pem
11+
# INTERMEDIATE2: ./certs/intermediate/ca-int2-cert.pem
1212
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate2 CA/[email protected]
1313
# SERVER: ./certs/intermediate/server-int-cert.pem
1414
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Server Chain/[email protected]
1515

1616
# RSA Client
1717
# ROOT: ./certs/ca-cert.pem
1818
# C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/[email protected])
19-
# INTERMEDIATE: ./certs/intermediate/ca-int-cert.pem
19+
# INTERMEDIATE: ./certs/intermediate/ca-int-cert.pem
2020
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate CA/[email protected]
21-
# INTERMEDIATE: ./certs/intermediate/ca-int2-cert.pem
21+
# INTERMEDIATE: ./certs/intermediate/ca-int2-cert.pem
2222
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate2 CA/[email protected]
2323
# CLIENT: ./certs/intermediate/client-int-cert.pem
2424
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Client Chain/[email protected]
2525

2626
# ECC Server
2727
# ROOT: ./certs/ca-ecc-cert.pem
2828
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=www.wolfssl.com/[email protected]
29-
# INTERMEDIATE: ./certs/intermediate/ca-int-ecc-cert.pem
29+
# INTERMEDIATE: ./certs/intermediate/ca-int-ecc-cert.pem
3030
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate CA ECC/[email protected]
31-
# INTERMEDIATE2: ./certs/intermediate/ca-int-ecc-cert.pem
31+
# INTERMEDIATE2: ./certs/intermediate/ca-int-ecc-cert.pem
3232
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate2 CA ECC/[email protected]
3333
# SERVER: ./certs/intermediate/server-int-ecc-cert.pem
3434
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Server Chain ECC/[email protected]
3535

3636
# ECC Client
3737
# ROOT: ./certs/ca-ecc-cert.pem
3838
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=www.wolfssl.com/[email protected]
39-
# INTERMEDIATE: ./certs/intermediate/ca-int-ecc-cert.pem
39+
# INTERMEDIATE: ./certs/intermediate/ca-int-ecc-cert.pem
4040
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate CA ECC/[email protected]
41-
# INTERMEDIATE2: ./certs/intermediate/ca-int2-ecc-cert.pem
41+
# INTERMEDIATE2: ./certs/intermediate/ca-int2-ecc-cert.pem
4242
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Intermediate2 CA ECC/[email protected]
4343
# CLIENT: ./certs/intermediate/client-int-ecc-cert.pem
4444
# C=US, ST=Washington, L=Seattle, O=wolfSSL, OU=Development, CN=wolfSSL Client Chain ECC/[email protected]
@@ -203,7 +203,7 @@ fi
203203

204204
# Make sure required CA files exist and are populated
205205
rm -f ./certs/intermediate/index.*
206-
touch ./certs/intermediate/index.txt
206+
touch ./certs/intermediate/index.txt
207207
if [ ! -f ./certs/intermediate/serial ]; then
208208
echo 1000 > ./certs/intermediate/serial
209209
fi

certs/test-pathlen/assemble-chains.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ create_an_entity "chainJ" "chainJ-ICA1-no_pathlen.pem" "chainJ-ICA1-key.pem"
147147
###########################################################
148148
# Success: PathLen of 0
149149
## chainA-ICA1-pathlen0.pem: signed by ca-cert.pem
150-
## chainA-entity.pem: signed by chainA-ICA1-pathlen0.pem
150+
## chainA-entity.pem: signed by chainA-ICA1-pathlen0.pem
151151
cat chainA-entity.pem chainA-ICA1-pathlen0.pem > chainA-assembled.pem
152152

153153
# Success: PathLen of 1

certs/test/gen-testcerts.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ build_test_cert_conf() {
5454
echo "" >> "$1".conf
5555
if [ -n "$3" ]; then
5656
echo "[ req_ext ]" >> "$1".conf
57-
case "$3" in
58-
*DER*)
57+
case "$3" in
58+
*DER*)
5959
echo "subjectAltName = $3" >> "$1".conf
60-
;;
61-
*)
60+
;;
61+
*)
6262
echo "subjectAltName = @alt_names" >> "$1".conf
6363
echo "[alt_names]" >> "$1".conf
6464
echo "DNS.1 = $3" >> "$1".conf
65-
;;
66-
esac
65+
;;
66+
esac
6767
fi
6868
}
6969

commit-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
#commit-tests.sh
44

pre-commit.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# save current config
77
echo "\n\nSaving current config\n\n"
88
cp config.status tmp.status
9-
cp wolfssl/options.h tmp.options.h
9+
cp wolfssl/options.h tmp.options.h
1010

1111
# stash modified files, if any, that are not part of this commit, don't test
1212
# them
@@ -35,7 +35,7 @@ echo "\nRestoring current config\n"
3535
mv tmp.status config.status
3636
# don't show output in case error from above
3737
./config.status >/dev/null 2>&1
38-
mv tmp.options.h wolfssl/options.h
38+
mv tmp.options.h wolfssl/options.h
3939
make clean >/dev/null 2>&1
4040
make -j 8 >/dev/null 2>&1
4141

pre-push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
#
33
#
44
# Our "pre-push" hook.

scripts/crl-revoked.test

+4-5
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ run_hashdir_test() {
143143
fi
144144
ln -s ./crl/crl.pem "$crl_hash_name".r0
145145
popd
146-
146+
147147
# starts the server on crl_port, -R generates ready file to be used as a
148148
# mutex lock, -c loads the revoked certificate. We capture the processid
149149
# into the variable server_pid
@@ -159,11 +159,11 @@ run_hashdir_test() {
159159

160160
# get created port 0 ephemeral port
161161
crl_port="$(cat "$ready_file")"
162-
162+
163163
# starts client on crl_port and captures the output from client
164164
capture_out=$(./examples/client/client -p $crl_port -9 2>&1)
165165
client_result=$?
166-
166+
167167
wait $server_pid
168168
server_result=$?
169169

@@ -183,7 +183,7 @@ run_hashdir_test() {
183183
echo ""
184184
exit_hash_dir_code=1
185185
esac
186-
186+
187187
# clean up hashed cert and crl
188188
pushd ${CERT_DIR}
189189
rm "$ca_hash_name".0
@@ -213,4 +213,3 @@ run_test
213213
echo "exiting with $exit_code certificate was not revoked"
214214
exit $exit_code
215215
########## end program ##########
216-

scripts/external.test

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
# external.test
44

@@ -16,16 +16,16 @@ if [ $? -ne 0 ]; then
1616
# cloudflare seems to change CAs quickly, disabled by default
1717
if test -n "$WOLFSSL_EXTERNAL_TEST"; then
1818

19-
BUILD_FLAGS="$(./examples/client/client '-#')"
20-
if echo "$BUILD_FLAGS" | fgrep -q -e ' -DWOLFSSL_SNIFFER '; then
21-
echo 'skipping WOLFSSL_EXTERNAL_TEST because -DWOLFSSL_SNIFFER configuration of build is incompatible.'
22-
exit 0
23-
fi
19+
BUILD_FLAGS="$(./examples/client/client '-#')"
20+
if echo "$BUILD_FLAGS" | fgrep -q -e ' -DWOLFSSL_SNIFFER '; then
21+
echo 'skipping WOLFSSL_EXTERNAL_TEST because -DWOLFSSL_SNIFFER configuration of build is incompatible.'
22+
exit 0
23+
fi
2424

25-
if echo "$BUILD_FLAGS" | fgrep -v -q -e ' -DHAVE_ECC '; then
26-
echo 'skipping WOLFSSL_EXTERNAL_TEST because -UHAVE_ECC configuration of build is incompatible.'
27-
exit 0
28-
fi
25+
if echo "$BUILD_FLAGS" | fgrep -v -q -e ' -DHAVE_ECC '; then
26+
echo 'skipping WOLFSSL_EXTERNAL_TEST because -UHAVE_ECC configuration of build is incompatible.'
27+
exit 0
28+
fi
2929

3030
echo "WOLFSSL_EXTERNAL_TEST set, running test..."
3131
else

scripts/google.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
# google.test
44

scripts/memtest.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
./autogen.sh
66
./configure --enable-debug --disable-shared --enable-memtest \
7-
--enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-aesgcm --enable-aesccm \
8-
--enable-sniffer --enable-psk --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession \
9-
--enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep;
7+
--enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-aesgcm --enable-aesccm \
8+
--enable-sniffer --enable-psk --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession \
9+
--enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep;
1010

11-
#DTLS has issue with trapping client/server failure disconnect since its stateless. Need to find way to communicate failure through file system.
12-
#--enable-dtls
11+
#DTLS has issue with trapping client/server failure disconnect since its stateless. Need to find way to communicate failure through file system.
12+
#--enable-dtls
1313
make
1414

1515
for i in {1..1000}
1616
do
1717
echo "Trying $i...\n"
1818

19-
./tests/unit.test > ./scripts/memtest.txt 2>&1
19+
./tests/unit.test > ./scripts/memtest.txt 2>&1
2020

21-
RESULT=$?
22-
[ $RESULT -eq 139 ] && echo "Mem Seg Fault" && exit 1
21+
RESULT=$?
22+
[ $RESULT -eq 139 ] && echo "Mem Seg Fault" && exit 1
2323
done
2424
echo "Loop SUCCESS"

0 commit comments

Comments
 (0)