Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Easier to use system's openssl library to clone #56

Merged
merged 4 commits into from
Nov 14, 2024
Merged

Easier to use system's openssl library to clone #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac43b71
Easier to use system's openssl library to clone
Nov 6, 2024
aec02cc
Only append the library after successful installation
Nov 7, 2024
2c2c8b5
Should only print if compiled in
Nov 7, 2024
b99e65d
Interim solution to get tests passing
Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scripts/utils-openssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
NUMCPU=${NUMCPU:-8}
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}

if [ -z $LD_LIBRARY_PATH ]; then
export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64
else
export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64:$LD_LIBRARY_PATH
fi

clone_openssl() {
if [ -d ${OPENSSL_SOURCE_DIR} ]; then
OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags 2>/dev/null || git branch --show-current))
Expand Down Expand Up @@ -130,5 +124,11 @@ init_openssl() {
exit 1
;;
esac

if [ -z $LD_LIBRARY_PATH ]; then
export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64
else
export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64:$LD_LIBRARY_PATH
fi
}

2 changes: 2 additions & 0 deletions scripts/utils-wolfprovider.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ install_wolfprov() {

init_openssl
init_wolfssl
unset OPENSSL_MODULES
unset OPENSSL_CONF
printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"

if [ ! -d ${WOLFPROV_INSTALL_DIR} ] || [ $(check_folder_age "${WOLFPROV_INSTALL_DIR}" "${WOLFSSL_INSTALL_DIR}") -lt 0 ] || [ $(check_folder_age "${WOLFPROV_INSTALL_DIR}" "${OPENSSL_INSTALL_DIR}") -lt 0 ]; then
Expand Down
15 changes: 8 additions & 7 deletions scripts/utils-wolfssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ WOLFSSL_CONFIG_CFLAGS=${WOLFSSL_CONFIG_CFLAGS:-"-I${OPENSSL_INSTALL_DIR}/include

WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}

if [ -z $LD_LIBRARY_PATH ]; then
export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib"
else
export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
fi

# Depends on OPENSSL_INSTALL_DIR
clone_wolfssl() {
if [ -d ${WOLFSSL_SOURCE_DIR} ]; then
Expand Down Expand Up @@ -86,7 +80,8 @@ install_wolfssl() {
printf "with FIPS ... "
CONF_ARGS+=" --enable-fips=ready"
if [ ! -e "XXX-fips-test" ]; then
./fips-check.sh keep nomakecheck fips-ready >>$LOG_FILE 2>&1
# Sometimes the system OpenSSL is different than the one we're using. So for the 'git' commands, we'll just use whatever the system comes with
LD_LIBRARY_PATH="" ./fips-check.sh keep nomakecheck fips-ready >>$LOG_FILE 2>&1
if [ $? != 0 ]; then
printf "ERROR checking out FIPS\n"
rm -rf ${WOLFSSL_INSTALL_DIR}
Expand Down Expand Up @@ -143,5 +138,11 @@ install_wolfssl() {
init_wolfssl() {
install_wolfssl
printf "\twolfSSL ${WOLFSSL_TAG} installed in: ${WOLFSSL_INSTALL_DIR}\n"

if [ -z $LD_LIBRARY_PATH ]; then
export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib"
else
export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
fi
}

2 changes: 1 addition & 1 deletion test/test_pbe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ int test_pbe(void *data)
PRINT_MSG("Not using wolfProvider - PBKDF not available in wolfCrypt");
#endif

PRINT_MSG("PBE DES-EDE3-CBC SHA-1");
#if !defined(NO_DES3) && defined(WP_HAVE_SHA1)
PRINT_MSG("PBE DES-EDE3-CBC SHA-1");
err = test_pbe_sha1_des3_pbkdf1();
#endif
#if defined(WP_HAVE_SHA256) && defined(WP_HAVE_AESCBC)
Expand Down