Skip to content

Commit a51c8d5

Browse files
author
Andras Fekete
committed
Standardize script style
1 parent 5fc32a1 commit a51c8d5

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

fips-check.sh

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ esac
265265
function checkout_files() {
266266
local name
267267
local tag
268-
for file_entry in "$@"
269-
do
268+
for file_entry in "$@"; do
270269
name=${file_entry%%:*}
271270
tag=${file_entry#*:}
272271
if ! $GIT rev-parse -q --verify "my$tag" >/dev/null
@@ -286,14 +285,12 @@ function copy_fips_files() {
286285
local bname
287286
local dname
288287
local tag
289-
for file_entry in "$@"
290-
do
288+
for file_entry in "$@"; do
291289
name=${file_entry%%:*}
292290
tag=${file_entry#*:}
293291
bname=$(basename "$name")
294292
dname=$(dirname "$name")
295-
if ! $GIT rev-parse -q --verify "my$tag" >/dev/null
296-
then
293+
if ! $GIT rev-parse -q --verify "my$tag" >/dev/null; then
297294
$GIT branch --no-track "my$tag" "$tag" || exit $?
298295
fi
299296
$GIT checkout "my$tag" -- "$bname" || exit $?
@@ -308,8 +305,7 @@ fi
308305

309306
pushd "$TEST_DIR" || exit 2
310307

311-
if ! $GIT clone "$FIPS_REPO" fips
312-
then
308+
if ! $GIT clone "$FIPS_REPO" fips; then
313309
echo "fips-check: Couldn't check out FIPS repository."
314310
exit 1
315311
fi
@@ -325,8 +321,7 @@ popd || exit 2
325321
# Since OE additions can still be processed for cert3389 we will call 140-2
326322
# ready "fipsv2-OE-ready" indicating it is ready to use for an OE addition but
327323
# would not be good for a new certification effort with the latest files.
328-
if [ "$FLAVOR" = 'fipsv2-OE-ready' ] && [ -s wolfcrypt/src/fips.c ]
329-
then
324+
if [ "$FLAVOR" = 'fipsv2-OE-ready' ] && [ -s wolfcrypt/src/fips.c ]; then
330325
cp wolfcrypt/src/fips.c wolfcrypt/src/fips.c.bak
331326
sed "s/v4.0.0-alpha/fipsv2-OE-ready/" wolfcrypt/src/fips.c.bak >wolfcrypt/src/fips.c
332327
fi
@@ -346,14 +341,12 @@ cavp-selftest-v2)
346341
;;
347342
esac
348343

349-
if ! $MAKE
350-
then
344+
if ! $MAKE; then
351345
echo 'fips-check: Make failed. Debris left for analysis.'
352346
exit 3
353347
fi
354348

355-
if [ -s wolfcrypt/src/fips_test.c ]
356-
then
349+
if [ -s wolfcrypt/src/fips_test.c ]; then
357350
NEWHASH=$(./wolfcrypt/test/testwolfcrypt | sed -n 's/hash = \(.*\)/\1/p')
358351
if [ -n "$NEWHASH" ]; then
359352
cp wolfcrypt/src/fips_test.c wolfcrypt/src/fips_test.c.bak
@@ -371,7 +364,6 @@ fi
371364

372365
# Clean up
373366
popd || exit 2
374-
if [ "$KEEP" = 'no' ];
375-
then
367+
if [ "$KEEP" = 'no' ]; then
376368
rm -rf "$TEST_DIR"
377369
fi

0 commit comments

Comments
 (0)