Explorar o código

Data corruption using SslStream (Xamarin bug 15293)

When reading and writing data at the same time over an
System.Net.Security.SslStream, an exception will be thrown often.
Usually the exception is: Mono.Security.Protocol.Tls.TlsException “Bad
record MAC”

The issue is that the single TlsCipherSuite instance used for both
reading and writing does not synchronize access to the “header” member.
If the contents get corrupted the MAC calculation returned by
ComputServerRecordMAC or ComputeClientRecordMAC is incorrect.

See https://bugzilla.xamarin.com/show_bug.cgi?id=15293. Reproduced in
OS X, iOS and Windows.
Ed Boren %!s(int64=12) %!d(string=hai) anos
pai
achega
ee17eca298

+ 35 - 30
mcs/class/Mono.Security/Mono.Security.Protocol.Tls/TlsCipherSuite.cs

@@ -32,6 +32,7 @@ namespace Mono.Security.Protocol.Tls
 	{
 	{
 		private const int MacHeaderLength = 13;
 		private const int MacHeaderLength = 13;
 		private byte[] header;
 		private byte[] header;
+		private object headerLock = new object ();
 
 
 		#region Constructors
 		#region Constructors
 		
 		
@@ -53,40 +54,44 @@ namespace Mono.Security.Protocol.Tls
 
 
 		public override byte[] ComputeServerRecordMAC(ContentType contentType, byte[] fragment)
 		public override byte[] ComputeServerRecordMAC(ContentType contentType, byte[] fragment)
 		{
 		{
-			if (header == null)
-				header = new byte [MacHeaderLength];
-
-			ulong seqnum = (Context is ClientContext) ? Context.ReadSequenceNumber : Context.WriteSequenceNumber;
-			Write (header, 0, seqnum);
-			header [8] = (byte) contentType;
-			Write (header, 9, this.Context.Protocol);
-			Write (header, 11, (short)fragment.Length);
-
-			HashAlgorithm mac = this.ServerHMAC;
-			mac.TransformBlock (header, 0, header.Length, header, 0);
-			mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
-			// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
-			mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
-			return mac.Hash;
+			lock (headerLock) {
+				if (header == null)
+					header = new byte [MacHeaderLength];
+
+				ulong seqnum = (Context is ClientContext) ? Context.ReadSequenceNumber : Context.WriteSequenceNumber;
+				Write (header, 0, seqnum);
+				header [8] = (byte)contentType;
+				Write (header, 9, this.Context.Protocol);
+				Write (header, 11, (short)fragment.Length);
+
+				HashAlgorithm mac = this.ServerHMAC;
+				mac.TransformBlock (header, 0, header.Length, header, 0);
+				mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
+				// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
+				mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
+				return mac.Hash;
+			}
 		}
 		}
 
 
 		public override byte[] ComputeClientRecordMAC(ContentType contentType, byte[] fragment)
 		public override byte[] ComputeClientRecordMAC(ContentType contentType, byte[] fragment)
 		{
 		{
-			if (header == null)
-				header = new byte [MacHeaderLength];
-
-			ulong seqnum = (Context is ClientContext) ? Context.WriteSequenceNumber : Context.ReadSequenceNumber;
-			Write (header, 0, seqnum);
-			header [8] = (byte) contentType;
-			Write (header, 9, this.Context.Protocol);
-			Write (header, 11, (short)fragment.Length);
-
-			HashAlgorithm mac = this.ClientHMAC;
-			mac.TransformBlock (header, 0, header.Length, header, 0);
-			mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
-			// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
-			mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
-			return mac.Hash;
+			lock (headerLock) {
+				if (header == null)
+					header = new byte [MacHeaderLength];
+
+				ulong seqnum = (Context is ClientContext) ? Context.WriteSequenceNumber : Context.ReadSequenceNumber;
+				Write (header, 0, seqnum);
+				header [8] = (byte)contentType;
+				Write (header, 9, this.Context.Protocol);
+				Write (header, 11, (short)fragment.Length);
+
+				HashAlgorithm mac = this.ClientHMAC;
+				mac.TransformBlock (header, 0, header.Length, header, 0);
+				mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
+				// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
+				mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
+				return mac.Hash;
+			}
 		}
 		}
 
 
 		#endregion
 		#endregion

+ 35 - 30
mcs/class/System.ServiceModel/Mono.Security.Protocol.Tls/TlsCipherSuite.cs

@@ -32,6 +32,7 @@ namespace Mono.Security.Protocol.Tls
 	{
 	{
 		private const int MacHeaderLength = 13;
 		private const int MacHeaderLength = 13;
 		private byte[] header;
 		private byte[] header;
+		private object headerLock = new object ();
 
 
 		#region Constructors
 		#region Constructors
 		
 		
@@ -53,40 +54,44 @@ namespace Mono.Security.Protocol.Tls
 
 
 		public override byte[] ComputeServerRecordMAC(ContentType contentType, byte[] fragment)
 		public override byte[] ComputeServerRecordMAC(ContentType contentType, byte[] fragment)
 		{
 		{
-			if (header == null)
-				header = new byte [MacHeaderLength];
-
-			ulong seqnum = (Context is ClientContext) ? Context.ReadSequenceNumber : Context.WriteSequenceNumber;
-			Write (header, 0, seqnum);
-			header [8] = (byte) contentType;
-			Write (header, 9, this.Context.Protocol);
-			Write (header, 11, (short)fragment.Length);
-
-			HashAlgorithm mac = this.ServerHMAC;
-			mac.TransformBlock (header, 0, header.Length, header, 0);
-			mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
-			// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
-			mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
-			return mac.Hash;
+			lock (headerLock) {
+				if (header == null)
+					header = new byte [MacHeaderLength];
+
+				ulong seqnum = (Context is ClientContext) ? Context.ReadSequenceNumber : Context.WriteSequenceNumber;
+				Write (header, 0, seqnum);
+				header [8] = (byte)contentType;
+				Write (header, 9, this.Context.Protocol);
+				Write (header, 11, (short)fragment.Length);
+
+				HashAlgorithm mac = this.ServerHMAC;
+				mac.TransformBlock (header, 0, header.Length, header, 0);
+				mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
+				// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
+				mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
+				return mac.Hash;
+			}
 		}
 		}
 
 
 		public override byte[] ComputeClientRecordMAC(ContentType contentType, byte[] fragment)
 		public override byte[] ComputeClientRecordMAC(ContentType contentType, byte[] fragment)
 		{
 		{
-			if (header == null)
-				header = new byte [MacHeaderLength];
-
-			ulong seqnum = (Context is ClientContext) ? Context.WriteSequenceNumber : Context.ReadSequenceNumber;
-			Write (header, 0, seqnum);
-			header [8] = (byte) contentType;
-			Write (header, 9, this.Context.Protocol);
-			Write (header, 11, (short)fragment.Length);
-
-			HashAlgorithm mac = this.ClientHMAC;
-			mac.TransformBlock (header, 0, header.Length, header, 0);
-			mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
-			// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
-			mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
-			return mac.Hash;
+			lock (headerLock) {
+				if (header == null)
+					header = new byte [MacHeaderLength];
+
+				ulong seqnum = (Context is ClientContext) ? Context.WriteSequenceNumber : Context.ReadSequenceNumber;
+				Write (header, 0, seqnum);
+				header [8] = (byte)contentType;
+				Write (header, 9, this.Context.Protocol);
+				Write (header, 11, (short)fragment.Length);
+
+				HashAlgorithm mac = this.ClientHMAC;
+				mac.TransformBlock (header, 0, header.Length, header, 0);
+				mac.TransformBlock (fragment, 0, fragment.Length, fragment, 0);
+				// hack, else the method will allocate a new buffer of the same length (negative half the optimization)
+				mac.TransformFinalBlock (CipherSuite.EmptyArray, 0, 0);
+				return mac.Hash;
+			}
 		}
 		}
 
 
 		#endregion
 		#endregion