Skip to content

Commit a813d22

Browse files
twsouthwicktwsouthwick
committed
rename to SspiContextProvider
1 parent 9536950 commit a813d22

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -656,11 +656,11 @@
656656
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
657657
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
658658
</Compile>
659-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
660-
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
659+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
660+
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
661661
</Compile>
662-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
663-
<Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
662+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
663+
<Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
664664
</Compile>
665665
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
666666
<Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
@@ -892,8 +892,8 @@
892892
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
893893
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
894894
</Compile>
895-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
896-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
895+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
896+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
897897
</Compile>
898898
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
899899
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal sealed partial class TdsParser
4444
private static int _objectTypeCount; // EventSource counter
4545
private readonly SqlClientLogger _logger = new SqlClientLogger();
4646

47-
private SSPIContextProvider _authenticationProvider;
47+
private SspiContextProvider _authenticationProvider;
4848

4949
internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);
5050
internal int ObjectID => _objectID;
@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,
413413
// AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
414414
if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
415415
{
416-
_authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();
416+
_authenticationProvider = _physicalStateObj.CreateSspiContextProvider();
417417
SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect | SEC | SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");
418418
}
419419

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCon
7575
////////////////
7676
internal abstract uint DisableSsl();
7777

78-
internal abstract SSPIContextProvider CreateSSPIContextProvider();
78+
internal abstract SspiContextProvider CreateSspiContextProvider();
7979

8080
internal abstract uint EnableMars(ref uint info);
8181

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectManaged.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ private SNIHandle GetSessionSNIHandleHandleOrThrow()
407407
[MethodImpl(MethodImplOptions.NoInlining)] // this forces the exception throwing code not to be inlined for performance
408408
private void ThrowClosedConnection() => throw ADP.ClosedConnectionError();
409409

410-
internal override SSPIContextProvider CreateSSPIContextProvider()
411-
=> new NegotiateSSPIContextProvider();
410+
internal override SspiContextProvider CreateSspiContextProvider()
411+
=> new NegotiateSspiContextProvider();
412412
}
413413
}

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ internal override void DisposePacketCache()
449449
}
450450
}
451451

452-
internal override SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
452+
internal override SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
453453

454454
internal sealed class WritePacketCache : IDisposable
455455
{

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,14 @@
354354
<Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
355355
<Link>Resources\ResCategoryAttribute.cs</Link>
356356
</Compile>
357-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
358-
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
357+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
358+
<Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
359359
</Compile>
360-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
361-
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
360+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
361+
<Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
362362
</Compile>
363-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
364-
<Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
363+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
364+
<Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
365365
</Compile>
366366
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
367367
<Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal sealed partial class TdsParser
4444
private static int _objectTypeCount; // EventSource counter
4545
private readonly SqlClientLogger _logger = new SqlClientLogger();
4646

47-
private SSPIContextProvider _authenticationProvider;
47+
private SspiContextProvider _authenticationProvider;
4848

4949
internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);
5050
internal int ObjectID => _objectID;
@@ -411,7 +411,7 @@ internal void Connect(ServerInfo serverInfo,
411411
// AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
412412
if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
413413
{
414-
_authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();
414+
_authenticationProvider = _physicalStateObj.CreateSspiContextProvider();
415415

416416
if (!string.IsNullOrEmpty(serverInfo.ServerSPN))
417417
{

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ internal TdsParserStateObject(TdsParser parser, SNIHandle physicalConnection, bo
9898
_lastSuccessfulIOTimer = parser._physicalStateObj._lastSuccessfulIOTimer;
9999
}
100100

101-
internal SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
101+
internal SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
102102

103103
////////////////
104104
// Properties //

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSSPIContextProvider.cs renamed to ‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.Data.SqlClient
88
{
9-
internal sealed class NativeSSPIContextProvider : SSPIContextProvider
9+
internal sealed class NativeSspiContextProvider : SspiContextProvider
1010
{
1111
private static readonly object s_tdsParserLock = new();
1212

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSSPIContextProvider.cs renamed to ‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.Data.SqlClient
1010
{
11-
internal sealed class NegotiateSSPIContextProvider : SSPIContextProvider
11+
internal sealed class NegotiateSspiContextProvider : SspiContextProvider
1212
{
1313
private NegotiateAuthentication? _negotiateAuth = null;
1414

@@ -20,7 +20,7 @@ protected override bool GenerateSspiClientContext(ReadOnlySpan<byte> incomingBlo
2020
var sendBuff = _negotiateAuth.GetOutgoingBlob(incomingBlob, out statusCode)!;
2121

2222
// Log session id, status code and the actual SPN used in the negotiation
23-
SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSSPIContextProvider),
23+
SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSspiContextProvider),
2424
nameof(GenerateSspiClientContext), _physicalStateObj.SessionId, statusCode, _negotiateAuth.TargetName);
2525

2626
if (statusCode == NegotiateAuthenticationStatusCode.Completed || statusCode == NegotiateAuthenticationStatusCode.ContinueNeeded)

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SSPIContextProvider.cs renamed to ‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.Data.SqlClient
88
{
9-
internal abstract class SSPIContextProvider
9+
internal abstract class SspiContextProvider
1010
{
1111
private TdsParser _parser = null!;
1212
private ServerInfo _serverInfo = null!;
@@ -29,7 +29,7 @@ private protected virtual void Initialize()
2929

3030
internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter, string serverSpn)
3131
{
32-
using var _ = TrySNIEventScope.Create(nameof(SSPIContextProvider));
32+
using var _ = TrySNIEventScope.Create(nameof(SspiContextProvider));
3333

3434
if (!RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, serverSpn))
3535
{
@@ -40,7 +40,7 @@ internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outg
4040

4141
internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter, ReadOnlySpan<string> serverSpns)
4242
{
43-
using var _ = TrySNIEventScope.Create(nameof(SSPIContextProvider));
43+
using var _ = TrySNIEventScope.Create(nameof(SspiContextProvider));
4444

4545
foreach (var serverSpn in serverSpns)
4646
{

0 commit comments

Comments
 (0)