summaryrefslogtreecommitdiffstats
path: root/files/keyutils-fix-error-report-by-adding-default-message.patch
diff options
context:
space:
mode:
authorYongxin Liu <yongxin.liu@windriver.com>2019-07-08 14:39:00 +0800
committerKhem Raj <raj.khem@gmail.com>2019-07-10 09:24:33 -0700
commit415e213ad75ec9a93171c963395a1c4b92c6233b (patch)
tree96228c88058c0bbd1c3fc441a21e13c24d8143be /files/keyutils-fix-error-report-by-adding-default-message.patch
parent64d8fc68a6134ab06a9e625645a849f95cbe1059 (diff)
downloadmeta-openembedded-415e213ad75ec9a93171c963395a1c4b92c6233b.tar.gz
keyutils: move recipe and patches from meta-security to meta-oe
keyutils is originally in https://git.yoctoproject.org/git/meta-security. Move it to meta-oe since other recipes in OE depend on it. Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'files/keyutils-fix-error-report-by-adding-default-message.patch')
-rw-r--r--files/keyutils-fix-error-report-by-adding-default-message.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/files/keyutils-fix-error-report-by-adding-default-message.patch b/files/keyutils-fix-error-report-by-adding-default-message.patch
deleted file mode 100644
index acd91c01c4..0000000000
--- a/files/keyutils-fix-error-report-by-adding-default-message.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1fix keyutils test error report
2
3Upstream-Status: Pending
4
5"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED.
6"Required key not available" may be the reason of EKEYREVOKED.
7EXPIRED and REVOKED are 2 status of kernel security keys features.
8But the userspace keyutils lib will output the error message, which may
9have several reasons.
10
11Signed-off-by: Han Chao <chan@windriver.com>
12
13diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
14index bbca00a..739e9d0 100644
15--- a/tests/toolbox.inc.sh
16+++ b/tests/toolbox.inc.sh
17@@ -227,11 +227,12 @@ function expect_error ()
18 ;;
19 EKEYEXPIRED)
20 my_err="Key has expired"
21- alt_err="Unknown error 127"
22+ alt_err="Permission denied"
23 ;;
24 EKEYREVOKED)
25 my_err="Key has been revoked"
26- alt_err="Unknown error 128"
27+ alt_err="Permission denied"
28+ alt2_err="Required key not available"
29 ;;
30 EKEYREJECTED)
31 my_err="Key has been rejected"
32@@ -249,6 +250,9 @@ function expect_error ()
33 elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err" >&/dev/null
34 then
35 :
36+ elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err" >&/dev/null
37+ then
38+ :
39 elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err" >&/dev/null
40 then
41 :
42