Skip to content

Commit

Permalink
(xmlsec-tests) Ensure tests can run with -jN
Browse files Browse the repository at this point in the history
  • Loading branch information
@lsh123
lsh123 committed May 12, 2024
1 parent c4fb6ae commit 4fed30b
Show file tree
Hide file tree
Showing 5 changed files with 158 additions and 153 deletions.
10 changes: 5 additions & 5 deletions tests/testDSig.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# ensure this script is called from testrun.sh
if [ -z "$xmlsec_app" -o -z "$crypto_config_folder" ]; then
if [ -z "$xmlsec_app" -o -z "$xmlsec_params" ]; then
echo "This script needs to be called from testrun.sh script"
exit 1
fi
Expand Down Expand Up @@ -1785,12 +1785,12 @@ execDSigTest $res_fail \
if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "dsig-dynamic" ]; then
echo "Dynamic signature template"
printf " Create new signature "
echo "$VALGRIND $xmlsec_app sign-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile
$VALGRIND $xmlsec_app sign-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile >> $logfile 2>> $logfile
echo "$VALGRIND $xmlsec_app sign-tmpl $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml --output $tmpfile" >> $logfile
$VALGRIND $xmlsec_app sign-tmpl $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml --output $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?
printf " Verify new signature "
echo "$VALGRIND $xmlsec_app verify --keys-file $keysfile $tmpfile" >> $logfile
$VALGRIND $xmlsec_app verify $xmlsec_params --keys-file $keysfile $tmpfile >> $logfile 2>> $logfile
echo "$VALGRIND $xmlsec_app verify --keys-file $topfolder/keys/keys.xml $tmpfile" >> $logfile
$VALGRIND $xmlsec_app verify $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?
fi

Expand Down
59 changes: 30 additions & 29 deletions tests/testEnc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


# ensure this script is called from testrun.sh
if [ -z "$xmlsec_app" -o -z "$crypto_config_folder" ]; then
if [ -z "$xmlsec_app" -o -z "$xmlsec_params" ]; then
echo "This script needs to be called from testrun.sh script"
exit 1
fi
Expand Down Expand Up @@ -471,35 +471,35 @@ execEncTest $res_success \
"tripledes-cbc" \
"" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-des3cbc-keyname2" \
"tripledes-cbc" \
"" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname2.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname2.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-aes128cbc-keyname" \
"aes128-cbc" \
"" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes128cbc-keyname.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --binary-data $topfolder/aleksey-xmlenc-01/enc-aes128cbc-keyname.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-aes192cbc-keyname" \
"aes192-cbc" \
"" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes192cbc-keyname.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --binary-data $topfolder/aleksey-xmlenc-01/enc-aes192cbc-keyname.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
Expand All @@ -523,44 +523,44 @@ execEncTest $res_success \
"aes256-cbc" \
"" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes256cbc-keyname.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --binary-data $topfolder/aleksey-xmlenc-01/enc-aes256cbc-keyname.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-des3cbc-keyname-content" \
"tripledes-cbc" \
" " \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-content.data --node-id Test" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-content.data --node-id Test" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-des3cbc-keyname-element" \
"tripledes-cbc" \
" " \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element.data --node-id Test" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element.data --node-id Test" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-des3cbc-keyname-element-root" \
"tripledes-cbc" \
" " \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element-root.data --node-id Test" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element-root.data --node-id Test" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
"aleksey-xmlenc-01/enc-des3cbc-aes192-keyname" \
"tripledes-cbc kw-aes192" \
"enc-key aes des" \
"--keys-file $topfolder/keys/keys.xml" \
"--keys-file $keysfile --session-key des-192 --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-aes192-keyname.data" \
"--keys-file $keysfile"
"--keys-file $topfolder/keys/keys.xml --session-key des-192 --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-aes192-keyname.data" \
"--keys-file $topfolder/keys/keys.xml"

execEncTest $res_success \
"" \
Expand Down Expand Up @@ -1182,7 +1182,7 @@ for aesgcm_k_l in $aesgcm_key_lengths ; do
# generate binary file out of base64
DECODE="-d"
if [ "`uname`" = "Darwin" ]; then
DECODE="-D"
DECODE="-D"
fi
cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3
execEncTest "$res_success" \
Expand All @@ -1206,15 +1206,16 @@ done
#
##########################################################################
if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "enc-dynamic" ]; then
echo "Dynamic encryption template"
printf " Encrypt template "
echo "$VALGRIND $xmlsec_app encrypt-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile
$VALGRIND $xmlsec_app encrypt-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?
printf " Decrypt document "
echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $keysfile $tmpfile" >> $logfile
$VALGRIND $xmlsec_app decrypt $xmlsec_params --keys-file $keysfile $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?
echo "Dynamic encryption template"
printf " Encrypt template "
echo "$VALGRIND $xmlsec_app encrypt-tmpl $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml --output $tmpfile" >> $logfile
$VALGRIND $xmlsec_app encrypt-tmpl $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml --output $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?

printf " Decrypt document "
echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml $tmpfile" >> $logfile
$VALGRIND $xmlsec_app decrypt $xmlsec_params --crypto-config $crypto_config --keys-file $topfolder/keys/keys.xml $tmpfile >> $logfile 2>> $logfile
printRes $res_success $?
fi


Expand Down
8 changes: 1 addition & 7 deletions tests/testKeys.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# ensure this script is called from testrun.sh
if [ -z "$xmlsec_app" -o -z "$crypto_config_folder" ]; then
if [ -z "$xmlsec_app" -o -z "$xmlsec_params" ]; then
echo "This script needs to be called from testrun.sh script"
exit 1
fi
Expand All @@ -24,12 +24,6 @@ echo "--- testKeys started for xmlsec-$crypto library ($timestamp) ---" >> $logf
echo "--- LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $logfile
echo "--- LTDL_LIBRARY_PATH=$LTDL_LIBRARY_PATH" >> $logfile

# cleanup crypto config folder
mkdir -p $crypto_config_folder
rm -rf $crypto_config_folder/*

# remove old keys file
rm -rf $keysfile

##########################################################################
##########################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/testRes.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [ "z$TMPFOLDER" = "z" ] ; then
TMPFOLDER=/tmp
fi

logfiles='$TMPFOLDER/test*.log'
logfiles='$TMPFOLDER/xmlsec-test*/full.log'

echo "-------------------- MEMORY USAGE --------------------"
grep 'in use' $logfiles | \
Expand Down
Loading

0 comments on commit 4fed30b

Please sign in to comment.