Return Option from handshake_kind()

[ctz]

ref #1899 (comment)

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.49%. Comparing base (d2e1e66) to head (b0f839d).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1900      +/-   ##
==========================================
- Coverage   95.49%   95.49%   -0.01%     
==========================================
  Files          86       86              
  Lines       18647    18646       -1     
==========================================
- Hits        17807    17806       -1     
  Misses        840      840              

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

[rustls-benchmarking]

Benchmark results

Instruction counts

Significant differences

There are no significant instruction count differences

Other differences

Click to expand

Scenario	Baseline	Candidate	Diff	Threshold
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server	3932493	3889309	-43184 (-1.10%)	2.79%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	8677159	8639466	-37693 (-0.43%)	0.90%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server	13344532	13389600	45068 (0.34%)	1.46%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server	13399359	13364278	-35081 (-0.26%)	1.23%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client	30289796	30348524	58728 (0.19%)	0.28%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	8666969	8680230	13261 (0.15%)	0.38%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server	4392007	4397958	5951 (0.14%)	3.75%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server	32319632	32355147	35515 (0.11%)	0.59%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	3361029	3357566	-3463 (-0.10%)	0.25%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server	46392733	46437649	44916 (0.10%)	0.44%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server	32567928	32598990	31062 (0.10%)	0.51%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server	13010953	13001782	-9171 (-0.07%)	0.73%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server	32307200	32285680	-21520 (-0.07%)	0.72%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client	30126106	30106223	-19883 (-0.07%)	0.26%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server	32614691	32594210	-20481 (-0.06%)	0.54%
handshake_no_resume_ring_1.3_ecdsap256_aes_client	3912236	3914562	2326 (0.06%)	0.21%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	92690055	92739886	49831 (0.05%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client	30095441	30108641	13200 (0.04%)	0.35%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client	30307595	30295100	-12495 (-0.04%)	0.37%
transfer_no_resume_ring_1.2_rsa_aes_server	46343269	46361670	18401 (0.04%)	0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server	46402462	46417657	15195 (0.03%)	0.29%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	58215141	58232315	17174 (0.03%)	0.22%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client	2009666	2009079	-587 (-0.03%)	0.20%
handshake_session_id_ring_1.2_rsa_aes_server	4230423	4231539	1116 (0.03%)	0.20%
handshake_session_id_ring_1.2_rsa_aes_client	4233694	4232762	-932 (-0.02%)	0.20%
handshake_tickets_ring_1.2_rsa_aes_server	4662576	4663398	822 (0.02%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server	43687483	43694787	7304 (0.02%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	1885126	1885423	297 (0.02%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client	2216573	2216918	345 (0.02%)	0.20%
handshake_tickets_ring_1.3_rsa_aes_server	43685458	43691983	6525 (0.01%)	0.20%
handshake_session_id_ring_1.3_rsa_aes_server	43403906	43410062	6156 (0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server	2129443	2129142	-301 (-0.01%)	0.32%
handshake_session_id_ring_1.3_ecdsap384_aes_server	43406769	43412835	6066 (0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client	3958634	3959184	550 (0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client	30095075	30090964	-4111 (-0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server	43406684	43412488	5804 (0.01%)	0.20%
handshake_tickets_ring_1.2_rsa_aes_client	4508235	4507647	-588 (-0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client	42039855	42034577	-5278 (-0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server	43687360	43692811	5451 (0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	3364183	3364596	413 (0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	4264726	4265180	454 (0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client	30322132	30319074	-3058 (-0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_client	41852209	41848488	-3721 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client	30107657	30110320	2663 (0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client	30309258	30306584	-2674 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client	3916095	3915752	-343 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client	30122333	30119923	-2410 (-0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client	41970027	41966770	-3257 (-0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client	2209358	2209510	152 (0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server	32588308	32590536	2228 (0.01%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_client	41783449	41780622	-2827 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client	30107384	30105377	-2007 (-0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client	41765436	41762706	-2730 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server	32301351	32303429	2078 (0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client	30295707	30293780	-1927 (-0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client	30308520	30310396	1876 (0.01%)	0.20%
handshake_tickets_ring_1.3_rsa_chacha_client	41983190	41980710	-2480 (-0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	4261100	4261336	236 (0.01%)	0.20%
handshake_tickets_ring_1.3_rsa_aes_client	42052701	42050400	-2301 (-0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server	32575797	32577564	1767 (0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server	43615833	43618156	2323 (0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client	41846135	41843932	-2203 (-0.01%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client	58319016	58315982	-3034 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server	32300830	32302495	1665 (0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_server	43615918	43617990	2072 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client	41964924	41962956	-1968 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client	4283192	4282997	-195 (-0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_server	43306630	43308586	1956 (0.00%)	0.20%
handshake_tickets_ring_1.3_rsa_chacha_server	43613427	43615383	1956 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server	43309180	43311056	1876 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server	32589018	32590362	1344 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	58220090	58222446	2356 (0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_client	2856002	2856108	106 (0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_aes_client	41863826	41862311	-1515 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server	32330341	32331485	1144 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server	80640322	80642933	2611 (0.00%)	0.26%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server	2131329	2131398	69 (0.00%)	0.35%
handshake_session_id_ring_1.3_ecdsap256_chacha_client	41769192	41767911	-1281 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client	2954929	2955012	83 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	46420083	46418841	-1242 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client	42033318	42032356	-962 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	46420361	46419307	-1054 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client	68642683	68644225	1542 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	1888669	1888709	40 (0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client	92649689	92651633	1944 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	92689427	92687600	-1827 (-0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_server	43309776	43310621	845 (0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_server	46462530	46461686	-844 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_client	2949075	2949024	-51 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server	13739856	13739624	-232 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client	58316199	58315267	-932 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server	32576726	32577194	468 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client	58222074	58221274	-800 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_server	46454612	46453996	-616 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client	92691012	92689785	-1227 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_client	58319948	58319184	-764 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server	80515832	80514819	-1013 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	80610319	80609326	-993 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server	80511567	80510670	-897 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server	46457851	46457337	-514 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_server	12168060	12168191	131 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	80610031	80609280	-751 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client	92652794	92651986	-808 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server	13737676	13737783	107 (0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client	92648495	92647805	-690 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server	80507668	80507159	-509 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server	12174058	12173985	-73 (-0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_server	11985165	11985103	-62 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client	35471470	35471570	100 (0.00%)	0.20%
transfer_no_resume_ring_1.2_rsa_aes_client	58202424	58202556	132 (0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client	35473531	35473599	68 (0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server	32330997	32331014	17 (0.00%)	0.20%

Wall-time

Significant differences

There are no significant wall-time differences

Other differences

Click to expand

Scenario	Baseline	Candidate	Diff	Threshold
handshake_session_id_ring_1.2_rsa_aes	1.54 ms	1.55 ms	0.01 ms (0.53%)	1.46%
handshake_tickets_ring_1.2_rsa_aes	1.63 ms	1.62 ms	-0.01 ms (-0.45%)	1.25%
handshake_tickets_aws_lc_rs_1.2_rsa_aes	2.18 ms	2.18 ms	-0.01 ms (-0.30%)	1.83%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes	5.36 ms	5.37 ms	0.01 ms (0.22%)	3.73%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes	5.15 ms	5.16 ms	0.01 ms (0.21%)	4.11%
handshake_no_resume_ring_1.3_ecdsap256_aes	503.77 µs	504.71 µs	0.95 µs (0.19%)	2.17%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes	5.36 ms	5.37 ms	0.01 ms (0.18%)	4.07%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes	1.38 ms	1.38 ms	-0.00 ms (-0.17%)	1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	1.17 ms	1.17 ms	-0.00 ms (-0.16%)	1.14%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes	4.44 ms	4.45 ms	0.01 ms (0.15%)	4.88%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes	5.92 ms	5.93 ms	0.01 ms (0.15%)	1.34%
handshake_no_resume_ring_1.3_rsa_chacha	995.08 µs	996.45 µs	1.37 µs (0.14%)	1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	471.12 µs	470.50 µs	-0.62 µs (-0.13%)	2.45%
handshake_session_id_aws_lc_rs_1.2_rsa_aes	2.02 ms	2.02 ms	0.00 ms (0.13%)	1.28%
transfer_no_resume_ring_1.3_rsa_aes	6.77 ms	6.78 ms	0.01 ms (0.12%)	2.56%
handshake_session_id_ring_1.3_ecdsap256_chacha	6.69 ms	6.70 ms	0.01 ms (0.12%)	1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha	5.90 ms	5.90 ms	0.01 ms (0.11%)	1.03%
handshake_session_id_ring_1.3_rsa_chacha	7.18 ms	7.19 ms	0.01 ms (0.11%)	1.00%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha	1.37 ms	1.38 ms	0.00 ms (0.10%)	1.00%
transfer_no_resume_ring_1.3_ecdsap256_chacha	12.93 ms	12.94 ms	0.01 ms (0.10%)	1.50%
transfer_no_resume_ring_1.3_ecdsap256_aes	6.28 ms	6.29 ms	0.01 ms (0.10%)	3.23%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes	472.41 µs	471.96 µs	-0.45 µs (-0.10%)	3.23%
handshake_session_id_ring_1.3_ecdsap384_chacha	9.79 ms	9.79 ms	0.01 ms (0.09%)	1.00%
handshake_session_id_ring_1.3_ecdsap256_aes	6.72 ms	6.73 ms	0.01 ms (0.09%)	1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	12.92 ms	12.93 ms	0.01 ms (0.09%)	1.62%
handshake_no_resume_ring_1.3_rsa_aes	995.09 µs	995.93 µs	0.85 µs (0.09%)	1.00%
transfer_no_resume_ring_1.2_rsa_aes	6.69 ms	6.69 ms	0.01 ms (0.08%)	3.39%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes	5.21 ms	5.22 ms	0.00 ms (0.08%)	1.48%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha	5.21 ms	5.21 ms	0.00 ms (0.08%)	1.74%
handshake_tickets_ring_1.3_rsa_chacha	7.20 ms	7.20 ms	-0.01 ms (-0.07%)	1.11%
handshake_tickets_ring_1.3_rsa_aes	7.24 ms	7.24 ms	-0.00 ms (-0.06%)	1.00%
handshake_tickets_aws_lc_rs_1.3_rsa_aes	6.15 ms	6.16 ms	0.00 ms (0.06%)	1.12%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	13.63 ms	13.64 ms	0.01 ms (0.06%)	1.61%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes	1.18 ms	1.18 ms	0.00 ms (0.06%)	1.00%
handshake_tickets_ring_1.3_ecdsap256_chacha	6.71 ms	6.71 ms	0.00 ms (0.06%)	1.00%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes	1.33 ms	1.33 ms	0.00 ms (0.05%)	1.12%
transfer_no_resume_ring_1.3_ecdsap384_aes	9.39 ms	9.39 ms	0.01 ms (0.05%)	1.84%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha	6.15 ms	6.15 ms	-0.00 ms (-0.05%)	1.18%
transfer_no_resume_ring_1.3_rsa_chacha	13.43 ms	13.43 ms	0.01 ms (0.05%)	1.50%
transfer_no_resume_ring_1.3_ecdsap384_chacha	16.04 ms	16.05 ms	0.01 ms (0.05%)	1.23%
handshake_no_resume_ring_1.3_ecdsap384_aes	3.61 ms	3.61 ms	0.00 ms (0.05%)	1.00%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha	6.12 ms	6.13 ms	0.00 ms (0.05%)	1.37%
handshake_no_resume_ring_1.3_ecdsap384_chacha	3.61 ms	3.61 ms	0.00 ms (0.05%)	1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes	5.94 ms	5.94 ms	0.00 ms (0.04%)	1.00%
handshake_no_resume_ring_1.3_ecdsap256_chacha	500.89 µs	501.11 µs	0.22 µs (0.04%)	2.32%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha	5.93 ms	5.93 ms	0.00 ms (0.04%)	1.00%
handshake_tickets_ring_1.3_ecdsap256_aes	6.75 ms	6.75 ms	0.00 ms (0.04%)	1.15%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha	13.84 ms	13.84 ms	0.00 ms (0.03%)	1.43%
handshake_session_id_ring_1.3_ecdsap384_aes	9.82 ms	9.82 ms	0.00 ms (0.02%)	1.00%
handshake_session_id_ring_1.3_rsa_aes	7.23 ms	7.22 ms	-0.00 ms (-0.02%)	1.00%
handshake_tickets_ring_1.3_ecdsap384_chacha	9.81 ms	9.81 ms	-0.00 ms (-0.01%)	1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha	5.23 ms	5.23 ms	0.00 ms (0.01%)	1.17%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes	5.23 ms	5.23 ms	0.00 ms (0.01%)	1.24%
handshake_tickets_ring_1.3_ecdsap384_aes	9.85 ms	9.85 ms	-0.00 ms (-0.01%)	1.00%
handshake_no_resume_ring_1.2_rsa_aes	975.72 µs	975.68 µs	-0.04 µs (-0.00%)	1.00%
handshake_session_id_aws_lc_rs_1.3_rsa_aes	6.14 ms	6.14 ms	-0.00 ms (-0.00%)	1.72%

Additional information

Historical results

Checkout details:

• Base repo: https://github.com/rustls/rustls.git
• Base branch: main (d2e1e66)
• Candidate repo: https://github.com/rustls/rustls.git
• Candidate branch: jbp-expose-connection-resumption-details-2 (b0f839d)