Fix 3 tests on OpenSSL 1.0.2

aws · Oct 2, 2023 · c548a0d · c548a0d
1 parent 88bc602
commit c548a0d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/tests/unit/s2n_security_policies_test.c b/tests/unit/s2n_security_policies_test.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
                         break;
                     }
                 }
-                if (s2n_pq_is_enabled()) {
+                if (s2n_pq_is_enabled() && kem_group->available) {
                     EXPECT_TRUE(kem_group_is_supported);
                 } else {
                     EXPECT_FALSE(kem_group_is_supported);
@@ -353,9 +353,9 @@ int main(int argc, char **argv)
         EXPECT_NOT_NULL(security_policy->kem_preferences->tls13_kem_groups);
         EXPECT_EQUAL(security_policy->kem_preferences->tls13_kem_groups, pq_kem_groups_r3_2021_05);
         if (s2n_is_evp_apis_supported()) {
-            EXPECT_EQUAL(2, security_policy->kem_preferences->tls13_kem_group_count);
+            EXPECT_EQUAL(2, s2n_kem_groups_available_count(security_policy->kem_preferences));
         } else {
-            EXPECT_EQUAL(1, security_policy->kem_preferences->tls13_kem_group_count);
+            EXPECT_EQUAL(1, s2n_kem_groups_available_count(security_policy->kem_preferences));
         }
 
         security_policy = NULL;
@@ -368,9 +368,9 @@ int main(int argc, char **argv)
         EXPECT_NOT_NULL(security_policy->kem_preferences->tls13_kem_groups);
         EXPECT_EQUAL(security_policy->kem_preferences->tls13_kem_groups, pq_kem_groups_r3_2021_05);
         if (s2n_is_evp_apis_supported()) {
-            EXPECT_EQUAL(2, security_policy->kem_preferences->tls13_kem_group_count);
+            EXPECT_EQUAL(2, s2n_kem_groups_available_count(security_policy->kem_preferences));
         } else {
-            EXPECT_EQUAL(1, security_policy->kem_preferences->tls13_kem_group_count);
+            EXPECT_EQUAL(1, s2n_kem_groups_available_count(security_policy->kem_preferences));
         }
 
         security_policy = NULL;

diff --git a/tests/unit/s2n_tls13_hybrid_shared_secret_test.c b/tests/unit/s2n_tls13_hybrid_shared_secret_test.c
@@ -407,6 +407,9 @@ int main(int argc, char **argv)
         for (int i = 0; i < s2n_array_len(all_test_vectors); i++) {
             const struct hybrid_test_vector *test_vector = all_test_vectors[i];
             const struct s2n_kem_group *kem_group = test_vector->kem_group;
+            if (!kem_group->available) {
+                continue;
+            }
 
             /* Set up connections */
             struct s2n_connection *client_conn = NULL;

diff --git a/tls/extensions/s2n_server_key_share.c b/tls/extensions/s2n_server_key_share.c
@@ -177,7 +177,8 @@ static int s2n_server_key_share_recv_pq_hybrid(struct s2n_connection *conn, uint
 
     size_t kem_group_index = 0;
     for (size_t i = 0; i < kem_pref->tls13_kem_group_count; i++) {
-        if (named_group_iana == kem_pref->tls13_kem_groups[i]->iana_id) {
+        if (named_group_iana == kem_pref->tls13_kem_groups[i]->iana_id
+                && kem_pref->tls13_kem_groups[i]->available) {
             kem_group_index = i;
             break;
         }