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

Avoid sending multiple close notifies #1955

Merged
merged 5 commits into from
May 17, 2024
Merged

Avoid sending multiple close notifies #1955

merged 5 commits into from
May 17, 2024

Conversation

ctz
Copy link
Member

@ctz ctz commented May 17, 2024 •
edited

This PR also fixes #1950 which caused a desynchronisation after a close notify.

After this PR, tokio-rustls test suite breakage caused in 0.23.6 (see https://github.com/rustls/tokio-rustls/actions/runs/9123001981/job/25084713982) is fixed

0.23.7 draft release notes

  • send_close_notify is now idempotent, in case it is accidentally called more than once.
  • read_tls now refuses to read further data after a close_notify is received, by returning Ok(0) (ie, an EOF).
  • Correct fix in 0.23.6 to properly discard data after close_notify received, avoiding a spurious DecryptError on subsequent calls to process_new_packets().

@codecov Codecov
Copy link

codecov bot commented May 17, 2024 •
edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.49%. Comparing base (06dc1d5) to head (ba5f69b).

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #1955    /-   ##
=======================================
  Coverage   95.48%   95.49%           
=======================================
  Files          86       86           
  Lines       18664    18672     8     
=======================================
  Hits        17821    17830     9     
  Misses        843      842    -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

djc
djc approved these changes May 17, 2024
View reviewed changes
rustls/src/common_state.rs Outdated Show resolved Hide resolved
@rustls-benchmarking Rustls Benchmarking
Copy link

rustls-benchmarking bot commented May 17, 2024 •
edited

Benchmark results

Instruction counts

Significant differences

There are no significant instruction count differences

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server 4440021 4340108 -99913 (-2.25%) 2.39%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server 3932948 3886573 -46375 (-1.18%) 6.51%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server 13399071 13460926 61855 (0.46%) 1.33%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server 46442592 46374045 -68547 (-0.15%) 0.40%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server 32415130 32452908 37778 (0.12%) 0.47%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server 13814602 13798627 -15975 (-0.12%) 0.83%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server 32643363 32679177 35814 (0.11%) 0.46%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client 30349048 30380755 31707 (0.10%) 0.44%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client 30348695 30319286 -29409 (-0.10%) 0.32%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client 30178255 30153884 -24371 (-0.08%) 0.28%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server 46427313 46397198 -30115 (-0.06%) 0.27%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server 13782302 13790999 8697 (0.06%) 0.85%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 3368426 3366337 -2089 (-0.06%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 8740991 8735666 -5325 (-0.06%) 0.79%
handshake_no_resume_ring_1.3_ecdsap256_aes_client 3912174 3914549 2375 (0.06%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 58204411 58238383 33972 (0.06%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server 32674130 32692566 18436 (0.06%) 0.76%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server 80609347 80647837 38490 (0.05%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client 30137890 30148996 11106 (0.04%) 0.31%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server 32395223 32383485 -11738 (-0.04%) 0.54%
handshake_tickets_ring_1.2_rsa_aes_server 4666500 4664816 -1684 (-0.04%) 0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client 4300959 4299669 -1290 (-0.03%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_server 4233808 4232554 -1254 (-0.03%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_client 4507947 4508967 1020 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 8745217 8743388 -1829 (-0.02%) 1.19%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 1892450 1892781 331 (0.02%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_server 43413929 43406760 -7169 (-0.02%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_server 43693826 43687574 -6252 (-0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server 43695968 43689752 -6216 (-0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server 43418636 43409882 -6064 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_client 2949024 2949372 348 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server 43415752 43410728 -5024 (-0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server 43694862 43689845 -5017 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client 30386657 30383190 -3467 (-0.01%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 92657053 92666227 9174 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client 30162422 30159579 -2843 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client 30364877 30362222 -2655 (-0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server 32403384 32400614 -2770 (-0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_client 41855761 41852308 -3453 (-0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client 2014779 2014945 166 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 1895649 1895801 152 (0.01%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client 42043206 42040065 -3141 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server 32703292 32700928 -2364 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server 32679892 32677570 -2322 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server 32679622 32677495 -2127 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client 3916352 3916602 250 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server 32442271 32440402 -1869 (-0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server 32442183 32440471 -1712 (-0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client 30176251 30174679 -1572 (-0.01%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_server 43311816 43309606 -2210 (-0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 4273587 4273376 -211 (-0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_client 41866587 41864559 -2028 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server 2131636 2131534 -102 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_server 43314563 43312515 -2048 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 4276732 4276933 201 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server 32702953 32701448 -1505 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client 3973090 3972908 -182 (-0.00%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_client 4234359 4234552 193 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server 2129524 2129619 95 (0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_server 43617229 43615307 -1922 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client 41969044 41970812 1768 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 92688798 92692391 3593 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server 32402128 32400951 -1177 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client 58319575 58317542 -2033 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client 42036277 42034815 -1462 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 3365868 3365981 113 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client 30377004 30376044 -960 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client 41847259 41848631 -1318 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client 2223203 2223261 58 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_server 43619432 43618301 -1131 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server 43314142 43313055 -1087 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_server 46461872 46460745 -1127 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_server 12168024 12168312 288 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_server 46454122 46453024 -1098 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server 43619106 43618136 -970 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client 41771395 41770504 -891 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 58231041 58232123 1082 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client 58313681 58314693 1012 (0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client 2216319 2216357 38 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 46430544 46429777 -767 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client 30186874 30186383 -491 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server 46457348 46456863 -754 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client 92650502 92651992 1490 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server 12174120 12174303 183 (0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_client 41784789 41785357 568 (0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_client 58200123 58200886 763 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 46430141 46429543 -598 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client 58232759 58233501 742 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 80609667 80608659 -1008 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server 80515014 80514014 -1000 (-0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_server 46361342 46360793 -549 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_client 42053792 42053299 -493 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client 41967047 41966577 -470 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 80609410 80608522 -888 (-0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client 30399564 30399230 -334 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client 92646027 92647035 1008 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client 2955068 2955041 -27 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server 13737796 13737678 -118 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server 80506753 80506081 -672 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client 35473912 35473626 -286 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client 92649806 92650445 639 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server 80510496 80510040 -456 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client 35471971 35471783 -188 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server 13739788 13739725 -63 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client 30199204 30199102 -102 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client 92691042 92691337 295 (0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client 41766479 41766387 -92 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client 68654040 68653921 -119 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_client 58318456 58318523 67 (0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_client 41983854 41983886 32 (0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_client 2856362 2856361 -1 (-0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_server 11985464 11985466 2 (0.00%) 0.20%

Wall-time

Significant differences

⚠️ There are significant wall-time differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_no_resume_aws_lc_rs_1.3_rsa_aes 1.43 ms 1.41 ms ✅ -0.02 ms (-1.28%) 1.11%

Other differences

Click to expand
Scenario Baseline Candidate Diff Threshold
handshake_tickets_aws_lc_rs_1.2_rsa_aes 2.24 ms 2.21 ms -0.03 ms (-1.48%) 1.54%
handshake_session_id_aws_lc_rs_1.2_rsa_aes 2.08 ms 2.05 ms -0.03 ms (-1.30%) 1.81%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes 1.37 ms 1.36 ms -0.01 ms (-1.03%) 1.28%
handshake_session_id_aws_lc_rs_1.3_rsa_aes 6.25 ms 6.19 ms -0.06 ms (-0.97%) 1.06%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes 5.50 ms 5.45 ms -0.05 ms (-0.91%) 4.63%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha 1.42 ms 1.40 ms -0.01 ms (-0.84%) 1.21%
handshake_tickets_aws_lc_rs_1.3_rsa_aes 6.25 ms 6.20 ms -0.05 ms (-0.81%) 1.08%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha 6.24 ms 6.20 ms -0.05 ms (-0.80%) 1.05%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha 6.21 ms 6.16 ms -0.05 ms (-0.79%) 1.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes 5.27 ms 5.23 ms -0.04 ms (-0.78%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes 5.29 ms 5.25 ms -0.04 ms (-0.76%) 1.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes 6.01 ms 5.96 ms -0.04 ms (-0.73%) 1.00%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes 5.49 ms 5.45 ms -0.04 ms (-0.71%) 3.87%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes 4.55 ms 4.51 ms -0.03 ms (-0.71%) 6.46%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes 5.26 ms 5.22 ms -0.04 ms (-0.70%) 5.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha 5.25 ms 5.22 ms -0.04 ms (-0.67%) 1.15%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes 5.98 ms 5.95 ms -0.04 ms (-0.62%) 1.03%
handshake_tickets_ring_1.3_ecdsap256_chacha 6.72 ms 6.68 ms -0.04 ms (-0.58%) 1.26%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha 5.28 ms 5.25 ms -0.03 ms (-0.57%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 479.00 µs 476.32 µs -2.68 µs (-0.56%) 3.57%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha 5.95 ms 5.92 ms -0.03 ms (-0.52%) 1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha 5.99 ms 5.96 ms -0.03 ms (-0.47%) 1.00%
handshake_tickets_ring_1.3_rsa_chacha 7.21 ms 7.17 ms -0.03 ms (-0.47%) 1.00%
transfer_no_resume_ring_1.3_ecdsap256_chacha 13.04 ms 12.98 ms -0.06 ms (-0.46%) 1.91%
handshake_session_id_ring_1.3_ecdsap256_chacha 6.70 ms 6.67 ms -0.03 ms (-0.44%) 1.00%
transfer_no_resume_ring_1.3_rsa_chacha 13.53 ms 13.47 ms -0.06 ms (-0.44%) 1.61%
transfer_no_resume_ring_1.3_rsa_aes 6.86 ms 6.83 ms -0.03 ms (-0.44%) 3.62%
handshake_session_id_ring_1.3_ecdsap256_aes 6.74 ms 6.71 ms -0.03 ms (-0.44%) 1.00%
handshake_no_resume_ring_1.3_ecdsap256_chacha 504.95 µs 502.80 µs -2.15 µs (-0.43%) 2.57%
handshake_session_id_ring_1.3_rsa_chacha 7.19 ms 7.16 ms -0.03 ms (-0.40%) 1.00%
transfer_no_resume_ring_1.3_ecdsap256_aes 6.36 ms 6.34 ms -0.02 ms (-0.39%) 3.75%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 13.02 ms 12.97 ms -0.05 ms (-0.38%) 1.92%
transfer_no_resume_ring_1.3_ecdsap384_chacha 16.13 ms 16.07 ms -0.06 ms (-0.37%) 1.63%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha 13.97 ms 13.92 ms -0.05 ms (-0.37%) 1.95%
handshake_session_id_ring_1.3_rsa_aes 7.23 ms 7.20 ms -0.03 ms (-0.37%) 1.00%
handshake_tickets_ring_1.3_ecdsap384_chacha 9.81 ms 9.77 ms -0.04 ms (-0.36%) 1.00%
handshake_tickets_ring_1.3_ecdsap256_aes 6.75 ms 6.73 ms -0.02 ms (-0.36%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes 479.60 µs 477.93 µs -1.67 µs (-0.35%) 3.55%
handshake_session_id_ring_1.2_rsa_aes 1.55 ms 1.56 ms 0.01 ms (0.35%) 1.29%
handshake_session_id_ring_1.3_ecdsap384_chacha 9.79 ms 9.76 ms -0.03 ms (-0.33%) 1.00%
transfer_no_resume_ring_1.2_rsa_aes 6.77 ms 6.74 ms -0.02 ms (-0.31%) 3.63%
handshake_tickets_ring_1.2_rsa_aes 1.63 ms 1.64 ms 0.00 ms (0.30%) 1.00%
handshake_tickets_ring_1.3_rsa_aes 7.25 ms 7.22 ms -0.02 ms (-0.29%) 1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 13.72 ms 13.68 ms -0.04 ms (-0.29%) 1.67%
handshake_session_id_ring_1.3_ecdsap384_aes 9.82 ms 9.80 ms -0.03 ms (-0.27%) 1.00%
transfer_no_resume_ring_1.3_ecdsap384_aes 9.46 ms 9.44 ms -0.03 ms (-0.27%) 2.78%
handshake_tickets_ring_1.3_ecdsap384_aes 9.85 ms 9.82 ms -0.02 ms (-0.24%) 1.00%
handshake_no_resume_ring_1.3_ecdsap256_aes 506.90 µs 505.85 µs -1.06 µs (-0.21%) 2.43%
handshake_no_resume_ring_1.3_rsa_aes 998.62 µs 996.64 µs -1.98 µs (-0.20%) 1.00%
handshake_no_resume_ring_1.3_rsa_chacha 999.29 µs 997.44 µs -1.85 µs (-0.19%) 1.19%
handshake_no_resume_ring_1.2_rsa_aes 978.35 µs 976.74 µs -1.61 µs (-0.16%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes 1.19 ms 1.19 ms -0.00 ms (-0.14%) 1.10%
handshake_no_resume_ring_1.3_ecdsap384_chacha 3.60 ms 3.60 ms -0.00 ms (-0.12%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 1.18 ms 1.18 ms -0.00 ms (-0.11%) 1.17%
handshake_no_resume_ring_1.3_ecdsap384_aes 3.61 ms 3.60 ms -0.00 ms (-0.06%) 1.00%

Additional information

Historical results

Checkout details:

ctz added 3 commits May 17, 2024 15:26
@ctz
Ignore duplicative send_close_notify calls
b66a063 
`tokio-rustls` has a test that accidentally does this twice.
Make this call idempotent.
@ctz
Test for more close_notify conditions
57f203e 
- before the handshake finishes
- after a `close_notify` before the handshake finishes
- after a `close_notify` after the handshake finishes
- `read_tls` artificial EOF after `close_notify`
@ctz
Prepare 0.23.7
ba5f69b
@ctz ctz force-pushed the jbp-multiple-close-notifies branch from 4619a20 to ba5f69b Compare May 17, 2024 14:26
cpu
cpu approved these changes May 17, 2024
View reviewed changes
Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Can you add some proposed release notes to the PR desc?

@ctz
Copy link
Member Author

ctz commented May 17, 2024

Can you add some proposed release notes to the PR desc?

Added

@cpu
Copy link
Member

cpu commented May 17, 2024

Added

Thanks!

Correct fix in 0.23.6 to discarding data after close_notify received, causing a spurious DecryptError on subsequent calls to process_new_packets().

This reads a little bit awkwardly to me. Maybe something like: "Correct fix in 0.23.6 to properly discard data after close_notify received, avoiding a spurious DecryptError on subsequent calls to process_new_packets()"?

@ctz
Copy link
Member Author

ctz commented May 17, 2024

This reads a little bit awkwardly to me.

Agreed, replaced with your wording. Thanks!

@ctz ctz added this pull request to the merge queue May 17, 2024
Merged via the queue into main with commit e45fec4 May 17, 2024
46 checks passed
@ctz ctz deleted the jbp-multiple-close-notifies branch May 17, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@djc djc djc approved these changes

@cpu cpu cpu approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@ctz @cpu @djc