From b8ef0168f62f72083f40e222afb168f9ba8d272d Mon Sep 17 00:00:00 2001 From: Al Cutter Date: Fri, 8 Mar 2024 18:39:05 +0000 Subject: [PATCH] Bump GoTEE and Tamago in OS (#209) --- go.mod | 4 ++-- go.sum | 8 ++++---- trusted_os/load.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fb89f1c..5d6a1c2 100644 --- a/go.mod +++ b/go.mod @@ -12,12 +12,12 @@ require ( github.com/transparency-dev/armored-witness-common v0.0.0-20240220112235-78461719cb5e github.com/transparency-dev/merkle v0.0.2 github.com/transparency-dev/serverless-log v0.0.0-20231215122707-66f68a7705f5 - github.com/usbarmory/GoTEE v0.0.0-20230914094934-f4f769daa5a9 + github.com/usbarmory/GoTEE v0.0.0-20240215171108-77a6b38432d5 github.com/usbarmory/armory-boot v0.0.0-20230922092524-e66d926bc36c github.com/usbarmory/crucible v0.0.0-20240221192724-1595f2219655 github.com/usbarmory/imx-usbnet v0.0.0-20240304152630-ca189bf3b3c1 github.com/usbarmory/imx-usbserial v0.0.0-20230503192150-40b6298b31f8 - github.com/usbarmory/tamago v0.0.0-20240221155748-0ac9f6f8a2b7 + github.com/usbarmory/tamago v0.0.0-20240306113720-d7dd77b4ed17 golang.org/x/crypto v0.21.0 golang.org/x/mod v0.16.0 google.golang.org/protobuf v1.33.0 diff --git a/go.sum b/go.sum index 96fb113..b6ff886 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/transparency-dev/serverless-log v0.0.0-20231215122707-66f68a7705f5 h1 github.com/transparency-dev/serverless-log v0.0.0-20231215122707-66f68a7705f5/go.mod h1:rx4EB9NW4aZFJT5kxf6BWRWbZSThl36jv7O5o5r/qv8= github.com/u-root/u-root v0.11.0 h1:6gCZLOeRyevw7gbTwMj3fKxnr9+yHFlgF3N7udUVNO8= github.com/u-root/u-root v0.11.0/go.mod h1:DBkDtiZyONk9hzVEdB/PWI9B4TxDkElWlVTHseglrZY= -github.com/usbarmory/GoTEE v0.0.0-20230914094934-f4f769daa5a9 h1:bVjcARGT+mwll/+no7bsCCC1UDldtuNXL00twGtLPGo= -github.com/usbarmory/GoTEE v0.0.0-20230914094934-f4f769daa5a9/go.mod h1:mPJL62h2iMZwmu2cZ/tvjCyk0uSeq06n1UJBoigN2qY= +github.com/usbarmory/GoTEE v0.0.0-20240215171108-77a6b38432d5 h1:XJjhY/+my6o+h4hll02s7rMJrNtI2XqQBBcrx7Lp/2U= +github.com/usbarmory/GoTEE v0.0.0-20240215171108-77a6b38432d5/go.mod h1:YlZVucqxy/z5QWKerml3Vm5T14UOzZEs2kXfS1nilx8= github.com/usbarmory/armory-boot v0.0.0-20230922092524-e66d926bc36c h1:qQL3CljMNrk9TyG8EUvCAPU7/bTVitJMhqlKSNhskis= github.com/usbarmory/armory-boot v0.0.0-20230922092524-e66d926bc36c/go.mod h1:20DIzHJntbLDOptGT7TOm8DkT5mL2jRyzPzVXAYVHJ8= github.com/usbarmory/crucible v0.0.0-20240221192724-1595f2219655 h1:n3JkWqsxKsbX2SKy+ac3v2rgEmTWfA/s0SC5kHlJGBY= @@ -77,8 +77,8 @@ github.com/usbarmory/imx-usbnet v0.0.0-20240304152630-ca189bf3b3c1/go.mod h1:gJs github.com/usbarmory/imx-usbserial v0.0.0-20230503192150-40b6298b31f8 h1:VPruqXJEJxTweSRyx3NIkiIqQl9ppZHp4wZnL8+Y0aI= github.com/usbarmory/imx-usbserial v0.0.0-20230503192150-40b6298b31f8/go.mod h1:XfTrYj8Ik3ljit1cSHTcsXs7lyJ/QMsplPDX8+g5s7c= github.com/usbarmory/tamago v0.0.0-20220823080407-04f05cf2a5a3/go.mod h1:Lok79mjbJnhoBGqhX5cCUsZtSemsQF5FNZW+2R1dRr8= -github.com/usbarmory/tamago v0.0.0-20240221155748-0ac9f6f8a2b7 h1:zHNDOW33rstGX2xusw6SdYF2lXgYTMvnjHzFsy/SUrg= -github.com/usbarmory/tamago v0.0.0-20240221155748-0ac9f6f8a2b7/go.mod h1:uCPXcPo8SZulhZPz8irfVqzwVlPZ45w7CTJxkfxueGA= +github.com/usbarmory/tamago v0.0.0-20240306113720-d7dd77b4ed17 h1:G5IsBi3MGrJG7LG/bbCSBhue3zaFvIVJ5FHtt1BQE/Y= +github.com/usbarmory/tamago v0.0.0-20240306113720-d7dd77b4ed17/go.mod h1:uCPXcPo8SZulhZPz8irfVqzwVlPZ45w7CTJxkfxueGA= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= diff --git a/trusted_os/load.go b/trusted_os/load.go index a4f070e..82e508f 100644 --- a/trusted_os/load.go +++ b/trusted_os/load.go @@ -45,7 +45,7 @@ func loadApplet(elf []byte, ctl *controlInterface) (ta *monitor.ExecCtx, err err } // BEE requires caching to be activated before image loading - imx6ul.ARM.ConfigureMMU(uint32(image.Region.Start()), uint32(image.Region.End()), 0, monitor.UserFlags) + imx6ul.ARM.ConfigureMMU(uint32(image.Region.Start()), uint32(image.Region.End()), 0, arm.MemoryRegion) if err = image.Load(); err != nil { return