Skip to content

Commit da05367

Browse files
authored
Merge pull request #35 from bandi13/betterDebug
Better debug system
2 parents 888e98e + c86b3be commit da05367

8 files changed

Lines changed: 193 additions & 105 deletions

File tree

IDE/Android/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export UNAME=Android
5151
export CROSS_COMPILE=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android34-
5252
if [ ! -e ${WORKSPACE}/wolfssl-install ]; then
5353
echo "=== Installing WolfSSL ==="
54-
export WOLFSSL_CONFIG_OPTS='--enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --enable-aesgcm-stream --enable-pwdbased'
55-
export WOLFSSL_CONFIG_CPPFLAGS=CPPFLAGS="-I${WORKSPACE}/openssl-install -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DFP_MAX_BITS=16384 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
54+
export WOLFSSL_CONFIG_OPTS='--enable-all-crypto --with-eccminsz=192 --with-max-ecc-bits=1024 --enable-opensslcoexist --enable-sha'
55+
export WOLFSSL_CONFIG_CPPFLAGS=CPPFLAGS="-I${WORKSPACE}/openssl-install -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
5656
if [ "${USE_FIPS}" = "true" ]; then
5757
WOLFSSL_CONFIG_OPTS+=' --enable-fips=ready'
5858
if [ "${USE_FIPS_CHECK}" = "true" ]; then

scripts/test-openssl.sh

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
2626
NUMCPU=${NUMCPU:-8}
27-
source ${SCRIPT_DIR}/utils-openssl.sh
28-
source ${SCRIPT_DIR}/utils-wolfssl.sh
27+
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
28+
source ${SCRIPT_DIR}/utils-wolfprovider.sh
2929

