Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Perform 2-RTT Handshake to upgrade to PQ when possible #4526

Merged
merged 5 commits into from
Jun 24, 2024
Merged

Perform 2-RTT Handshake to upgrade to PQ when possible #4526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f227c7d
Perform 2-RTT Handshake to upgrade to PQ when possible
alexw91 Apr 24, 2024
e9b0611
Update tests to pass on Openssl 1.1.1
alexw91 Apr 29, 2024
3d9250e
Cleanup
alexw91 May 20, 2024
71239fa
Address Feedback
alexw91 Jun 12, 2024
34a97bc
Address Feedback
alexw91 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions tests/unit/s2n_extensions_server_key_share_select_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,7 @@ int main()
EXPECT_SUCCESS(s2n_connection_free(server_conn));
};

/* When client sent valid keyshares
* only for ECC, server should choose curves[0] and not send HRR. */
/* When client sent KeyShares only for ECC but also supports PQ, server should choose PQ and send HRR. */
{
struct s2n_connection *server_conn = NULL;
EXPECT_NOT_NULL(server_conn = s2n_connection_new(S2N_SERVER));
Expand Down Expand Up @@ -422,13 +421,12 @@ int main()

EXPECT_SUCCESS(s2n_extensions_server_key_share_select(server_conn));

/* Server should update its choice to curve[0], no HRR */
EXPECT_EQUAL(server_conn->kex_params.server_ecc_evp_params.negotiated_curve, ecc_pref->ecc_curves[0]);
EXPECT_NULL(server_params->kem_group);
EXPECT_NULL(server_params->kem_params.kem);
EXPECT_NULL(server_params->ecc_params.negotiated_curve);
EXPECT_NULL(server_conn->kex_params.server_ecc_evp_params.negotiated_curve);
EXPECT_EQUAL(server_params->kem_group, kem_group0);
EXPECT_EQUAL(server_params->kem_params.kem, kem_group0->kem);
EXPECT_EQUAL(server_params->ecc_params.negotiated_curve, kem_group0->curve);
EXPECT_NULL(server_conn->kex_params.client_kem_group_params.kem_group);
EXPECT_FALSE(s2n_is_hello_retry_handshake(server_conn));
EXPECT_TRUE(s2n_is_hello_retry_handshake(server_conn));

EXPECT_SUCCESS(s2n_connection_free(server_conn));
};
Expand Down
Loading
Loading