diff options
author | Lans Zhang <jia.zhang@windriver.com> | 2017-07-04 17:20:07 +0800 |
---|---|---|
committer | Lans Zhang <jia.zhang@windriver.com> | 2017-07-04 17:20:07 +0800 |
commit | dda0659b716396e4da9e671623039a66200a37a6 (patch) | |
tree | bcd8757babd223f57b16abbb9b433b4849769be1 /meta-integrity | |
parent | 407c56068dcbb7f2c83b80fc723cf5918f5240b6 (diff) | |
download | meta-secure-core-dda0659b716396e4da9e671623039a66200a37a6.tar.gz |
init.ima: code style cleanup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Diffstat (limited to 'meta-integrity')
-rwxr-xr-x | meta-integrity/recipes-core/initrdscripts/files/init.ima | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/meta-integrity/recipes-core/initrdscripts/files/init.ima b/meta-integrity/recipes-core/initrdscripts/files/init.ima index 1e92ba2..fce7eae 100755 --- a/meta-integrity/recipes-core/initrdscripts/files/init.ima +++ b/meta-integrity/recipes-core/initrdscripts/files/init.ima | |||
@@ -30,43 +30,37 @@ IMA_POLICY=/etc/ima_policy | |||
30 | 30 | ||
31 | SECURITYFS_MOUNTED=0 | 31 | SECURITYFS_MOUNTED=0 |
32 | 32 | ||
33 | function print_critical | 33 | print_critical() { |
34 | { | ||
35 | printf "\033[1;35m" | 34 | printf "\033[1;35m" |
36 | echo "$@" | 35 | echo "$@" |
37 | printf "\033[0m" | 36 | printf "\033[0m" |
38 | } | 37 | } |
39 | 38 | ||
40 | function print_error | 39 | print_error() { |
41 | { | ||
42 | printf "\033[1;31m" | 40 | printf "\033[1;31m" |
43 | echo "$@" | 41 | echo "$@" |
44 | printf "\033[0m" | 42 | printf "\033[0m" |
45 | } | 43 | } |
46 | 44 | ||
47 | function print_warning | 45 | print_warning() { |
48 | { | ||
49 | printf "\033[1;33m" | 46 | printf "\033[1;33m" |
50 | echo "$@" | 47 | echo "$@" |
51 | printf "\033[0m" | 48 | printf "\033[0m" |
52 | } | 49 | } |
53 | 50 | ||
54 | function print_info | 51 | print_info() { |
55 | { | ||
56 | printf "\033[1;32m" | 52 | printf "\033[1;32m" |
57 | echo "$@" | 53 | echo "$@" |
58 | printf "\033[0m" | 54 | printf "\033[0m" |
59 | } | 55 | } |
60 | 56 | ||
61 | function print_verbose | 57 | print_verbose() { |
62 | { | ||
63 | printf "\033[1;36m" | 58 | printf "\033[1;36m" |
64 | echo "$@" | 59 | echo "$@" |
65 | printf "\033[0m" | 60 | printf "\033[0m" |
66 | } | 61 | } |
67 | 62 | ||
68 | function trap_handler | 63 | trap_handler() { |
69 | { | ||
70 | local err=$? | 64 | local err=$? |
71 | 65 | ||
72 | print_verbose "Cleaning up with exit code $err ..." | 66 | print_verbose "Cleaning up with exit code $err ..." |
@@ -103,7 +97,7 @@ fi | |||
103 | 97 | ||
104 | keyring_id=0x`grep '\skeyring\s*\.ima: ' "${ROOT_DIR}/proc/keys" | awk '{ print $1 }'` | 98 | keyring_id=0x`grep '\skeyring\s*\.ima: ' "${ROOT_DIR}/proc/keys" | awk '{ print $1 }'` |
105 | 99 | ||
106 | for key in ${ROOT_DIR}/etc/keys/x509_evm*.pem; do | 100 | for key in ${ROOT_DIR}/etc/keys/x509_evm*.crt; do |
107 | [ ! -s "$key" ] && continue | 101 | [ ! -s "$key" ] && continue |
108 | 102 | ||
109 | if ! evmctl import "$key" "$keyring_id" >"${ROOT_DIR}/dev/null"; then | 103 | if ! evmctl import "$key" "$keyring_id" >"${ROOT_DIR}/dev/null"; then |
@@ -121,7 +115,7 @@ done | |||
121 | exit 4 | 115 | exit 4 |
122 | } | 116 | } |
123 | 117 | ||
124 | cat "${IMA_POLICY}" > "$securityfs_dir/ima/policy" && { | 118 | echo "${IMA_POLICY}" > "$securityfs_dir/ima/policy" && { |
125 | exit 0 | 119 | exit 0 |
126 | } || { | 120 | } || { |
127 | print_critical "Unable to load the IMA policy ${IMA_POLICY}" | 121 | print_critical "Unable to load the IMA policy ${IMA_POLICY}" |