From 033648652f2d66abe2454a75ded891a47cb13446 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Thu, 26 Apr 2018 13:36:53 +0100 Subject: Make TF UUID RFC 4122 compliant RFC4122 defines that fields are stored in network order (big endian), but TF-A stores them in machine order (little endian by default in TF-A). We cannot change the future UUIDs that are already generated, but we can store all the bytes using arrays and modify fiptool to generate the UUIDs with the correct byte order. Change-Id: I97be2d3168d91f4dee7ccfafc533ea55ff33e46f Signed-off-by: Roberto Vargas --- services/spd/tlkd/tlkd_main.c | 6 +++--- services/spd/tspd/tspd_main.c | 6 +++--- services/std_svc/std_svc_setup.c | 10 +++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'services') diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index 5090f063..cee7ef86 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -40,9 +40,9 @@ tlk_context_t tlk_ctx; static uint32_t boot_cpu; /* TLK UID: RFC-4122 compliant UUID (version-5, sha-1) */ -DEFINE_SVC_UUID(tlk_uuid, - 0xbd11e9c9, 0x2bba, 0x52ee, 0xb1, 0x72, - 0x46, 0x1f, 0xba, 0x97, 0x7f, 0x63); +DEFINE_SVC_UUID2(tlk_uuid, + 0xc9e911bd, 0xba2b, 0xee52, 0xb1, 0x72, + 0x46, 0x1f, 0xba, 0x97, 0x7f, 0x63); static int32_t tlkd_init(void); diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index 8cb23b96..3ec98d68 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -43,9 +43,9 @@ tsp_context_t tspd_sp_context[TSPD_CORE_COUNT]; /* TSP UID */ -DEFINE_SVC_UUID(tsp_uuid, - 0x5b3056a0, 0x3291, 0x427b, 0x98, 0x11, - 0x71, 0x68, 0xca, 0x50, 0xf3, 0xfa); +DEFINE_SVC_UUID2(tsp_uuid, + 0xa056305b, 0x9132, 0x7b42, 0x98, 0x11, + 0x71, 0x68, 0xca, 0x50, 0xf3, 0xfa); int32_t tspd_init(void); diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 41befe5b..1a81a0a3 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -19,9 +19,13 @@ #include /* Standard Service UUID */ -DEFINE_SVC_UUID(arm_svc_uid, - 0x108d905b, 0xf863, 0x47e8, 0xae, 0x2d, - 0xc0, 0xfb, 0x56, 0x41, 0xf6, 0xe2); +static uuid_t arm_svc_uid = { + {0x5b, 0x90, 0x8d, 0x10}, + {0x63, 0xf8}, + {0xe8, 0x47}, + 0xae, 0x2d, + {0xc0, 0xfb, 0x56, 0x41, 0xf6, 0xe2} +}; /* Setup Standard Services */ static int32_t std_svc_setup(void) -- cgit v1.2.3