Actually add support for SSL_get_server/peer_tmp_key#1945
Merged
samuel40791765 merged 2 commits intoaws:mainfrom Nov 5, 2024
Merged
Actually add support for SSL_get_server/peer_tmp_key#1945samuel40791765 merged 2 commits intoaws:mainfrom
samuel40791765 merged 2 commits intoaws:mainfrom
Conversation
162b0de to
026ee17
Compare
b77388c to
9f5a08f
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1945 +/- ##
==========================================
+ Coverage 78.73% 78.77% +0.04%
==========================================
Files 590 590
Lines 101428 101476 +48
Branches 14384 14395 +11
==========================================
+ Hits 79856 79935 +79
+ Misses 20935 20906 -29
+ Partials 637 635 -2 ☔ View full report in Codecov by Sentry. |
aa33150 to
efb7969
Compare
skmcgrail
approved these changes
Nov 5, 2024
WillChilds-Klein
approved these changes
Nov 5, 2024
skmcgrail
added a commit
that referenced
this pull request
Nov 7, 2024
## What's Changed * 800-131Ar1: length of the key-derivation key shall be at least 112 bits. by @skmcgrail in #1924 * Marshalling/Unmarshalling DH public keys by @justsmth in #1916 * Also prune SSM documents from ec2-test-framework by @samuel40791765 in #1925 * Use illegal_parameter instead of decode_error for invalid key shares by @justsmth in #1923 * Add null check in dh testing by @torben-hansen in #1937 * DH paramgen callback by @justsmth in #1928 * Upstream merge 2024 10 17 by @torben-hansen in #1934 * Remove old Intel CPU types by @justsmth in #1942 * Remove retries on PCT failure in EC and RSA key generation. by @nebeid in #1938 * Add p4p, bump up time by @justsmth in #1943 * PQ README by @jakemas in #1932 * bump mysql CI to 9.1.0 by @justsmth in #1939 * HKDF, HKDF_expand, and PBKDF Truncated SHA2-512 by @skmcgrail in #1946 * Missing functionality + Adding Nmap to our CI by @smittals2 in #1915 * Fix FIPS.md typo by @justsmth in #1950 * Support encode or decode ∞ like OpenSSL by @samuel40791765 in #1930 * Expand support for EVP_PKEY_HMAC by @justsmth in #1933 * Add PKCS7-internal BIO_f_cipher by @WillChilds-Klein in #1836 * Add PKCS7-internal BIO_f_md by @WillChilds-Klein in #1886 * Ruby Support - DSA custom md by @justsmth in #1953 * Add support for POINT_CONVERSION_HYBRID by @samuel40791765 in #1936 * Fixes for Coverity Alerts by @smittals2 in #1960 * Also test w/ gcc 4.8 by @justsmth in #1962 * Actually add support for SSL_get_server/peer_tmp_key by @samuel40791765 in #1945 * Coverity Fix Null Check by @smittals2 in #1965 * ML-KEM keygen Pairwise Consistency Test by @dkostic in #1964 * EDDSA PCT by @torben-hansen in #1968 * Expose AES_cfb1_encrypt and AES_cfb8_encrypt by @skmcgrail in #1967 **Full Changelog**: v1.37.0...v1.38.0 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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issues:
Addresses
CryptoAlg-2699Description of changes:
Ruby has a dependency on
SSL_get_server_tmp_keywhich we've exposed as a no-op in the past. Ruby has a couple of tests that expect the function to actually return a value however, which means we'll have to actually support this.The relevant information about the server key was saved in a
tmpstructure inSSL3_STATE(originallyssl3_state_stin OpenSSL). Thistmpstructure has been removed by Boring, with its contents moved either toSSL_HANDSHAKEor the state machine.peer_keyseems to contain the relevant information we want and it's been moved toSSL_HANDSHAKEin this case. The issue is any information inSSL_HANDSHAKEis shed immediately after the connection has been established and the contents ofpeer_keyis shed along with it. We may have to revert parts of a4c8ff0 to move the field back intoSSL3_STATEso we can access the field.Laster versions of OpenSSL have changed this to an alias to
SSL_get_peer_tmp_keywhich means you can retrieve the client’s key if you’re the server and vice versa (openssl/openssl@a51c9f6). This causesSSL_get_server_tmp_keyto have very confusing behavior where you actually retrieve the client's key when you're a server, but Ruby already has tests that's somewhat dependent on theSSL_get_peer_tmp_keybehavior.Testing:
Test that tries retrieving a X25519 or EC_KEY based on the connection for each TLS version.
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.