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

Jump to bottom

Changed SSL_client_hello_get0_ciphers to align with OpenSSL behavior #1542

Merged
merged 15 commits into from
May 1, 2024
Merged

Changed SSL_client_hello_get0_ciphers to align with OpenSSL behavior #1542

merged 15 commits into from
May 1, 2024

Conversation

smittals2
Copy link
Contributor

Description of changes:

This PR aligns SSL_client_hello_get0_ciphers with OpenSSL's behavior. Previously, it returned only the ciphers supported by our library. Now, it offers all ciphersuites from the client hello, including unsupported ones.

  1. New field added to SSL struct, |all_client_cipher_suites|
  2. |ssl_parse_client_cipher_list| modified to also populate |ssl->all_client_cipher_suites|. Function signature also modified to take in an SSL object
  3. Rewrote | SSL_client_hello_get0_ciphers|
  4. Changed documentation to better callout the differences between which ciphersuites are returned (supported or unsupported)
  5. Added tests for TLS 1.2 and 1.3

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@smittals2 smittals2 requested a review from a team as a code owner April 20, 2024 00:24
justsmth
justsmth reviewed Apr 22, 2024
View reviewed changes
include/openssl/ssl.h Outdated Show resolved Hide resolved
ssl/handshake_server.cc Outdated Show resolved Hide resolved
ssl/internal.h Outdated Show resolved Hide resolved
ssl/ssl_lib.cc Outdated Show resolved Hide resolved
ssl/ssl_lib.cc Show resolved Hide resolved
ssl/internal.h Show resolved Hide resolved
ssl/ssl_lib.cc Outdated Show resolved Hide resolved
@smittals2 smittals2 requested review from justsmth, a team and andrewhop April 23, 2024 02:22
justsmth
justsmth reviewed Apr 29, 2024
View reviewed changes
ssl/handshake_server.cc Outdated Show resolved Hide resolved
@smittals2 smittals2 requested a review from justsmth April 30, 2024 22:45
justsmth
justsmth previously approved these changes Apr 30, 2024
View reviewed changes
andrewhop
andrewhop reviewed Apr 30, 2024
View reviewed changes
include/openssl/ssl.h Outdated Show resolved Hide resolved
ssl/internal.h Outdated Show resolved Hide resolved
ssl/ssl_lib.cc Show resolved Hide resolved
ssl/ssl_test.cc Outdated Show resolved Hide resolved
ssl/ssl_test.cc Outdated Show resolved Hide resolved
@smittals2 smittals2 requested a review from andrewhop May 1, 2024 00:05
@smittals2 smittals2 merged commit 364d28b into aws:main May 1, 2024
78 checks passed
@skmcgrail skmcgrail mentioned this pull request May 2, 2024
Merged
skmcgrail added a commit that referenced this pull request May 2, 2024
@skmcgrail
v1.26.0 Release Preparation (#1572)
2c03113 
d52018b Minor functions to build with Ruby's cipher module (#1564)
364d28b Changed SSL_client_hello_get0_ciphers to align with OpenSSL
behavior (#1542)
e8eb7de ppc64le: EVP_has_aes_hardware is false w/ no-asm (#1566)
d726d06 OpenBSD 7.4 and 7.5 Support (#1437)
a66c66e Remove comments about overread for entropy generation (#1551)
f8a575f Migrate from __FreeBSD__ to __FreeBSD_version (#1562)
c31d1ce Centralize handling of s2n-bignum alt/non-alt function
selection (#1547)
00f3c45 CI for other MacOS versions (#1558)
0541314 Cleanup remaing duplicate symbol definitions and turn
Wredundant-decls on (#1561)
4d280eb Fix ec2 CI testing framework (#1541)
9a4b43e Update x25519_test.cc array initialization to avoid a bug with
a GCC 13 warning (#1555)
388cbe7 Remove duplicate X509_OBJECT_new and X509_OBJECT_free
declarations (#1560)
2ea6706 Avoid 'z' format with MSVCRT (#1559)
c25dc2a Add dependency to python3-six in github action grpc (#1554)
2bdcba3 Link porting guide table to header documentation (#1540)
311ca38 Basic GH CI build/test with full range of gcc/clang (#1546)
1f19717 Add SHA3-256 KAT to FIPS self-test (#1549)
0f3548a Add EC point add/dbl to speed.cc (#1545)
d7ddfc4 Fix the NTP integration test (NTP website changed) (#1548)
8ccd85b Fix skipped tests in Mariadb integration CI (#1533)
d940162 Support vpinsrq in delocater (#1543)
4cd6d21 Remove redundant test exec libraries (#1544)
56f3569 [ML-KEM] Add experimental support for ML-KEM-512-IPD (#1516)
c295aef Upstream merge 2024 04 16 (#1535)
2e51629 Re-add function
0aebf17 Define OPENSSL_NO_TLS_PHA, typedef PSK callback signatures
(#1526)
46056cf Pull the string-based extensions APIs into their own section
960ea42 Unexport X509_VERIFY_PARAM_lookup
3c597b1 Remove X509_VERIFY_PARAM_get0_peername
9c399e5 Document some key usage accessors
2fe70b5 Simplify and document X509_supported_extension
2e04897 Const-correct X509_LOOKUP_METHOD
9826568 Replace X509_LOOKUP_ctrl with real functions
e47c056 Tidy up x509_lu.c functions a little
62e019f Clean up the by_file_ctrl x509 code to be slightly less obtuse
45c46c2 Use relative links in markdown files

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and the ISC license.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justsmth justsmth justsmth approved these changes

@andrewhop andrewhop andrewhop approved these changes

Assignees
No one assigned
Labels
reviewers-assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smittals2 @andrewhop @justsmth