3030
do_cleanup() {
3131
echo "Cleanup"
@@ -125,7 +125,7 @@ evp_test_run() {
125125
do
126126
printf "\t\t$T ... "
127127
./evp_test -config $WOLFPROV_CONFIG \
128-
$WOLFPROV_DIR/scripts/evp_test/$T \
128+
$WOLFPROV_SOURCE_DIR/scripts/evp_test/$T \
129129
>$LOGDIR/$T.log 2>&1
130130
if [ "$?" = "0" ]; then
131131
echo "PASS"
@@ -245,12 +245,8 @@ evp_libctx_test_run() {
245245
# Start
246246
#
247247

248-
WOLFPROV_DIR=${SCRIPT_DIR}/..
249-
WOLFPROV_CONFIG=$WOLFPROV_DIR/provider.conf
250-
WOLFPROV_PATH=$WOLFPROV_DIR/.libs
251-
LOGDIR=$WOLFPROV_DIR/scripts/log
248+
LOGDIR=$WOLFPROV_SOURCE_DIR/scripts/log
252249
LOG_FILE=$LOGDIR/test-openssl.log
253-
export OPENSSL_MODULES=$WOLFPROV_PATH
254250

255251
if [ ! -d "$LOGDIR" ]; then
256252
mkdir $LOGDIR
@@ -269,37 +265,7 @@ if [ -z $NUMCPU ]; then
269265
fi
270266
fi
271267

272-
init_openssl
273-
init_wolfssl
274-
275-
if [ -z $LD_LIBRARY_PATH ]; then
276-
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
277-
else
278-
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
279-
fi
280-
printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
281-
282-
# Set up wolfProvider
283-
cd ${WOLFPROV_DIR}
284-
if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
285-
./autogen.sh >>$LOG_FILE 2>&1
286-
./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
287-
fi
288-
make -j$NUMCPU >>$LOG_FILE 2>&1
289-
if [ $? != 0 ]; then
290-
printf "\n\n...\n"
291-
tail -n 40 $LOG_FILE
292-
do_cleanup
293-
exit 1
294-
fi
295-
296-
make test >>$LOG_FILE 2>&1
297-
if [ $? != 0 ]; then
298-
printf "\n\n...\n"
299-
tail -n 40 $LOG_FILE
300-
do_cleanup
301-
exit 1
302-
fi
268+
init_wolfprov
303269

304270
# Start with returning success
305271
FAIL_CNT=0

scripts/test-wp-cs.sh

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
2323
NUMCPU=${NUMCPU:-8}
24-
source ${SCRIPT_DIR}/utils-openssl.sh
25-
source ${SCRIPT_DIR}/utils-wolfssl.sh
24+
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
25+
source ${SCRIPT_DIR}/utils-wolfprovider.sh
2626

2727
CERT_DIR=$SCRIPT_DIR/../certs
2828
LOG_FILE=$SCRIPT_DIR/test-wp-cs.log
@@ -221,23 +221,12 @@ do_client_test() { # usage: do_client_test [extraArgs]
221221

222222
FAIL=0
223223

224-
WOLFPROV_DIR=$SCRIPT_DIR/..
225-
WOLFPROV_NAME="libwolfprov"
226-
WOLFPROV_PATH=$WOLFPROV_DIR/.libs
227-
228224
CURVES=prime256v1
229225
#CURVES=X25519
230226
OPENSSL_ALL_CIPHERS="-cipher ALL -ciphersuites $TLS13_ALL_CIPHERS"
231227
OPENSSL_PORT=$(generate_port)
232228

233-
init_openssl
234-
init_wolfssl
235-
if [ -z $LD_LIBRARY_PATH ]; then
236-
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
237-
else
238-
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
239-
fi
240-
printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
229+
init_wolfprov
241230

242231
if [ "${AM_BWRAPPED-}" != "yes" ]; then
243232
bwrap_path="$(command -v bwrap)"
@@ -248,28 +237,6 @@ if [ "${AM_BWRAPPED-}" != "yes" ]; then
248237
unset AM_BWRAPPED
249238
fi
250239

251-
# Set up wolfProvider
252-
cd ${WOLFPROV_DIR}
253-
if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
254-
./autogen.sh >>$LOG_FILE 2>&1
255-
./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
256-
fi
257-
make -j$NUMCPU >>$LOG_FILE 2>&1
258-
if [ $? != 0 ]; then
259-
printf "\n\n...\n"
260-
tail -n 40 $LOG_FILE
261-
do_cleanup
262-
exit 1
263-
fi
264-
265-
make test >>$LOG_FILE 2>&1
266-
if [ $? != 0 ]; then
267-
printf "\n\n...\n"
268-
tail -n 40 $LOG_FILE
269-
do_cleanup
270-
exit 1
271-
fi
272-
273240
printf "Client testing\n" | tee $LOG_FILE
274241
start_openssl_server
275242
do_client_test "-provider-path $WOLFPROV_PATH -provider $WOLFPROV_NAME"

scripts/utils-openssl.sh

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ OPENSSL_SOURCE_DIR=${SCRIPT_DIR}/../openssl-source
3030
OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
3131

3232
NUMCPU=${NUMCPU:-8}
33+
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
3334

3435
clone_openssl() {
3536
if [ -d ${OPENSSL_SOURCE_DIR} ]; then
@@ -43,9 +44,16 @@ clone_openssl() {
4344

4445
if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then
4546
printf "\tClone OpenSSL ${OPENSSL_TAG} ... "
46-
git clone --depth=1 -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
47-
${OPENSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
48-
if [ $? != 0 ]; then
47+
if [ "$WOLFPROV_DEBUG" = "1" ]; then
48+
git clone -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
49+
${OPENSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
50+
RET=$?
51+
else
52+
git clone --depth=1 -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
53+
${OPENSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
54+
RET=$?
55+
fi
56+
if [ $RET != 0 ]; then
4957
printf "ERROR.\n"
5058
do_cleanup
5159
exit 1
@@ -60,8 +68,14 @@ install_openssl() {
6068

6169
if [ ! -d ${OPENSSL_INSTALL_DIR} ]; then
6270
printf "\tConfigure OpenSSL ${OPENSSL_TAG} ... "
63-
./config shared --prefix=${OPENSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
64-
if [ $? != 0 ]; then
71+
if [ "$WOLFPROV_DEBUG" = "1" ]; then
72+
./config shared --prefix=${OPENSSL_INSTALL_DIR} --debug >>$LOG_FILE 2>&1
73+
RET=$?
74+
else
75+
./config shared --prefix=${OPENSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
76+
RET=$?
77+
fi
78+
if [ $RET != 0 ]; then
6579
printf "ERROR.\n"
6680
rm -rf ${OPENSSL_INSTALL_DIR}
6781
do_cleanup
@@ -95,7 +109,7 @@ install_openssl() {
95109

96110
init_openssl() {
97111
install_openssl
98-
printf "\tOpenSSL ${OPENSSL_TAG} install at: ${OPENSSL_INSTALL_DIR}\n"
112+
printf "\tOpenSSL ${OPENSSL_TAG} installed in: ${OPENSSL_INSTALL_DIR}\n"
99113

100114
OPENSSL_BIN=${OPENSSL_INSTALL_DIR}/bin/openssl
101115
OPENSSL_TEST=${OPENSSL_SOURCE_DIR}/test

scripts/utils-wolfprovider.sh

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#!/bin/bash
2+
#
3+
# Copyright (C) 2021 wolfSSL Inc.
4+
#
5+
# This file is part of wolfProvider.
6+
#
7+
# wolfProvider is free software; you can redistribute it and/or modify
8+
# it under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation; either version 3 of the License, or
10+
# (at your option) any later version.
11+
#
12+
# wolfProvider is distributed in the hope that it will be useful,
13+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
# GNU General Public License for more details.
16+
#
17+
# You should have received a copy of the GNU General Public License
18+
# along with this program; if not, write to the Free Software
19+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
20+
#
21+
22+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
23+
source ${SCRIPT_DIR}/utils-openssl.sh
24+
source ${SCRIPT_DIR}/utils-wolfssl.sh
25+
26+
WOLFPROV_SOURCE_DIR=${SCRIPT_DIR}/..
27+
WOLFPROV_INSTALL_DIR=${SCRIPT_DIR}/../wolfprov-install
28+
WOLFPROV_CONFIG=${WOLFPROV_CONFIG:-"$WOLFPROV_SOURCE_DIR/provider.conf"}
29+
30+
WOLFPROV_NAME="libwolfprov"
31+
WOLFPROV_PATH=$WOLFPROV_INSTALL_DIR/lib
32+
export OPENSSL_MODULES=$WOLFPROV_PATH
33+
34+
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
35+
36+
install_wolfprov() {
37+
cd ${WOLFPROV_SOURCE_DIR}
38+
39+
init_openssl
40+
init_wolfssl
41+
if [ -z $LD_LIBRARY_PATH ]; then
42+
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
43+
else
44+
export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
45+
fi
46+
printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
47+
48+
if [ ! -d ${WOLFPROV_INSTALL_DIR} ]; then
49+
printf "\tConfigure wolfProvider ... "
50+
if [ ! -e "${WOLFPROV_SOURCE_DIR}/configure" ]; then
51+
./autogen.sh >>$LOG_FILE 2>&1
52+
fi
53+
if [ "$WOLFPROV_DEBUG" = "1" ]; then
54+
./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} --prefix=${WOLFPROV_INSTALL_DIR} --enable-debug >>$LOG_FILE 2>&1
55+
RET=$?
56+
else
57+
./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} --prefix=${WOLFPROV_INSTALL_DIR} >>$LOG_FILE 2>&1
58+
RET=$?
59+
fi
60+
if [ $RET != 0 ]; then
61+
printf "\n\n...\n"
62+
tail -n 40 $LOG_FILE
63+
do_cleanup
64+
exit 1
65+
fi
66+
printf "Done.\n"
67+
68+
printf "\tBuild wolfProvider ... "
69+
make -j$NUMCPU >>$LOG_FILE 2>&1
70+
if [ $? != 0 ]; then
71+
printf "\n\n...\n"
72+
tail -n 40 $LOG_FILE
73+
do_cleanup
74+
exit 1
75+
fi
76+
printf "Done.\n"
77+
78+
printf "\tTest wolfProvider ... "
79+
make test >>$LOG_FILE 2>&1
80+
if [ $? != 0 ]; then
81+
printf "\n\n...\n"
82+
tail -n 40 $LOG_FILE
83+
do_cleanup
84+
exit 1
85+
fi
86+
printf "Done.\n"
87+
88+
printf "\tInstall wolfProvider ... "
89+
make install >>$LOG_FILE 2>&1
90+
if [ $? != 0 ]; then
91+
printf "\n\n...\n"
92+
tail -n 40 $LOG_FILE
93+
do_cleanup
94+
exit 1
95+
fi
96+
printf "Done.\n"
97+
fi
98+
}
99+
100+
init_wolfprov() {
101+
install_wolfprov
102+
printf "\twolfProvider installed in: ${WOLFPROV_INSTALL_DIR}\n"
103+
}
104+

0 commit comments

Comments
 (0)