diff options
| author |   Yongxin Liu <yongxin.liu@windriver.com> | 2019-07-08 14:39:00 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:24:33 -0700 |
| commit | 415e213ad75ec9a93171c963395a1c4b92c6233b (patch) | |
| tree | 96228c88058c0bbd1c3fc441a21e13c24d8143be /meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch | |
| parent | 64d8fc68a6134ab06a9e625645a849f95cbe1059 (diff) | |
| download | meta-openembedded-contrib-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 'meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch')
| -rw-r--r-- | meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch b/meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch new file mode 100644 index 0000000000..acd91c01c4 --- /dev/null +++ b/meta-oe/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch @@ -0,0 +1,42 @@ +fix keyutils test error report + +Upstream-Status: Pending + +"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED. +"Required key not available" may be the reason of EKEYREVOKED. +EXPIRED and REVOKED are 2 status of kernel security keys features. +But the userspace keyutils lib will output the error message, which may +have several reasons. + +Signed-off-by: Han Chao <chan@windriver.com> + +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index bbca00a..739e9d0 100644 +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -227,11 +227,12 @@ function expect_error () + ;; + EKEYEXPIRED) + my_err="Key has expired" +- alt_err="Unknown error 127" ++ alt_err="Permission denied" + ;; + EKEYREVOKED) + my_err="Key has been revoked" +- alt_err="Unknown error 128" ++ alt_err="Permission denied" ++ alt2_err="Required key not available" + ;; + EKEYREJECTED) + my_err="Key has been rejected" +@@ -249,6 +250,9 @@ function expect_error () + elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err" >&/dev/null + then + : ++ elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err" >&/dev/null ++ then ++ : + elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err" >&/dev/null + then + : + |