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

Fix | Fix certificate validation #2439

Draft
wants to merge 55 commits into
base: main
Choose a base branch
from
Draft

Fix | Fix certificate validation #2439

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
95c67b1
Initial merge from certValidation and certTest branch from David-Enge…
arellegue Feb 5, 2024
ed691c5
Initial merge from certValidation and certTest branch from David-Enge…
arellegue Feb 5, 2024
5452a9c
Merge branch 'main' into FixCertificateValidation
arellegue Feb 5, 2024
fa54829
Added unit test in Manual Tests.
arellegue Mar 25, 2024
e8d3e54
Merged latest project files from upstream.
arellegue Mar 25, 2024
67f2091
Merge branch 'main' into FixCertificateValidation
arellegue Mar 25, 2024
cf5739c
Fixed project files.
arellegue Mar 25, 2024
267acdd
Fix script for linux to install openssl first.
arellegue Mar 27, 2024
af9a1ff
Add force installation of openssl from PSGallery.
arellegue Mar 27, 2024
3c682cc
Removed OpenSsl installation.
arellegue Mar 27, 2024
45ad5f8
Add 1 second delay for the certificate to be created.
arellegue Mar 27, 2024
3522200
Add debug to display certificate location.
arellegue Mar 27, 2024
78f75e4
Add print working directory to script.
arellegue Mar 27, 2024
9d417da
Add cat to display content of result.txt.
arellegue Mar 27, 2024
60768f0
Add parameter for the location of certificate.
arellegue Mar 27, 2024
7136a33
Fix script parameters.
arellegue Mar 28, 2024
d7423ed
Fix script so that if FQDN is over 64 characters then don't use it as…
arellegue Apr 1, 2024
07a2332
Without specifiying CN, the openssl command becomes interactive. Thu…
arellegue Apr 1, 2024
aa13fb1
Fix string length test to -gt 64.
arellegue Apr 1, 2024
4369b9e
Add the installation of openssl for linux.
arellegue Apr 1, 2024
1c39823
Clean-up unwanted comments from scripts and unit test.
arellegue Apr 1, 2024
aa0dfc2
Removed unnecessary using.
arellegue Apr 1, 2024
2a4d831
Added byte array comparer function.
arellegue Apr 2, 2024
e7c1e48
Change tests expected results.
arellegue Apr 2, 2024
d1a1bab
Use AsSpan().SequenceEqual in ByteArrayCompare function.
arellegue Apr 2, 2024
7f1806a
Drop ByteArrayCompare function and use inline .AsSpan().SequenceEqual…
arellegue Apr 2, 2024
523b921
Merged upstream MDS solution file.
arellegue Apr 3, 2024
131450e
Bring back TrySNIEventScope.Create inside ValidateServerCertificate i…
arellegue Apr 3, 2024
2c5b5fd
Merge netfx MDS project file.
arellegue Apr 3, 2024
1b6371a
Removed one second delay to wait for the creation of certificate to c…
arellegue Apr 3, 2024
d1a9880
Added license information to new class files.
arellegue Apr 3, 2024
6f198e7
Re-merge Manual Tests project file.
arellegue Apr 3, 2024
cb7cc8e
Change parameter names. Added more set of parameters.
arellegue Apr 8, 2024
c065a90
Fix some wrong expecated result in the set of parameters.
arellegue Apr 8, 2024
0f1d82f
Ammend makepfxcert.ps1 desciption.
arellegue Apr 8, 2024
dfbc847
Applied suggested change in the comment at line 141 of SNICommon.cs.
arellegue Apr 18, 2024
9d8c7d9
Added extra line as suggested.
arellegue Apr 18, 2024
9095e71
Merged from upstream main.
arellegue Apr 18, 2024
f301515
Applied suggested changes.
arellegue Apr 19, 2024
e413d9c
No change just trigerring pipeline run for this PR.
arellegue Apr 19, 2024
db6656d
Revert Nuget.config changes.
arellegue Apr 24, 2024
8821999
Merge branch 'main' into FixCertificateValidation
arellegue Apr 24, 2024
804473f
Merge branch 'main' into FixCertificateValidation
arellegue Apr 25, 2024
3341d76
Change default Tds Server encryption to not supported in Functional T…
arellegue Apr 29, 2024
5e8bd99
Restore original TestTdsServer.cs in Functional Test.
arellegue Apr 29, 2024
7ee63c2
Changed TdsServer default encryption to None in Manual Tests.
arellegue Apr 29, 2024
b5539d1
Actually, make the test TdsServer default Encryption to NotSupported …
arellegue Apr 29, 2024
2dd6fb1
Removed blank line from TestTdsServer.cs.
arellegue Apr 29, 2024
b6770d3
Make Windows and Linux certificate key length to be 4096.
arellegue Apr 30, 2024
43b940b
Commenbt out dpkg-reconfigure in the certificate maker script.
arellegue May 1, 2024
df87444
Update script that creates certificate.
arellegue May 2, 2024
e485ce4
Merge branch 'main' into FixCertificateValidation
arellegue May 2, 2024
81b5a09
Added unit test wrapper for Windows and Unix. MaxOS will be excluded.
arellegue May 2, 2024
faf2b14
Updated script so that the dpkg-reconfigure is noninteractive.
arellegue May 2, 2024
e9adb82
Add comment that possible value for certificate includes a mismatched…
arellegue May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 0 additions & 69 deletions src/Microsoft.Data.SqlClient.sln
View file
Open in desktop
Expand Up @@ -23,32 +23,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore", "netcore", "{28E5
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netfx", "netfx", "{3FDD425C-FE01-4B56-863E-1FCDD0677CF5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Address", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj", "{D1392B54-998A-4F27-BC17-4CE149117BCC}"
ProjectSection(ProjectDependencies) = postProject
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
{407890AC-9876-4FEF-A6F1-F36A876BAADE} = {407890AC-9876-4FEF-A6F1-F36A876BAADE}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ManualTesting.Tests", "Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
ProjectSection(ProjectDependencies) = postProject
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Circle", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Circle\Circle.csproj", "{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}"
ProjectSection(ProjectDependencies) = postProject
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shapes", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Shapes\Shapes.csproj", "{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}"
ProjectSection(ProjectDependencies) = postProject
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utf8String", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Utf8String\Utf8String.csproj", "{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}"
ProjectSection(ProjectDependencies) = postProject
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A2E7E470-5EFF-4828-B55E-FCBA3650F51C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\netcore\ref\Microsoft.Data.SqlClient.csproj", "{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}"
Expand Down Expand Up @@ -304,18 +283,6 @@ Global
{37431336-5307-4184-9356-C4B7E47DC714}.Release|x64.Build.0 = Release|Any CPU
{37431336-5307-4184-9356-C4B7E47DC714}.Release|x86.ActiveCfg = Release|Any CPU
{37431336-5307-4184-9356-C4B7E47DC714}.Release|x86.Build.0 = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x64.ActiveCfg = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x64.Build.0 = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x86.ActiveCfg = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x86.Build.0 = Debug|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|Any CPU.Build.0 = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x64.ActiveCfg = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x64.Build.0 = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x86.ActiveCfg = Release|Any CPU
{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x86.Build.0 = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -328,42 +295,6 @@ Global
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x64.Build.0 = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x86.ActiveCfg = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x86.Build.0 = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x64.ActiveCfg = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x64.Build.0 = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x86.ActiveCfg = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x86.Build.0 = Debug|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|Any CPU.Build.0 = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x64.ActiveCfg = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x64.Build.0 = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x86.ActiveCfg = Release|Any CPU
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x86.Build.0 = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x64.ActiveCfg = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x64.Build.0 = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x86.ActiveCfg = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x86.Build.0 = Debug|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|Any CPU.Build.0 = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x64.ActiveCfg = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x64.Build.0 = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x86.ActiveCfg = Release|Any CPU
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x86.Build.0 = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x64.ActiveCfg = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x64.Build.0 = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x86.Build.0 = Debug|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x64.ActiveCfg = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x64.Build.0 = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x86.ActiveCfg = Release|Any CPU
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x86.Build.0 = Release|Any CPU
{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down