Fix auth flow for WireCrypt=Required (#981).

FirebirdSQL · Aug 20, 2021 · 087f524 · 087f524
1 parent af3b3bc
commit 087f524
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/AuthBlock.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/AuthBlock.cs
@@ -127,15 +127,15 @@ public byte[] UserIdentificationData()
 		public void SendContAuthToBuffer(IXdrWriter xdr)
 		{
 			xdr.Write(IscCodes.op_cont_auth);
-			xdr.WriteBuffer(ClientData); // p_data
+			xdr.WriteBuffer(HasClientData ? ClientData : PublicClientData); // p_data
 			xdr.Write(AcceptPluginName); // p_name
 			xdr.Write(AcceptPluginName); // p_list
 			xdr.WriteBuffer(ServerKeys); // p_keys
 		}
 		public async ValueTask SendContAuthToBufferAsync(IXdrWriter xdr, CancellationToken cancellationToken = default)
 		{
 			await xdr.WriteAsync(IscCodes.op_cont_auth, cancellationToken).ConfigureAwait(false);
-			await xdr.WriteBufferAsync(ClientData, cancellationToken).ConfigureAwait(false); // p_data
+			await xdr.WriteBufferAsync(HasClientData ? ClientData : PublicClientData, cancellationToken).ConfigureAwait(false); // p_data
 			await xdr.WriteAsync(AcceptPluginName, cancellationToken).ConfigureAwait(false); // p_name
 			await xdr.WriteAsync(AcceptPluginName, cancellationToken).ConfigureAwait(false); // p_list
 			await xdr.WriteBufferAsync(ServerKeys, cancellationToken).ConfigureAwait(false); // p_keys

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/GdsConnection.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/GdsConnection.cs
@@ -194,7 +194,7 @@ public void Identify(string database)
 							StartCompression();
 						}
 
-						if (operation == IscCodes.op_cond_accept && AuthBlock.HasClientData)
+						if (operation == IscCodes.op_cond_accept)
 						{
 							while (true)
 							{
@@ -298,7 +298,7 @@ await Xdr.ReadBooleanAsync(cancellationToken).ConfigureAwait(false),
 							StartCompression();
 						}
 
-						if (operation == IscCodes.op_cond_accept && AuthBlock.HasClientData)
+						if (operation == IscCodes.op_cond_accept)
 						{
 							while (true)
 							{