diff options
| -rw-r--r-- | tests/features/builtin_trusted/runtest.sh | 12 | ||||
| -rw-r--r-- | tests/prepare.inc.sh | 20 |
2 files changed, 30 insertions, 2 deletions
diff --git a/tests/features/builtin_trusted/runtest.sh b/tests/features/builtin_trusted/runtest.sh index 27910b5..6bd073b 100644 --- a/tests/features/builtin_trusted/runtest.sh +++ b/tests/features/builtin_trusted/runtest.sh @@ -33,7 +33,11 @@ expect_error EACCES create_key --fail user a a $stk expect_error EOPNOTSUPP create_key --fail user a a $blk -expect_error EACCES +if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then + expect_error EOPNOTSUPP +else + expect_error EACCES +fi # Try adding a key to the keyrings marker "TRY ADDING ASYMMETRIC KEYS" @@ -89,7 +93,11 @@ expect_error EACCES create_key --fail -x asymmetric "" "$x509" $stk expect_error ENOKEY create_key --fail -x asymmetric "" "$x509" $blk -expect_error EACCES +if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then + expect_error EOPNOTSUPP +else + expect_error EACCES +fi echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE diff --git a/tests/prepare.inc.sh b/tests/prepare.inc.sh index 0b66237..4033d69 100644 --- a/tests/prepare.inc.sh +++ b/tests/prepare.inc.sh @@ -4,6 +4,26 @@ includes=${BASH_SOURCE[0]} includes=${includes%/*}/ +# Check if currently running kernel has option set +function has_kernel_config() +{ + local option=$1 + local uname=$(uname -r) + local config_list="$KCONFIG_PATH + /lib/modules/$uname/build/.config + /boot/config-$uname + /lib/kernel/config-$uname" + + for config in $config_list; do + [ ! -f $config ] && continue + grep -qE "^${option}=[my]" $config + return + done + + echo "Failed to find kernel configuration file" + return false +} + # --- need to run in own session keyring watch_fd=0 if [ "$1" != "--inside-test-session" ] |