Jon Mason
66bb701b2e
python3-cbor2: Fix CVE-2025-68131 CVE patch error
...
The patch for CVE-2025-68131 does not actually match https://github.com/agronholm/cbor2/commit/f1d701cd2c411ee40bb1fe383afe7f365f35abf0
Specifically, the indenting in decode_from_bytes
This is causing an error in trusted-firmware-m of
| Traceback (most recent call last):
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/git/tfm/bl2/ext/mcuboot/scripts/wrapper/wrapper.py", line 21, in <module>
| import imgtool.main
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/git/mcuboot/scripts/imgtool/main.py", line 25, in <module>
| from imgtool import image, imgtool_version
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/git/mcuboot/scripts/imgtool/image.py", line 24, in <module>
| from .boot_record import create_sw_component_data
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/git/mcuboot/scripts/imgtool/boot_record.py", line 21, in <module>
| from cbor2 import dumps
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/cbor2/__init__.py", line 1, in <module>
| from .decoder import load, loads, CBORDecoder # noqa
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/cbor2/decoder.py", line 215
| with BytesIO(buf) as fp:
| ^
| IndentationError: expected an indented block after 'with' statement on line 214
Indenting to match the original patch fixes this.
Also, because this version of cbor2 is older, it doesn't include commit
53e21063ed1d72ac8f911044dd598a7f9ef72406, which adds 'Any' to encode.py
Because that is missing, we see the following error:
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/cbor2/__init__.py", line 2, in <module>
| from .encoder import dump, dumps, CBOREncoder, shareable_encoder # noqa
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/cbor2/encoder.py", line 68, in <module>
| class CBOREncoder:
| File "/builder/meta-arm/build/tmp/work/corstone1000_fvp-poky-linux-musl/trusted-firmware-m/1.5.0+gitAUTOINC+f8c7e5361b-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/cbor2/encoder.py", line 266, in CBOREncoder
| def _encode_value(self, obj: Any) -> None:
To get around this issue, remove the "Any" from the encoder.py. The
logic behind this (instead of importing typing) is that this is the only
instance, and since this is not something that will be updated
frequently with patches from upstream.
Signed-off-by: Jon Mason <jon.mason@arm.com >
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com >
2026-04-13 16:30:11 +02:00
..
2025-11-07 12:42:02 +01:00
2021-10-14 07:15:37 -07:00
2025-11-02 15:09:03 +01:00
2022-03-03 08:48:07 -08:00
2025-10-20 11:59:36 +02:00
2022-02-24 08:30:26 -08:00
2026-04-13 16:30:11 +02:00
2026-01-08 22:03:03 +01:00
2022-04-22 16:26:22 +00:00
2022-03-03 08:48:06 -08:00
2022-01-18 08:59:58 -08:00
2026-01-17 13:45:38 +01:00
2026-01-17 13:45:38 +01:00
2026-02-15 15:30:54 +01:00
2026-01-20 18:22:04 +01:00
2021-06-24 12:54:18 -07:00
2021-06-23 10:45:31 -07:00
2026-01-08 22:03:03 +01:00
2023-07-25 07:24:25 -04:00
2025-10-27 11:17:48 +01:00
2022-03-15 15:34:22 -04:00
2022-03-15 15:34:22 -04:00
2025-10-27 11:17:53 +01:00
2021-04-01 08:31:16 -07:00
2022-03-09 07:37:03 -08:00
2022-03-09 07:37:04 -08:00
2026-01-08 22:03:03 +01:00
2021-09-07 10:02:11 -07:00
2022-03-03 08:48:07 -08:00
2022-07-26 07:08:35 -07:00
2022-03-21 09:57:28 -04:00
2023-06-03 07:55:37 -04:00
2022-01-18 08:59:58 -08:00
2026-01-08 22:03:03 +01:00
2022-02-24 08:30:26 -08:00
2025-11-07 12:41:54 +01:00
2025-10-27 11:17:43 +01:00
2021-02-01 10:44:55 -08:00
2026-02-03 19:53:58 +01:00
2021-06-24 12:54:18 -07:00
2021-02-01 10:44:20 -08:00
2022-06-22 16:21:05 -07:00
2026-01-08 22:03:03 +01:00
2026-01-30 18:59:29 +01:00
2022-03-01 09:06:56 -08:00
2022-03-17 08:54:17 -04:00
2022-03-23 09:46:31 -04:00
2024-05-22 12:50:26 -07:00
2022-03-11 08:48:38 -05:00
2025-10-27 11:17:38 +01:00
2022-03-01 09:06:56 -08:00
2022-03-03 08:48:07 -08:00
2022-01-18 08:59:58 -08:00
2025-10-20 11:59:36 +02:00
2025-01-22 19:29:37 -05:00
2022-03-01 09:06:56 -08:00
2026-01-08 22:03:03 +01:00
2026-01-08 22:03:03 +01:00
2026-01-20 18:22:07 +01:00
2022-03-01 09:06:56 -08:00
2025-10-20 11:59:36 +02:00
2026-01-08 22:03:03 +01:00
2026-01-30 18:59:28 +01:00
2025-10-20 11:59:35 +02:00
2021-03-22 09:19:27 -07:00
2021-11-16 08:25:15 -08:00
2025-10-20 12:00:28 +02:00
2022-03-01 09:06:56 -08:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-11-17 09:24:26 -08:00
2022-04-22 16:26:22 +00:00
2022-03-16 09:25:28 -04:00
2025-11-07 12:42:02 +01:00
2023-11-18 10:03:15 -05:00
2022-01-18 08:59:58 -08:00
2021-11-21 22:06:22 -08:00
2022-03-28 08:35:31 -04:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2021-08-16 08:21:14 -07:00
2022-01-21 08:23:59 -08:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2022-03-28 08:35:31 -04:00
2025-11-02 15:09:03 +01:00
2022-03-01 09:06:56 -08:00
2022-05-17 05:57:10 -07:00
2022-03-19 19:00:34 -07:00
2021-11-11 06:36:04 -08:00
2022-03-19 19:00:34 -07:00
2022-03-09 07:37:04 -08:00
2022-03-04 17:41:45 -08:00
2022-01-18 08:59:58 -08:00
2023-11-18 10:03:15 -05:00
2021-08-03 10:21:25 -07:00
2022-04-22 16:26:22 +00:00
2022-03-17 10:00:11 -07:00
2022-03-07 09:27:53 -08:00
2022-04-11 09:22:30 -04:00
2025-11-17 09:08:38 +01:00
2025-10-20 11:59:36 +02:00
2026-01-30 18:59:28 +01:00
2022-04-06 14:55:16 -04:00
2021-08-03 10:21:25 -07:00
2022-04-22 16:26:22 +00:00
2022-02-24 08:30:26 -08:00
2021-12-20 20:20:29 -08:00
2021-08-30 08:10:12 -07:00
2022-03-28 08:35:31 -04:00
2023-08-11 10:30:50 -04:00
2022-03-28 08:35:32 -04:00
2021-08-03 10:21:25 -07:00
2026-02-27 14:28:43 +01:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2022-02-28 08:32:19 -08:00
2022-04-04 09:08:21 -04:00
2022-04-06 14:55:16 -04:00
2021-08-03 10:21:25 -07:00
2022-04-22 16:26:22 +00:00
2024-09-22 10:16:05 -04:00
2022-03-01 09:06:56 -08:00
2021-11-16 08:25:15 -08:00
2022-01-11 17:50:55 -08:00
2021-10-25 08:35:04 -07:00
2026-01-08 22:03:03 +01:00
2022-03-03 08:48:07 -08:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2022-02-24 08:30:26 -08:00
2022-04-22 16:26:22 +00:00
2024-09-22 10:13:53 -04:00
2022-03-03 08:48:06 -08:00
2026-01-30 18:59:28 +01:00
2021-01-28 10:51:52 -08:00
2022-03-04 17:41:45 -08:00
2021-11-02 08:06:11 -07:00
2021-10-18 09:49:36 -07:00
2022-03-19 19:00:34 -07:00
2021-08-19 09:56:43 -07:00
2022-03-04 17:41:45 -08:00
2022-01-20 09:53:40 -08:00
2022-03-04 17:41:45 -08:00
2021-11-19 08:30:36 -08:00
2021-09-20 08:43:37 -07:00
2022-01-10 10:35:02 -08:00
2022-02-24 08:30:26 -08:00
2026-01-17 13:45:38 +01:00
2026-01-17 13:45:38 +01:00
2026-02-15 15:30:54 +01:00
2022-01-05 08:15:50 -08:00
2022-03-17 08:54:17 -04:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2026-01-30 18:59:29 +01:00
2021-09-10 06:55:20 -07:00
2022-04-11 09:22:30 -04:00
2021-11-16 08:25:15 -08:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2022-04-04 09:08:21 -04:00
2026-01-20 18:22:04 +01:00
2022-01-04 08:40:52 -08:00
2024-09-22 10:16:08 -04:00
2022-03-19 19:00:34 -07:00
2022-01-19 08:58:09 -08:00
2021-11-11 06:36:04 -08:00
2021-08-03 10:21:25 -07:00
2026-01-08 22:03:03 +01:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-04-11 09:22:30 -04:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-11 11:20:55 -08:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2025-03-06 09:39:34 -05:00
2021-11-17 09:24:26 -08:00
2023-12-13 13:35:51 -05:00
2021-09-20 08:43:37 -07:00
2024-12-08 14:38:16 -05:00
2023-10-17 08:44:46 -04:00
2022-03-04 17:41:45 -08:00
2021-10-28 09:01:25 -07:00
2021-12-16 08:14:04 -08:00
2022-04-11 09:22:30 -04:00
2022-04-17 16:46:15 +00:00
2022-04-11 09:22:30 -04:00
2024-09-22 10:16:14 -04:00
2021-08-03 10:21:25 -07:00
2022-04-17 16:46:16 +00:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2026-01-08 22:03:03 +01:00
2026-01-08 22:03:03 +01:00
2025-10-27 11:17:53 +01:00
2025-02-09 07:58:24 -08:00
2022-03-03 08:48:07 -08:00
2024-09-22 10:16:18 -04:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2022-01-11 17:50:55 -08:00
2021-09-28 09:15:08 -07:00
2022-03-19 19:00:34 -07:00
2022-03-19 19:00:34 -07:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2022-04-22 16:26:22 +00:00
2022-04-17 16:46:15 +00:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-02-19 10:02:43 -08:00
2022-03-28 08:35:32 -04:00
2022-03-09 07:37:04 -08:00
2026-01-08 22:03:03 +01:00
2021-09-20 08:43:37 -07:00
2022-03-19 19:00:34 -07:00
2022-01-07 11:01:30 -08:00
2022-03-16 09:25:28 -04:00
2022-04-04 09:08:21 -04:00
2021-05-19 09:16:54 -07:00
2022-04-04 09:08:21 -04:00
2021-09-20 08:43:37 -07:00
2021-11-19 08:30:36 -08:00
2022-04-11 09:22:30 -04:00
2026-01-08 22:03:03 +01:00
2022-01-19 08:58:09 -08:00
2021-08-03 10:21:25 -07:00
2022-02-03 08:40:20 -08:00
2022-03-21 09:57:28 -04:00
2022-03-03 08:48:07 -08:00
2023-08-30 13:41:52 -04:00
2022-04-04 09:08:21 -04:00
2022-03-04 17:41:45 -08:00
2022-01-04 08:40:52 -08:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2024-12-08 14:38:16 -05:00
2022-03-21 09:57:28 -04:00
2026-01-08 22:03:03 +01:00
2022-04-22 16:26:22 +00:00
2022-06-03 07:02:48 -07:00
2021-05-17 08:52:24 -07:00
2022-03-01 09:06:56 -08:00
2024-09-22 10:14:02 -04:00
2022-02-28 08:32:19 -08:00
2026-01-08 22:03:03 +01:00
2022-01-04 08:40:52 -08:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-01-31 08:15:17 -08:00
2022-04-11 09:22:30 -04:00
2022-02-16 08:13:29 -08:00
2021-08-03 10:21:25 -07:00
2021-06-01 07:48:10 -07:00
2022-03-10 10:03:30 -05:00
2021-10-18 09:49:36 -07:00
2022-04-17 16:46:15 +00:00
2022-04-17 16:46:15 +00:00
2022-03-03 08:48:07 -08:00
2022-11-19 11:16:48 -05:00
2022-03-04 17:41:45 -08:00
2021-10-14 07:15:37 -07:00
2022-03-17 10:00:11 -07:00
2021-10-28 09:01:25 -07:00
2022-02-28 08:32:19 -08:00
2022-04-06 14:55:16 -04:00
2021-09-20 08:43:37 -07:00
2026-01-30 18:59:29 +01:00
2021-08-03 10:21:25 -07:00
2024-09-22 10:15:58 -04:00
2022-01-06 12:34:12 -08:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2025-11-07 12:41:54 +01:00
2025-10-27 11:17:43 +01:00
2021-08-30 08:10:12 -07:00
2022-03-16 09:25:28 -04:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2021-11-19 08:30:36 -08:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2022-03-23 09:46:31 -04:00
2021-08-03 10:21:25 -07:00
2021-08-06 20:37:42 -07:00
2021-12-20 20:20:29 -08:00
2026-04-03 10:40:37 +00:00
2022-03-17 10:00:11 -07:00
2022-04-11 09:22:30 -04:00
2025-10-27 11:17:36 +01:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2021-08-03 10:21:25 -07:00
2024-09-22 10:12:59 -04:00
2021-11-03 06:57:49 -07:00
2022-06-22 16:21:05 -07:00
2022-04-06 14:55:16 -04:00
2022-01-24 09:09:59 -08:00
2021-10-18 09:49:37 -07:00
2024-09-22 10:16:10 -04:00
2022-03-04 17:41:45 -08:00
2021-11-03 06:57:49 -07:00
2021-11-16 08:25:15 -08:00
2021-08-03 10:21:25 -07:00
2021-10-28 09:01:25 -07:00
2022-03-19 19:00:34 -07:00
2022-03-04 17:41:45 -08:00
2021-10-19 09:21:18 -07:00
2021-08-03 10:21:25 -07:00
2026-01-08 22:03:03 +01:00
2021-08-03 10:21:25 -07:00
2022-04-17 16:46:15 +00:00
2022-03-03 08:48:07 -08:00
2022-03-30 09:09:07 -04:00
2022-03-15 15:34:22 -04:00
2026-01-30 18:59:29 +01:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2022-03-01 09:06:56 -08:00
2021-09-20 08:43:37 -07:00
2021-10-18 09:49:37 -07:00
2022-03-16 09:25:28 -04:00
2022-03-04 17:41:45 -08:00
2022-03-17 08:54:17 -04:00
2022-04-11 09:22:30 -04:00
2022-02-28 08:32:19 -08:00
2022-03-09 07:37:04 -08:00
2021-08-03 10:21:25 -07:00
2022-03-04 17:41:45 -08:00
2021-10-28 09:01:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2022-04-11 09:22:30 -04:00
2022-03-19 19:00:34 -07:00
2022-03-23 09:46:31 -04:00
2022-03-30 09:09:07 -04:00
2021-08-03 10:21:25 -07:00
2022-01-31 08:15:17 -08:00
2022-03-19 19:00:34 -07:00
2022-03-10 10:03:30 -05:00
2022-01-20 09:53:40 -08:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2023-11-18 10:03:15 -05:00
2021-08-03 10:21:25 -07:00
2024-06-27 11:20:34 -04:00
2022-03-19 19:00:34 -07:00
2022-04-06 14:55:16 -04:00
2021-11-01 05:41:29 -07:00
2022-01-11 17:50:55 -08:00
2022-04-17 16:46:15 +00:00
2022-04-11 09:22:30 -04:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-02-11 09:10:03 -08:00
2022-12-20 09:49:02 -05:00
2022-03-30 09:09:07 -04:00
2023-11-18 10:03:15 -05:00
2022-03-16 09:25:28 -04:00
2022-03-09 07:37:04 -08:00
2022-03-01 09:06:56 -08:00
2021-08-03 10:21:25 -07:00
2022-04-17 16:46:15 +00:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2021-11-20 12:07:09 -08:00
2022-03-04 17:41:45 -08:00
2024-09-22 10:16:22 -04:00
2022-03-10 10:03:30 -05:00
2026-01-30 18:59:28 +01:00
2023-11-18 10:03:15 -05:00
2022-03-19 19:00:34 -07:00
2025-10-20 11:59:36 +02:00
2022-06-03 07:01:00 -07:00
2022-04-17 16:46:15 +00:00
2025-01-22 19:29:37 -05:00
2021-10-25 08:35:04 -07:00
2022-01-18 08:59:58 -08:00
2022-04-11 09:22:30 -04:00
2022-03-04 17:41:45 -08:00
2021-02-24 09:07:45 -08:00
2022-03-04 17:41:45 -08:00
2022-03-01 09:06:56 -08:00
2021-07-16 08:57:37 -07:00
2026-01-08 22:03:03 +01:00
2026-01-08 22:03:03 +01:00
2022-04-06 14:55:16 -04:00
2021-08-03 10:21:25 -07:00
2022-03-19 19:00:34 -07:00
2022-02-28 08:32:19 -08:00
2022-04-06 14:55:16 -04:00
2026-01-20 18:22:07 +01:00
2026-01-30 18:59:29 +01:00
2022-03-01 09:06:56 -08:00
2023-11-18 10:03:15 -05:00
2021-08-03 10:21:25 -07:00
2022-03-03 08:48:07 -08:00
2025-10-20 11:59:36 +02:00
2022-04-06 14:55:16 -04:00
2021-08-03 10:21:25 -07:00
2022-01-11 17:50:55 -08:00
2022-02-24 08:30:26 -08:00
2021-10-18 09:49:37 -07:00
2022-03-04 17:41:45 -08:00
2026-01-08 22:03:03 +01:00
2022-03-30 09:09:07 -04:00
2021-09-20 08:43:37 -07:00
2022-04-06 14:55:16 -04:00
2022-03-01 09:06:56 -08:00
2026-02-27 14:28:50 +01:00
2025-10-20 11:59:35 +02:00
2021-08-03 10:21:25 -07:00
2022-03-21 09:57:28 -04:00
2022-01-18 08:59:58 -08:00
2022-02-28 08:32:19 -08:00
2024-09-22 10:13:03 -04:00
2022-03-04 17:41:45 -08:00
2022-04-11 09:22:30 -04:00
2021-08-03 10:21:25 -07:00
2022-03-03 08:48:06 -08:00
2022-03-04 17:41:45 -08:00
2022-03-10 10:03:29 -05:00
2022-03-19 19:00:34 -07:00
2021-11-16 08:25:15 -08:00
2025-10-20 12:00:28 +02:00
2022-04-11 09:22:30 -04:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2026-01-08 22:03:03 +01:00
2021-09-20 08:43:37 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00
2021-08-03 10:21:25 -07:00