From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 28 Feb 2024 06:14:08 +0000 (+0100)
Subject: Try to fix intermittent CI failures in sslapitest
X-Git-Tag: openssl-3.1.6~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98dd1f7266d66614a4e04e921e74303f14cea7df;p=thirdparty%2Fopenssl.git

Try to fix intermittent CI failures in sslapitest

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23774)
---

diff --git a/test/tls-provider.c b/test/tls-provider.c
index 8dfc3bcc7d8..5140a2d2b9c 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -185,6 +185,8 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability,
     }
 
     /* Register our 2 groups */
+    OPENSSL_assert(xor_group.group_id >= 65024
+                   && xor_group.group_id < 65279 - NUM_DUMMY_GROUPS);
     ret = cb(xor_group_params, arg);
     ret &= cb(xor_kemgroup_params, arg);
 
@@ -196,6 +198,7 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability,
 
     for (i = 0; i < NUM_DUMMY_GROUPS; i++) {
         OSSL_PARAM dummygroup[OSSL_NELEM(xor_group_params)];
+        unsigned int dummygroup_id;
 
         memcpy(dummygroup, xor_group_params, sizeof(xor_group_params));
 
@@ -211,7 +214,8 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability,
         dummygroup[0].data = dummy_group_names[i];
         dummygroup[0].data_size = strlen(dummy_group_names[i]) + 1;
         /* assign unique group IDs also to dummy groups for registration */
-        *((int *)(dummygroup[3].data)) = 65279 - NUM_DUMMY_GROUPS + i;
+        dummygroup_id = 65279 - NUM_DUMMY_GROUPS + i;
+        dummygroup[3].data = (unsigned char*)&dummygroup_id;
         ret &= cb(dummygroup, arg);
     }