Skip to content

Generate SslConnectionInfo.Unix.cs with T4 template #84690

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

Merged
jkotas merged 21 commits into from
Apr 17, 2023
Merged

Generate SslConnectionInfo.Unix.cs with T4 template #84690

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7cfe88e
Generate SslConnectionInfo.Unix.cs with T4 template
am11 Apr 12, 2023
4104ab6
Fix indentation
am11 Apr 13, 2023
db1307f
Address CR feedback
am11 Apr 14, 2023
b3d656b
Encode 16x4 bits as ulong
am11 Apr 14, 2023
9ba4ed2
Fix unpacking
am11 Apr 14, 2023
09cde7d
Move packed data selection to private method
am11 Apr 15, 2023
2d15328
Switch to ROS version
am11 Apr 15, 2023
a584dac
Fix index
am11 Apr 15, 2023
92e23da
Revert "Fix index"
am11 Apr 15, 2023
b34d3cc
Revert "Switch to ROS version"
am11 Apr 15, 2023
47cee99
Divide raw data into two `int`s
am11 Apr 15, 2023
3b5a682
Switch other values to 32-bit as well
am11 Apr 15, 2023
e2a4930
Switch to single int version
am11 Apr 15, 2023
ad8a803
Reposition
am11 Apr 15, 2023
ea29344
Pack first two as nibbles and third as ushort
am11 Apr 15, 2023
3bd4400
Try fitting into ushort
am11 Apr 15, 2023
c58574c
Fix cipherAlgorithmStrength mapping
am11 Apr 15, 2023
4eeea0a
Address CR feedback
am11 Apr 16, 2023
d67f01c
Change return type to int
am11 Apr 16, 2023
8699298
Address CR feedback
am11 Apr 16, 2023
2eb6b62
Keep KeyExchKeySize
am11 Apr 16, 2023
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
Prev Previous commit
Next Next commit
Fix index
  • Loading branch information
@am11
am11 authored Apr 15, 2023
commit a584dac86321f9a7fc5fc6a145b05d4c58618ad9
5 changes: 3 additions & 2 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslConnectionInfo.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ private void MapCipherSuite(TlsCipherSuite cipherSuite)
TlsCipherSuite = cipherSuite;
KeyExchKeySize = 0;

Debug.Assert(s_cipherToIndex.IndexOf((int)cipherSuite) > -1, $"No mapping found for cipherSuite {cipherSuite}");
ulong data = s_encodedNumber[s_cipherToIndex[(int)cipherSuite + 1]];
int index = (int)cipherSuite * 2;
Debug.Assert(s_cipherToIndex.IndexOf(index) > -1, $"No mapping found for cipherSuite {cipherSuite}");
ulong data = s_encodedNumber[s_cipherToIndex[index + 1]];

KeyExchangeAlg = (int)(data >> (64 - (16 * 1)) & 0xFFFF);
DataCipherAlg = (int)(data >> (64 - (16 * 2)) & 0xFFFF);
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslConnectionInfo.Unix.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ namespace System.Net.Security
TlsCipherSuite = cipherSuite;
KeyExchKeySize = 0;

Debug.Assert(s_cipherToIndex.IndexOf((int)cipherSuite) > -1, $"No mapping found for cipherSuite {cipherSuite}");
ulong data = s_encodedNumber[s_cipherToIndex[(int)cipherSuite + 1]];
int index = (int)cipherSuite * 2;
Debug.Assert(s_cipherToIndex.IndexOf(index) > -1, $"No mapping found for cipherSuite {cipherSuite}");
ulong data = s_encodedNumber[s_cipherToIndex[index + 1]];

KeyExchangeAlg = (int)(data >> (64 - (16 * 1)) & 0xFFFF);
DataCipherAlg = (int)(data >> (64 - (16 * 2)) & 0xFFFF);
Expand Down