mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-01 13:10:04 +00:00
Code Issues Projects Releases Wiki Activity

optee-test: upgrade 3.7.0 -> 3.8.0, cleanup

Browse Source 
* Drop previously backported patch for Python3 support
* Add DESCRIPTION
* Use common HOMEPAGE
* Depend on PyCryptodomex instead of old PyCrypto

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Denys Dmytriyenko
2020-04-08 03:00:04 -04:00
committed by Jon Mason
parent 6d0eefa084
commit ae6533336f
2 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
-48
View File
@@ -1,48 +0,0 @@
From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001
From: Scott Branden <scott.branden@broadcom.com>
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 <scott.branden@broadcom.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, CFG_GCM_NIST_VECTORS=y)
Upstream-Status: Backport from v3.8.0
---
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.7.4
meta-arm/recipes-security/optee/optee-test_git.bb
+7 -8
View File
@@ -1,22 +1,21 @@
SUMMARY = "OP-TEE sanity testsuite" SUMMARY = "OP-TEE sanity testsuite"
HOMEPAGE = "https://github.com/OP-TEE/optee_test" DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
HOMEPAGE = "https://www.op-tee.org/"
LICENSE = "BSD & GPLv2" LICENSE = "BSD & GPLv2"
LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
inherit python3native inherit python3native
DEPENDS = "optee-client optee-os python3-pycrypto-native" DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
PV = "3.7.0+git${SRCPV}" PV = "3.8.0+git${SRCPV}"
SRCREV = "30481e381cb4285706e7516853495a7699c93b2c"
SRC_URI = "git://github.com/OP-TEE/optee_test.git"
SRC_URI = "git://github.com/OP-TEE/optee_test.git \
file://0001-use-python3-instead-of-python.patch \
"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08"
OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}" OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}" TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta" TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta"