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

Addressing HostNameInCertificate changes in native SNI #1680

Merged
merged 7 commits into from
Aug 4, 2022
Merged

Addressing HostNameInCertificate changes in native SNI #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f613ac
Add ServerCertFileName in the AuthProviderInfo to match the changes i…
lcheunglci Jul 20, 2022
271155d
Merge branch 'dotnet:main' into TDS8-Add-ServerCertFile-InAuthProvide…
lcheunglci Jul 25, 2022
e66a0fd
Update the version to match the latest release for SNI
lcheunglci Jul 28, 2022
095629d
Add serverCertFileName to AuthProviderInfo for netcore for latest SNI…
lcheunglci Jul 28, 2022
f05ec94
Merge branch 'TDS8-Add-ServerCertFile-InAuthProviderInfo' of https://…
lcheunglci Jul 28, 2022
8f89f97
Merge branch 'main' into TDS8-Add-ServerCertFile-InAuthProviderInfo
lcheunglci Aug 3, 2022
867cec3
Merge branch 'main' into TDS8-Add-ServerCertFile-InAuthProviderInfo
lcheunglci Aug 3, 2022
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
6 changes: 4 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Interop/SNINativeMethodWrapper.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.Data.Common;
using Microsoft.Data.SqlClient;
using System;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.Data.Common;
using Microsoft.Data.SqlClient;

namespace Microsoft.Data.SqlClient
{
Expand Down Expand Up @@ -57,6 +57,8 @@ internal struct AuthProviderInfo
public bool certHash;
public object clientCertificateCallbackContext;
public SqlClientCertificateDelegate clientCertificateCallback;
[MarshalAs(UnmanagedType.LPWStr)]
public string serverCertFileName;
};


Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Interop/SNINativeMethodWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ internal struct AuthProviderInfo
public bool certHash;
public object clientCertificateCallbackContext;
public SqlClientCertificateDelegate clientCertificateCallback;
[MarshalAs(UnmanagedType.LPWStr)]
public string serverCertFileName;
};

internal struct CTAIPProviderInfo
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ private void EnableSsl(uint info, SqlConnectionEncryptOption encrypt, bool integ
authInfo.certHash = false;
authInfo.clientCertificateCallbackContext = IntPtr.Zero;
authInfo.clientCertificateCallback = null;
authInfo.serverCertFileName = null;

if ((_encryptionOption & EncryptionOptions.CLIENT_CERT) != 0)
{
Expand Down
4 changes: 2 additions & 2 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>
<!-- NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>5.0.0-preview3.22165.1</MicrosoftDataSqlClientSniVersion>
<MicrosoftDataSqlClientSniVersion>5.0.0</MicrosoftDataSqlClientSniVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
</PropertyGroup>
Expand All @@ -38,7 +38,7 @@
<!-- NetCore project dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>5.0.0-preview3.22165.1</MicrosoftDataSqlClientSNIRuntimeVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>5.0.0</MicrosoftDataSqlClientSNIRuntimeVersion>
<SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>5.0.0</SystemDiagnosticsDiagnosticSourceVersion>
Expand Down
8 changes: 4 additions & 4 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<tags>sqlclient microsoft.data.sqlclient</tags>
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient.SNI" version="5.0.0-preview3.22165.1" />
<dependency id="Microsoft.Data.SqlClient.SNI" version="5.0.0" />
<dependency id="Azure.Identity" version="1.6.0" />
<dependency id="Microsoft.Identity.Client" version="4.45.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.21.0" />
Expand All @@ -42,7 +42,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Text.Encodings.Web" version="4.7.2" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview3.22165.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.6.0" />
<dependency id="Microsoft.Identity.Client" version="4.45.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.21.0" />
Expand All @@ -61,7 +61,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview3.22165.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.6.0" />
<dependency id="Microsoft.Identity.Client" version="4.45.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.21.0" />
Expand All @@ -80,7 +80,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview3.22165.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.6.0" />
<dependency id="Microsoft.Identity.Client" version="4.45.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.21.0" />
Expand Down