boot/optee-os: bump to version 3.9.0
PATCH 1/5 boot/optee-os: bump to version 3.9.0
Bump OP-TEE OS package version to OP-TEE release 3.9.0.
Update patch on pydrypto/pycryptodome to match 3.9.0.
Add patch on CFG_OPTEE_REVISION_MINOR that was not updated in release 3.9.0 and fixed only few commits above.
--- ...ub.py-use-Cryptodome-module-instead-.patch | 34 ++++++++++ ...o_pub_c.py-sign.py-use-pycryptodomex.patch | 64 ------------------- ...nfig.mk-fix-CFG_OPTEE_REVISION_MINOR.patch | 32 ++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 5 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch delete mode 100644 boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch create mode 100644 boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch
boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001 +From: Etienne Carriere <[email protected]> +Date: Tue, 26 May 2020 11:10:45 +0200 +Subject: [PATCH 2/2] scripts/pem_to_pub.py: use Cryptodome module instead of + Crypto + +Upgrade scripts/pem_to_pub.py to use module Cryptodome instead of +module Crypto for consistency with the other helper Python scripts +of OP-TEE OS package. + +Signed-off-by: Etienne Carriere <[email protected]> +Acked-by: Jens Wiklander <[email protected]> +--- + scripts/pem_to_pub_c.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py +index 3a896a393..d3f0e5006 100755 +--- a/scripts/pem_to_pub_c.py ++++ b/scripts/pem_to_pub_c.py +@@ -21,8 +21,8 @@ def get_args(): + + def main(): + import array +- from Crypto.PublicKey import RSA +- from Crypto.Util.number import long_to_bytes ++ from Cryptodome.PublicKey import RSA ++ from Cryptodome.Util.number import long_to_bytes + + args = get_args() + +-- +2.17.1 +
boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch deleted +0 -64
64 lines not on this page · raw message
boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch new file +32 -0
@@ -0,0 +1,32 @@ +From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001 +From: Jens Wiklander <[email protected]> +Date: Mon, 25 May 2020 12:20:08 +0200 +Subject: [PATCH 1/2] config.mk: fix CFG_OPTEE_REVISION_MINOR + +The current release is 3.9.0, change the revision to match. + +Fixes: af141c61fe7a ("Update CHANGELOG for 3.9.0") +Reviewed-by: Joakim Bech <[email protected]> +Reported-by: Etienne Carriere <[email protected]> +Signed-off-by: Jens Wiklander <[email protected]> +Signed-off-by: Etienne Carriere <[email protected]> +--- + mk/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/config.mk b/mk/config.mk +index c00a14618..bc49f83d8 100644 +--- a/mk/config.mk ++++ b/mk/config.mk +@@ -116,7 +116,7 @@ endif + # with limited depth not including any tag, so there is really no guarantee + # that TEE_IMPL_VERSION contains the major and minor revision numbers. + CFG_OPTEE_REVISION_MAJOR ?= 3 +-CFG_OPTEE_REVISION_MINOR ?= 8 ++CFG_OPTEE_REVISION_MINOR ?= 9 + + # Trusted OS implementation manufacturer name + CFG_TEE_MANUFACTURER ?= LINARO +-- +2.17.1 +
boot/optee-os/Config.in +2 -2
@@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.7.0" + bool "3.9.0" help Use the latest release tag from the OP-TEE OS official Git repository.
@@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.9.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
boot/optee-os/optee-os.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz -sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.9.0.tar.gz +sha256 ac6f145ebde715d4d7a1d5277f4e08a06b660e1c0237c926a274d86cd90ef4c5 optee-os-3.9.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
Signature · 1 line
2.17.1
PATCH 2/5 package/optee-client: bump to version 3.9.0
Bump OP-TEE Client package version to OP-TEE release 3.9.0.
--- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-client/optee-client.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.7.0.tar.gz -sha256 7a31076a3a77398c6db2b5d3e0a6ac297923bee126ff83430e8f1ebc2a060faa optee-client-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.9.0.tar.gz +sha256 1b072e6be8a697656e9fe34499789bbd4132b3720f8d1b95c659e8e6c5873654 optee-client-3.9.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
package/optee-client/optee-client.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.7.0 +OPTEE_CLIENT_VERSION = 3.9.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 3/5 package/optee-test: bump to version 3.9.0
In reply to Etienne CarriereBump OP-TEE Test package version to OP-TEE release 3.9.0.
Drop patch on scripts/file_to_c.py that is merged in 3.9.0. Add patch from [1] for related issue found in 3.9.0 xtest tool. Add patch to default disable xtest regression test 1027 and 1028 that mandate changes in Linux kernel OP-TEE driver that are not available in mainline, at least as of Linux kernel v5.7.
--- .../0001-use-python3-instead-of-python.patch | 50 ------------------- ...-xtest-fix-generic-argument-handling.patch | 32 ++++++++++++ ...-1027-1028-skip-tests-when-test-leve.patch | 47 +++++++++++++++++ package/optee-test/optee-test.hash | 4 +- package/optee-test/optee-test.mk | 2 +- 5 files changed, 82 insertions(+), 53 deletions(-) delete mode 100644 package/optee-test/0001-use-python3-instead-of-python.patch create mode 100644 package/optee-test/0001-xtest-fix-generic-argument-handling.patch create mode 100644 package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch
package/optee-test/0001-use-python3-instead-of-python.patch deleted +0 -50
@@ -1,50 +0,0 @@ -From cc3cb798375c5f47ea5c7579f32060933435e231 Mon Sep 17 00:00:00 2001 -From: Scott Branden <[email protected]> -Date: Fri, 27 Dec 2019 12:54:28 -0800 -Subject: [PATCH] use python3 instead of python - -use python3 instead of python as python2 is EOL January 2020. - -Signed-off-by: Scott Branden <[email protected]> -Reviewed-by: Jerome Forissier <[email protected]> -Tested-by: Jerome Forissier <[email protected]> (QEMU, CFG_GCM_NIST_VECTORS=y) - -(cherry picked from commit 6271160639002a2580d80b75b5397a96d56329f2) -Signed-off-by: Romain Naour <[email protected]> ---- - scripts/file_to_c.py | 4 ++-- - scripts/rsp_to_gcm_test.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index ae16f52..b4ce2a2 100755 ---- a/scripts/file_to_c.py -+++ b/scripts/file_to_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2018, Linaro Limited -@@ -29,7 +29,7 @@ def main(): - - f.write("const uint8_t " + args.name + "[] = {\n") - i = 0 -- for x in array.array("B", inf.read()): -+ for x in array.array("B", map(ord, (inf.read()))): - f.write("0x" + '{0:02x}'.format(x) + ",") - i = i + 1 - if i % 8 == 0: -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py -index 0543541..e4418be 100755 ---- a/scripts/rsp_to_gcm_test.py -+++ b/scripts/rsp_to_gcm_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - modes = {'encrypt': 0, 'decrypt': 1} - --- -2.24.1 -
package/optee-test/0001-xtest-fix-generic-argument-handling.patch new file +32 -0
@@ -0,0 +1,32 @@ +From e1af176af2bb274745e9b0d43456763f8946f107 Mon Sep 17 00:00:00 2001 +From: Etienne Carriere <[email protected]> +Date: Mon, 25 May 2020 13:09:59 +0200 +Subject: [PATCH] xtest: fix generic argument handling + +Fix position of last generic argument badly handled that makes -d, -l or +-t argument being treated also as if it was the first test ID to consider +in the filtered test IDs list. + +Fixes: 66542a1bb4e0 ("xtest: exclude tests with -x") +Signed-off-by: Etienne Carriere <[email protected]> +Acked-by: Jerome Forissier <[email protected]> +--- + host/xtest/xtest_main.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/host/xtest/xtest_main.c b/host/xtest/xtest_main.c +index 3dff2fe..1e566fa 100644 +--- a/host/xtest/xtest_main.c ++++ b/host/xtest/xtest_main.c +@@ -188,8 +188,6 @@ int main(int argc, char *argv[]) + } + } + next: +- if (last_gen_option > 1) +- last_gen_option--; + + for (index = last_gen_option; index < argc; index++) { + if (!strcmp(argv[index], "-x")) { +-- +2.17.1 +
package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch new file +47 -0
47 lines not on this page · raw message
package/optee-test/optee-test.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.7.0.tar.gz -sha256 6486ba7eba8ea8b43278032c9d6ea1d6b35340a7f76ef4c6f34efbca3d80265d optee-test-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.9.0.tar.gz +sha256 59be1c97cdef7a886bdf4c50f7bf86354be68a68f6ffd43cd5ce4bb96156f402 optee-test-3.9.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md
package/optee-test/optee-test.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.7.0 +OPTEE_TEST_VERSION = 3.9.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md
Signature · 1 line
2.17.1
PATCH 4/5 package/optee-benchmark: bump to version 3.9.0
In reply to Etienne CarriereBump OP-TEE benchmark package version to OP-TEE release 3.9.0.
--- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-benchmark/optee-benchmark.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.7.0.tar.gz -sha256 c2bbeb188e3ebe06c62b1a7d6483d023737695c36d4752402fae33bd8f487c40 optee-benchmark-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.9.0.tar.gz +sha256 84ea29c74de8cba99022f411a7c12451a9b8b71da608aa2ce75a975296ea1e3f optee-benchmark-3.9.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE
package/optee-benchmark/optee-benchmark.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.7.0 +OPTEE_BENCHMARK_VERSION = 3.9.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 5/5 package/optee-examples: bump to version 3.9.0
In reply to Etienne CarriereBump OP-TEE Examples package version to OP-TEE release 3.9.0.
--- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-examples/optee-examples.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.7.0.tar.gz -sha256 6c5600871edc64dbdca08dfe40b3161bfb55a11e6004699957c6da8f67b2a475 optee-examples-3.7.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.9.0.tar.gz +sha256 deb5161ac9b9c1bf12963d28992e3941452a78bcbd518169b53c0798393eb386 optee-examples-3.9.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE
package/optee-examples/optee-examples.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.7.0 +OPTEE_EXAMPLES_VERSION = 3.9.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 1/5 boot/optee-os: bump to version 3.9.0
In reply to Etienne CarriereHi Etienne, All,
Le 29/05/2020 ? 16:27, Etienne Carriere a ?crit?:
Quoted 5 lines
Bump OP-TEE OS package version to OP-TEE release 3.9.0.
Update patch on pydrypto/pycryptodome to match 3.9.0.
Add patch onCFG_OPTEE_REVISION_MINORthat was not updated in release 3.9.0 and fixed only few commits above.
I runtime tested this version using the qemu_arm_vexpress_tz_defconfig.
I discovered an issue with optee-benchmark with gcc10 (not related with this
series).
See
http://patchwork.ozlabs.org/project/buildroot/patch/20200530171428.562778-1-romain.naour at gmail.com/
Otherwise:
Best regards,
Romain
Quoted 195 lines
Signed-off-by Etienne Carriere <[email protected]>--- ...ub.py-use-Cryptodome-module-instead-.patch | 34 ++++++++++ ...o_pub_c.py-sign.py-use-pycryptodomex.patch | 64 ------------------- ...nfig.mk-fix-CFG_OPTEE_REVISION_MINOR.patch | 32 ++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 5 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch delete mode 100644 boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch create mode 100644 boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patchboot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch new file +34
-0@@ -0,0 +1,34 @@ +From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001 +From: Etienne Carriere <[email protected]> +Date: Tue, 26 May 2020 11:10:45 +0200 +Subject: [PATCH 2/2] scripts/pem_to_pub.py: use Cryptodome module instead of + Crypto + +Upgrade scripts/pem_to_pub.py to use module Cryptodome instead of +module Crypto for consistency with the other helper Python scripts +of OP-TEE OS package. + +Signed-off-by: Etienne Carriere <[email protected]> +Acked-by: Jens Wiklander <[email protected]> +--- + scripts/pem_to_pub_c.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py +index 3a896a393..d3f0e5006 100755 +--- a/scripts/pem_to_pub_c.py ++++ b/scripts/pem_to_pub_c.py +@@ -21,8 +21,8 @@ def get_args(): + + def main(): + import array +- from Crypto.PublicKey import RSA +- from Crypto.Util.number import long_to_bytes ++ from Cryptodome.PublicKey import RSA ++ from Cryptodome.Util.number import long_to_bytes + + args = get_args() + +-- +2.17.1 +boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch deleted +0
-64@@ -1,64 +0,0 @@ -From 06e71feaeb08349abe56b50c3dfb08a8341cf55f Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sun, 26 Apr 2020 21:55:55 +0200 -Subject: [PATCH] scripts/pem_to_pub_c.py/sign.py: use pycryptodomex - -These scripts still use pycrypto. - -From [1]: -"PyCryptodome is a fork of PyCrypto, which is not maintained any more -(the last release dates back to 2013 [2]). It exposes almost the same -API, but there are a few incompatibilities [3]." - -Don't use upstream commit since it also switches from the algorithm -TEE_ALG_RSASSA_PKCS1_V1_5_SHA256 to TEE_ALG_RSASSA_PKCS1_PSS_MGF1_SHA256 -when replacing pycrypto to pycryptodomex [4]. - -[1] https://github.com/OP-TEE/optee_os/commit/90ad2450436fdd9fc0d28a3f92f3fbcfd89a38f0 -[2] https://pypi.org/project/pycrypto/#history -[3] https://pycryptodome.readthedocs.io/en/latest/src/vs_pycrypto.html -[4] https://github.com/OP-TEE/optee_os/commit/ababd72d2fd76cb2ded8e202b49db28d6545f6eb - -Signed-off-by: Romain Naour <[email protected]> ---- - scripts/pem_to_pub_c.py | 4 ++-- - scripts/sign.py | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py -index 3a896a39..d3f0e500 100755 ---- a/scripts/pem_to_pub_c.py -+++ b/scripts/pem_to_pub_c.py -@@ -21,8 +21,8 @@ def get_args(): - - def main(): - import array -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import long_to_bytes -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import long_to_bytes - - args = get_args() - -diff --git a/scripts/sign.py b/scripts/sign.py -index 2939c591..80ce2e9f 100755 ---- a/scripts/sign.py -+++ b/scripts/sign.py -@@ -121,10 +121,10 @@ def get_args(logger): - - - def main(): -- from Crypto.Signature import PKCS1_v1_5 -- from Crypto.Hash import SHA256 -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import ceil_div -+ from Cryptodome.Signature import PKCS1_v1_5 -+ from Cryptodome.Hash import SHA256 -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import ceil_div - import base64 - import logging - import os --- -2.25.3 -boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch new file +32
-0@@ -0,0 +1,32 @@ +From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001 +From: Jens Wiklander <[email protected]> +Date: Mon, 25 May 2020 12:20:08 +0200 +Subject: [PATCH 1/2] config.mk: fix CFG_OPTEE_REVISION_MINOR + +The current release is 3.9.0, change the revision to match. + +Fixes: af141c61fe7a ("Update CHANGELOG for 3.9.0") +Reviewed-by: Joakim Bech <[email protected]> +Reported-by: Etienne Carriere <[email protected]> +Signed-off-by: Jens Wiklander <[email protected]> +Signed-off-by: Etienne Carriere <[email protected]> +--- + mk/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/config.mk b/mk/config.mk +index c00a14618..bc49f83d8 100644 +--- a/mk/config.mk ++++ b/mk/config.mk +@@ -116,7 +116,7 @@ endif + # with limited depth not including any tag, so there is really no guarantee + # that TEE_IMPL_VERSION contains the major and minor revision numbers. + CFG_OPTEE_REVISION_MAJOR ?= 3 +-CFG_OPTEE_REVISION_MINOR ?= 8 ++CFG_OPTEE_REVISION_MINOR ?= 9 + + # Trusted OS implementation manufacturer name + CFG_TEE_MANUFACTURER ?= LINARO +-- +2.17.1 +boot/optee-os/Config.in +2
-2@@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.7.0" + bool "3.9.0" help Use the latest release tag from the OP-TEE OS official Git repository.@@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.9.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GITboot/optee-os/optee-os.hash +2
-2@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz -sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.9.0.tar.gz +sha256 ac6f145ebde715d4d7a1d5277f4e08a06b660e1c0237c926a274d86cd90ef4c5 optee-os-3.9.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
PATCH 1/5 boot/optee-os: bump to version 3.9.0
Hello Romain,
Quoted 10 lines · Romain Naour
Hi Etienne, All,
Le 29/05/2020 ? 16:27, Etienne Carriere a ?crit :
Quoted 5 lines
Bump OP-TEE OS package version to OP-TEE release 3.9.0.
Update patch on pydrypto/pycryptodome to match 3.9.0.
Add patch onCFG_OPTEE_REVISION_MINORthat was not updated in release 3.9.0 and fixed only few commits above.
Quoted 6 lines
I runtime tested this version using the
qemu_arm_vexpress_tz_defconfig.I discovered an issue with optee-benchmark with gcc10 (not related with this
series).
See
http://patchwork.ozlabs.org/project/buildroot/patch/20200530171428.562778-1-romain.naour at gmail.com/
Thanks for the report and the fix. I'll post them to the optee_benchmark forum so the issue gets fixed in the package.
Best regards,
Etienne
Quoted 203 lines
Otherwise:
Tested-by Romain Naour <[email protected]>Best regards,
RomainQuoted 195 lines
Signed-off-by Etienne Carriere <[email protected]>--- ...ub.py-use-Cryptodome-module-instead-.patch | 34 ++++++++++ ...o_pub_c.py-sign.py-use-pycryptodomex.patch | 64 ------------------- ...nfig.mk-fix-CFG_OPTEE_REVISION_MINOR.patch | 32 ++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 5 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch delete mode 100644 boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch create mode 100644 boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patchboot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch new file +34
-0@@ -0,0 +1,34 @@ +From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001 +From: Etienne Carriere <[email protected]> +Date: Tue, 26 May 2020 11:10:45 +0200 +Subject: [PATCH 2/2] scripts/pem_to_pub.py: use Cryptodome module instead of + Crypto + +Upgrade scripts/pem_to_pub.py to use module Cryptodome instead of +module Crypto for consistency with the other helper Python scripts +of OP-TEE OS package. + +Signed-off-by: Etienne Carriere <[email protected]> +Acked-by: Jens Wiklander <[email protected]> +--- + scripts/pem_to_pub_c.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py +index 3a896a393..d3f0e5006 100755 +--- a/scripts/pem_to_pub_c.py ++++ b/scripts/pem_to_pub_c.py +@@ -21,8 +21,8 @@ def get_args(): + + def main(): + import array +- from Crypto.PublicKey import RSA +- from Crypto.Util.number import long_to_bytes ++ from Cryptodome.PublicKey import RSA ++ from Cryptodome.Util.number import long_to_bytes + + args = get_args() + +-- +2.17.1 +boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch deleted +0
-64@@ -1,64 +0,0 @@ -From 06e71feaeb08349abe56b50c3dfb08a8341cf55f Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sun, 26 Apr 2020 21:55:55 +0200 -Subject: [PATCH] scripts/pem_to_pub_c.py/sign.py: use pycryptodomex - -These scripts still use pycrypto. - -From [1]: -"PyCryptodome is a fork of PyCrypto, which is not maintained any more -(the last release dates back to 2013 [2]). It exposes almost the same -API, but there are a few incompatibilities [3]." - -Don't use upstream commit since it also switches from the algorithm -TEE_ALG_RSASSA_PKCS1_V1_5_SHA256 to TEE_ALG_RSASSA_PKCS1_PSS_MGF1_SHA256 -when replacing pycrypto to pycryptodomex [4]. - -[1] https://github.com/OP-TEE/optee_os/commit/90ad2450436fdd9fc0d28a3f92f3fbcfd89a38f0 -[2] https://pypi.org/project/pycrypto/#history -[3] https://pycryptodome.readthedocs.io/en/latest/src/vs_pycrypto.html -[4] https://github.com/OP-TEE/optee_os/commit/ababd72d2fd76cb2ded8e202b49db28d6545f6eb - -Signed-off-by: Romain Naour <[email protected]> ---- - scripts/pem_to_pub_c.py | 4 ++-- - scripts/sign.py | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py -index 3a896a39..d3f0e500 100755 ---- a/scripts/pem_to_pub_c.py -+++ b/scripts/pem_to_pub_c.py -@@ -21,8 +21,8 @@ def get_args(): - - def main(): - import array -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import long_to_bytes -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import long_to_bytes - - args = get_args() - -diff --git a/scripts/sign.py b/scripts/sign.py -index 2939c591..80ce2e9f 100755 ---- a/scripts/sign.py -+++ b/scripts/sign.py -@@ -121,10 +121,10 @@ def get_args(logger): - - - def main(): -- from Crypto.Signature import PKCS1_v1_5 -- from Crypto.Hash import SHA256 -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import ceil_div -+ from Cryptodome.Signature import PKCS1_v1_5 -+ from Cryptodome.Hash import SHA256 -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import ceil_div - import base64 - import logging - import os --- -2.25.3 -boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch new file +32
-0@@ -0,0 +1,32 @@ +From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001 +From: Jens Wiklander <[email protected]> +Date: Mon, 25 May 2020 12:20:08 +0200 +Subject: [PATCH 1/2] config.mk: fix CFG_OPTEE_REVISION_MINOR + +The current release is 3.9.0, change the revision to match. + +Fixes: af141c61fe7a ("Update CHANGELOG for 3.9.0") +Reviewed-by: Joakim Bech <[email protected]> +Reported-by: Etienne Carriere <[email protected]> +Signed-off-by: Jens Wiklander <[email protected]> +Signed-off-by: Etienne Carriere <[email protected]> +--- + mk/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/config.mk b/mk/config.mk +index c00a14618..bc49f83d8 100644 +--- a/mk/config.mk ++++ b/mk/config.mk +@@ -116,7 +116,7 @@ endif + # with limited depth not including any tag, so there is really no guarantee + # that TEE_IMPL_VERSION contains the major and minor revision numbers. + CFG_OPTEE_REVISION_MAJOR ?= 3 +-CFG_OPTEE_REVISION_MINOR ?= 8 ++CFG_OPTEE_REVISION_MINOR ?= 9 + + # Trusted OS implementation manufacturer name + CFG_TEE_MANUFACTURER ?= LINARO +-- +2.17.1 +boot/optee-os/Config.in +2
-2@@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.7.0" + bool "3.9.0" help Use the latest release tag from the OP-TEE OS official Git repository.@@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.9.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GITboot/optee-os/optee-os.hash +2
-2@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz -sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.9.0.tar.gz +sha256 ac6f145ebde715d4d7a1d5277f4e08a06b660e1c0237c926a274d86cd90ef4c5 optee-os-3.9.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
PATCH 1/5 boot/optee-os: bump to version 3.9.0
In reply to Etienne CarriereQuoted 7 lines · On Fri, 29 May 2020 16:27:38 +0200 Etienne Carriere…
Bump OP-TEE OS package version to OP-TEE release 3.9.0.
Update patch on pydrypto/pycryptodome to match 3.9.0.
Add patch onCFG_OPTEE_REVISION_MINORthat was not updated in release 3.9.0 and fixed only few commits above.Signed-off-by Etienne Carriere <[email protected]>
Quoted 10 lines
--- ...ub.py-use-Cryptodome-module-instead-.patch | 34 ++++++++++ ...o_pub_c.py-sign.py-use-pycryptodomex.patch | 64 ------------------- ...nfig.mk-fix-CFG_OPTEE_REVISION_MINOR.patch | 32 ++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 5 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch delete mode 100644 boot/optee-os/0001-scripts-pem_to_pub_c.py-sign.py-use-pycryptodomex.patch create mode 100644 boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch
Thanks, series applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com