From 1b881f5df30491c7a6e1fb5957d3c0fe25170805 Mon Sep 17 00:00:00 2001
From: oleg <oleg@renci.org>
Date: Tue, 20 Dec 2016 11:39:51 -0500
Subject: [PATCH 001/128] Change how clientExchangeValue is calculated (#130)

---
 .../Classes/Common/BigIntegerTest.cs          | 61 +++++++++++++++++++
 src/Renci.SshNet/Common/BigInteger.cs         | 36 ++++++++---
 2 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
index e41228404..dc8bddc0b 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
@@ -16,6 +16,7 @@
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
+using System.Text.RegularExpressions;
 #if FEATURE_NUMERICS_BIGINTEGER
 using BigInteger = System.Numerics.BigInteger;
 #else
@@ -1650,6 +1651,66 @@ public void Zero()
             Assert.AreEqual(0, zero.Sign);
         }
 
+        [TestMethod]
+        public void TestClientExhcangeGenerationItem130()
+        {
+            var test = "1090748135619415929450294929359784500348155124953172211774101106966150168922785639028532473848836817769712164169076432969224698752674677662739994265785437233596157045970922338040698100507861033047312331823982435279475700199860971612732540528796554502867919746776983759391475987142521315878719577519148811830879919426939958487087540965716419167467499326156226529675209172277001377591248147563782880558861083327174154014975134893125116015776318890295960698011614157721282527539468816519319333337503114777192360412281721018955834377615480468479252748867320362385355596601795122806756217713579819870634321561907813255153703950795271232652404894983869492174481652303803498881366210508647263668376514131031102336837488999775744046733651827239395353540348414872854639719294694323450186884189822544540647226987292160693184734654941906936646576130260972193280317171696418971553954161446191759093719524951116705577362073481319296041201283516154269044389257727700289684119460283480452306204130024913879981135908026983868205969318167819680850998649694416907952712904962404937775789698917207356355227455066183815847669135530549755439819480321732925869069136146085326382334628745456398071603058051634209386708703306545903199608523824513729625136659128221100967735450519952404248198262813831097374261650380017277916975324134846574681307337017380830353680623216336949471306191686438249305686413380231046096450953594089375540285037292470929395114028305547452584962074309438151825437902976012891749355198678420603722034900311364893046495761404333938686140037848030916292543273684533640032637639100774502371542479302473698388692892420946478947733800387782741417786484770190108867879778991633218628640533982619322466154883011452291890252336487236086654396093853898628805813177559162076363154436494477507871294119841637867701722166609831201845484078070518041336869808398454625586921201308185638888082699408686536045192649569198110353659943111802300636106509865023943661829436426563007917282050894429388841748885398290707743052973605359277515749619730823773215894755121761467887865327707115573804264519206349215850195195364813387526811742474131549802130246506341207020335797706780705406945275438806265978516209706795702579244075380490231741030862614968783306207869687868108423639971983209077624758080499988275591392787267627182442892809646874228263172435642368588260139161962836121481966092745325488641054238839295138992979335446110090325230955276870524611359124918392740353154294858383359";
+            BigInteger prime;
+            BigInteger.TryParse(test, NumberStyles.Number, NumberFormatInfo.CurrentInfo, out prime);
+
+            BigInteger group = 2;
+            var bitLength = prime.BitLength;
+
+            BigInteger clientExchangeValue;
+            do
+            {
+                var randomValue = BigInteger.Random(bitLength);
+
+                //clientExchangeValue = BigInteger.ModPow(group, randomValue, prime);
+                clientExchangeValue = (group ^ randomValue) % prime;
+            } while (clientExchangeValue < 1 || clientExchangeValue > (prime - 1));
+        }
+
+        [TestMethod]
+        public void TestClientExhcangeGenerationGroup1()
+        {
+            var test = "00FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF";
+            BigInteger prime;
+            BigInteger.TryParse(test, NumberStyles.AllowHexSpecifier, NumberFormatInfo.CurrentInfo, out prime);
+
+            BigInteger group = 2;
+            var bitLength = prime.BitLength;
+
+            BigInteger clientExchangeValue;
+            do
+            {
+                var randomValue = BigInteger.Random(bitLength);
+
+                //clientExchangeValue = BigInteger.ModPow(group, randomValue, prime);
+                clientExchangeValue = (group ^ randomValue) % prime;
+            } while (clientExchangeValue < 1 || clientExchangeValue > (prime - 1));
+        }
+
+        [TestMethod]
+        public void TestClientExhcangeGenerationGroup14()
+        {
+            var test = "00FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF";
+            BigInteger prime;
+            BigInteger.TryParse(test, NumberStyles.AllowHexSpecifier, NumberFormatInfo.CurrentInfo, out prime);
+
+            BigInteger group = 2;
+            var bitLength = prime.BitLength;
+
+            BigInteger clientExchangeValue;
+            do
+            {
+                var randomValue = BigInteger.Random(bitLength);
+
+                //clientExchangeValue = BigInteger.ModPow(group, randomValue, prime);
+                clientExchangeValue = (group ^ randomValue) % prime;
+            } while (clientExchangeValue < 1 || clientExchangeValue > (prime - 1));
+        }
+
         private static void AssertEqual(byte[] a, byte[] b)
         {
             Assert.IsTrue(a.IsEqualTo(b));
diff --git a/src/Renci.SshNet/Common/BigInteger.cs b/src/Renci.SshNet/Common/BigInteger.cs
index 7cbba88c5..73cce8bdf 100644
--- a/src/Renci.SshNet/Common/BigInteger.cs
+++ b/src/Renci.SshNet/Common/BigInteger.cs
@@ -165,18 +165,36 @@ public static BigInteger PositiveMod(BigInteger dividend, BigInteger divisor)
         }
 
         /// <summary>
-        /// Generates random <see cref="BigInteger"/> number.
+        /// Generates a new, random <see cref="BigInteger"/> of the specified length.
         /// </summary>
-        /// <param name="bitLength">Length of random number in bits.</param>
-        /// <returns>
-        /// A random number.
-        /// </returns>
+        /// <param name="bitLength">The number of bits for the new number.</param>
+        /// <returns>A random number of the specified length.</returns>
         public static BigInteger Random(int bitLength)
         {
-            var bytesArray = new byte[bitLength / 8 + (((bitLength % 8) > 0) ? 1 : 0)];
-            CryptoAbstraction.GenerateRandom(bytesArray);
-            bytesArray[bytesArray.Length - 1] = (byte)(bytesArray[bytesArray.Length - 1] & 0x7F);   //  Ensure not a negative value
-            return new BigInteger(bytesArray);
+            int dwords = bitLength >> 5;
+            int remBits = bitLength & 0x1F;
+
+            if (remBits != 0)
+                dwords++;
+
+            BigInteger ret = new BigInteger(1, new uint[(uint)dwords + 1]);
+            byte[] random = new byte[dwords << 2];
+
+            CryptoAbstraction.GenerateRandom(random);
+            Buffer.BlockCopy(random, 0, ret._data, 0, (int)dwords << 2);
+
+            if (remBits != 0)
+            {
+                uint mask = (uint)(0x01 << (remBits - 1));
+                ret._data[dwords - 1] |= mask;
+
+                mask = (uint)(0xFFFFFFFF >> (32 - remBits));
+                ret._data[dwords - 1] &= mask;
+            }
+            else
+                ret._data[dwords - 1] |= 0x80000000;
+
+            return ret;
         }
 
         #endregion SSH.NET additions

From 78679a3c30e689aeb2ad8990aa4db6d71b48db99 Mon Sep 17 00:00:00 2001
From: oleg <oleg@renci.org>
Date: Tue, 20 Dec 2016 13:10:50 -0500
Subject: [PATCH 002/128] Add ClientIP to client info to allow select client IP
 that should be used for connection (#132)

---
 src/Renci.SshNet/ConnectionInfo.cs | 70 ++++++++++++++++++++++++++++++
 src/Renci.SshNet/Session.cs        |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/ConnectionInfo.cs b/src/Renci.SshNet/ConnectionInfo.cs
index ba8f38b93..6e13755ae 100644
--- a/src/Renci.SshNet/ConnectionInfo.cs
+++ b/src/Renci.SshNet/ConnectionInfo.cs
@@ -9,6 +9,7 @@
 using Renci.SshNet.Messages.Authentication;
 using Renci.SshNet.Security.Cryptography.Ciphers.Modes;
 using Renci.SshNet.Security.Cryptography.Ciphers;
+using System.Net;
 
 namespace Renci.SshNet
 {
@@ -205,6 +206,14 @@ public class ConnectionInfo : IConnectionInfoInternal
         /// </summary>
         public string ClientVersion { get; internal set; }
 
+        /// <summary>
+        /// Gets the client ip to use for connection when client has multiple IP addresses availble.
+        /// </summary>
+        /// <value>
+        /// The client ip to use for connection.
+        /// </value>
+        public IPAddress ClientIP { get; internal set; }
+
         /// <summary>
         /// Gets the current client compression algorithm.
         /// </summary>
@@ -263,6 +272,66 @@ public ConnectionInfo(string host, int port, string username, params Authenticat
         /// <exception cref="ArgumentNullException"><paramref name="authenticationMethods"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">No <paramref name="authenticationMethods"/> specified.</exception>
         public ConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params AuthenticationMethod[] authenticationMethods)
+            : this(host, DefaultPort, username, null, ProxyTypes.None, null, 0, null, null, authenticationMethods)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
+        /// </summary>
+        /// <param name="host">The host.</param>
+        /// <param name="username">The username.</param>
+        /// <param name="clientIP">The client IP to be used.</param>
+        /// <param name="authenticationMethods">The authentication methods.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
+        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
+        public ConnectionInfo(string host, string username, IPAddress clientIP, params AuthenticationMethod[] authenticationMethods)
+            : this(host, DefaultPort, username, clientIP, ProxyTypes.None, null, 0, null, null, authenticationMethods)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
+        /// </summary>
+        /// <param name="host">The host.</param>
+        /// <param name="port">The port.</param>
+        /// <param name="username">The username.</param>
+        /// <param name="clientIP">The client IP to be used.</param>
+        /// <param name="authenticationMethods">The authentication methods.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="port" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
+        public ConnectionInfo(string host, int port, string username, IPAddress clientIP, params AuthenticationMethod[] authenticationMethods)
+            : this(host, port, username, clientIP, ProxyTypes.None, null, 0, null, null, authenticationMethods)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
+        /// </summary>
+        /// <param name="host">Connection host.</param>
+        /// <param name="port">Connection port.</param>
+        /// <param name="username">Connection username.</param>
+        /// <param name="clientIP">The client IP to be used.</param>
+        /// <param name="proxyType">Type of the proxy.</param>
+        /// <param name="proxyHost">The proxy host.</param>
+        /// <param name="proxyPort">The proxy port.</param>
+        /// <param name="proxyUsername">The proxy username.</param>
+        /// <param name="proxyPassword">The proxy password.</param>
+        /// <param name="authenticationMethods">The authentication methods.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="host"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="port" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="proxyType"/> is not <see cref="ProxyTypes.None"/> and <paramref name="proxyHost" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="proxyType"/> is not <see cref="ProxyTypes.None"/> and <paramref name="proxyPort" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="authenticationMethods"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">No <paramref name="authenticationMethods"/> specified.</exception>
+        public ConnectionInfo(string host, int port, string username, IPAddress clientIP, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params AuthenticationMethod[] authenticationMethods)
         {
             if (host == null)
                 throw new ArgumentNullException("host");
@@ -386,6 +455,7 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
             Host = host;
             Port = port;
             Username = username;
+            ClientIP = clientIP;
 
             ProxyType = proxyType;
             ProxyHost = proxyHost;
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index e26743098..0bebddfcf 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1600,7 +1600,7 @@ internal static string ToHex(byte[] bytes)
         /// <exception cref="SocketException">An error occurred trying to establish the connection.</exception>
         private void SocketConnect(string host, int port)
         {
-            var ipAddress = DnsAbstraction.GetHostAddresses(host)[0];
+            var ipAddress = ConnectionInfo.ClientIP ?? DnsAbstraction.GetHostAddresses(host)[0];
             var ep = new IPEndPoint(ipAddress, port);
 
             DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));

From 6d8f545bb41737444a53610b9ee83e04b6fbbd9e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Thu, 29 Dec 2016 21:27:19 +0100
Subject: [PATCH 003/128] Introduce VS 2017 solution and MSBuild-based .NET
 Core project

* Introduced VS 2017 solution
* Use MSBuild-based project for .NET Core.
* Removed Renci.SshNet.NETCore project from VS 2015 solution (as only VS
2017 supports MSBuild-based project for .NET Core)
* Added build script since MSBuild v15.0 cannot be used to build the VS
2012 solution (pfffff).
---
 build/build.cmd                               |  12 ++
 build/build.proj                              |  27 ++--
 .../Renci.SshNet.NETCore.csproj               | 117 ++++++++++++++++++
 .../Renci.SshNet.NETCore.xproj                |  19 ---
 src/Renci.SshNet.NETCore/project.json         |  90 --------------
 src/Renci.SshNet.VS2015.sln                   |  24 +---
 src/Renci.SshNet.VS2017.sln                   | 117 ++++++++++++++++++
 7 files changed, 265 insertions(+), 141 deletions(-)
 create mode 100644 build/build.cmd
 create mode 100644 src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
 delete mode 100644 src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.xproj
 delete mode 100644 src/Renci.SshNet.NETCore/project.json
 create mode 100644 src/Renci.SshNet.VS2017.sln

diff --git a/build/build.cmd b/build/build.cmd
new file mode 100644
index 000000000..146c26fbc
--- /dev/null
+++ b/build/build.cmd
@@ -0,0 +1,12 @@
+@echo off
+
+set MSBUILD14_EXE=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
+set MSBUILD15_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\\MSBuild\15.0\bin\MSBuild.exe
+
+call "%MSBUILD14_EXE%" build.proj /t:Clean
+call "%MSBUILD15_EXE%" build.proj /t:Clean
+
+call "%MSBUILD14_EXE%" build.proj /t:Build
+call "%MSBUILD15_EXE%" build.proj /t:Build
+
+call "%MSBUILD15_EXE%" build.proj /t:Package /p:ReleaseVersion=%1
\ No newline at end of file
diff --git a/build/build.proj b/build/build.proj
index 9b257de53..96708a6c2 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Clean;CreateNuGetPackage;CreateBinPackage;GenerateHelpFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<UsingTask TaskName="Zip" AssemblyFile="$(MSBuildThisFileDirectory)target\nuget\packages\$(MSBuildTasksPackageId).$(MSBuildTasksPackageVersion)\tools\MSBuild.Community.Tasks.dll"/>
 	<PropertyGroup>
 		<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
@@ -11,9 +11,17 @@
 	<ItemGroup>
 		<VisualStudioVersion Include="2012">
 			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2012.sln</SolutionFile>
+			<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
+			<NuGetPackageRestore>true</NuGetPackageRestore>
 		</VisualStudioVersion>
 		<VisualStudioVersion Include="2015">
 			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2015.sln</SolutionFile>
+			<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
+			<NuGetPackageRestore>true</NuGetPackageRestore>
+		</VisualStudioVersion>
+		<VisualStudioVersion Include="2017">
+			<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2017.sln</SolutionFile>
+			<MSBuildToolsVersion>15.0</MSBuildToolsVersion>
 		</VisualStudioVersion>
 	</ItemGroup>
 	<ItemGroup>
@@ -54,11 +62,11 @@
 		<RemoveDir Directories="$(MSBuildThisFileDirectory)target"/>
 		<ItemGroup>
 			<ProjectToBuild Remove="@(ProjectToBuild)"/>
-			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
+			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
 				<Properties>Configuration=Release</Properties>
 			</ProjectToBuild>
 		</ItemGroup>
-		<MSBuild Projects="@(ProjectToBuild)" Targets="Clean"/>
+		<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
 	</Target>
 	<Target Name="DownloadNuGet">
 		<MakeDir Directories="$(MSBuildThisFileDirectory)target\nuget"/>
@@ -67,22 +75,23 @@
 			FileName="$(MSBuildThisFileDirectory)target\nuget\nuget.exe"/>
 	</Target>
 	<Target Name="RestoreNuGetPackages" DependsOnTargets="DownloadNuGet" Outputs="%(VisualStudioVersion.Identity)">
-		<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High"/>
-		<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;"/>
+		<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
+		<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
 	</Target>
 	<Target Name="Build" DependsOnTargets="RestoreNuGetPackages" Outputs="%(VisualStudioVersion.Identity)">
 		<ItemGroup>
 			<ProjectToBuild Remove="@(ProjectToBuild)"/>
-			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
+			<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
 				<Properties>Configuration=Release</Properties>
 			</ProjectToBuild>
 		</ItemGroup>
 		<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
 	</Target>
+	<Target Name="Package" DependsOnTargets="CreateNuGetPackage;CreateBinPackage;GenerateHelpFile"/>
 	<Target Name="CreateNuGetPackage" DependsOnTargets="CopyBuildOutputToPackage">
 		<Exec Command="$(NuGetExe) pack $(MSBuildThisFileDirectory)nuget\SSH.NET.nuspec -OutputDirectory &quot;$(MSBuildThisFileDirectory)target&quot; -BasePath &quot;$(MSBuildThisFileDirectory)target\package&quot; -NonInteractive"/>
 	</Target>
-	<Target Name="CopyBuildOutputToPackage" DependsOnTargets="Build" Outputs="%(TargetFramework.Identity)">
+	<Target Name="CopyBuildOutputToPackage" Outputs="%(TargetFramework.Identity)">
 		<ItemGroup>
 			<BuildOutput Remove="@(BuildOutput)"/>
 			<BuildOutput Include="$(MSBuildThisFileDirectory)..\src\%(TargetFramework.OutputDirectory)\Renci.SshNet.dll"/>
@@ -90,12 +99,12 @@
 		</ItemGroup>
 		<Copy SourceFiles="@(BuildOutput)" DestinationFolder="$(MSBuildThisFileDirectory)target\package\lib\%(TargetFramework.Moniker)"/>
 	</Target>
-	<Target Name="GenerateHelpFile" DependsOnTargets="Build;CheckReleaseVersion">
+	<Target Name="GenerateHelpFile" DependsOnTargets="CheckReleaseVersion">
 		<Error Text="Please install Sandcastle, and ensure the SHFBFolder environment variable is set." Condition="'$(SHFBFolder)'==''"/>
 		<MSBuild Projects="$(MSBuildThisFileDirectory)sandcastle\SSH.NET.shfbproj"/>
 		<Move SourceFiles="$(MSBuildThisFileDirectory)target\help\SshNet.Help.chm" DestinationFiles="$(MSBuildThisFileDirectory)target\SSH.NET-$(ReleaseVersion)-help.chm"/>
 	</Target>
-	<Target Name="CopyBuildOutputToBin" DependsOnTargets="Build" Outputs="%(TargetFramework.Identity)">
+	<Target Name="CopyBuildOutputToBin" Outputs="%(TargetFramework.Identity)">
 		<ItemGroup>
 			<BuildOutput Remove="@(BuildOutput)"/>
 			<BuildOutput Include="$(MSBuildThisFileDirectory)..\src\%(TargetFramework.OutputDirectory)\*.dll"/>
diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
new file mode 100644
index 000000000..872901d03
--- /dev/null
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -0,0 +1,117 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <AssemblyTitle>SSH.NET</AssemblyTitle>
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Renci.SshNet</AssemblyName>
+    <AssemblyOriginatorKeyFile>../Renci.SshNet.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <Compile Include="..\Renci.SshNet\**\*.cs" Exclude="..\Renci.SshNet\Properties\AssemblyInfo.cs">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library">
+      <Version>1.6.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Microsoft.CSharp">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SshNet.Security.Cryptography">
+      <Version>[1.2.0]</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.Debug">
+      <Version>4.0.11</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.Tools">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.TraceSource">
+      <Version>4.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Globalization">
+      <Version>4.0.11</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.FileSystem">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.FileSystem.Primitives">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Linq">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.NameResolution">
+      <Version>4.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Sockets">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Extensions">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.Extensions">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Algorithms">
+      <Version>4.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.RegularExpressions">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading">
+      <Version>4.0.11</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Thread">
+      <Version>4.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.ThreadPool">
+      <Version>4.0.10</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Timer">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Xml.XmlDocument">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Xml.XPath.XmlDocument">
+      <Version>4.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <DefineConstants>$(DefineConstants);FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.xproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.xproj
deleted file mode 100644
index e1ed5223e..000000000
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>8e8229eb-6780-4a8a-b470-e2023fa55ab5</ProjectGuid>
-    <RootNamespace>Renci.SshNet</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Renci.SshNet.NETCore/project.json b/src/Renci.SshNet.NETCore/project.json
deleted file mode 100644
index 22ab4e45b..000000000
--- a/src/Renci.SshNet.NETCore/project.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "title": "SSH.NET",
-  "configurations": {
-    "debug": {
-      "buildOptions": {
-        "debugType": "portable",
-        "define": [ "DEBUG", "TRACE" ]
-      }
-    },
-    "release": {
-      "buildOptions": {
-        "debugType": "none",
-        "define": [ "TRACE" ]
-      }
-    }
-  },
-  "buildOptions": {
-    "outputName": "Renci.SshNet",
-    "keyFile": "../Renci.SshNet.snk",
-    "compile": {
-      "include": [
-        "../Renci.SshNet/**/*.cs"
-      ],
-      "exclude": [
-        "../Renci.SshNet/Properties/AssemblyInfo.cs"
-      ]
-    },
-    "optimize": true,
-    "xmlDoc": true,
-    "warningsAsErrors": true
-  },
-  "frameworks": {
-    "netstandard1.3": {
-      "dependencies": {
-        "Microsoft.CSharp": "4.0.1",
-        "SshNet.Security.Cryptography": "[1.2.0]",
-        "System.Diagnostics.Debug": "4.0.11",
-        "System.Diagnostics.Tools": "4.0.1",
-        "System.Diagnostics.TraceSource": "4.0.0",
-        "System.Globalization": "4.0.11",
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Linq": "4.1.0",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Sockets": "4.1.0",
-        "System.Reflection.Extensions": "4.0.1",
-        "System.Runtime.Extensions": "4.1.0",
-        "System.Security.Cryptography.Algorithms": "4.2.0",
-        "System.Text.RegularExpressions": "4.1.0",
-        "System.Threading": "4.0.11",
-        "System.Threading.Thread": "4.0.0",
-        "System.Threading.ThreadPool": "4.0.10",
-        "System.Threading.Timer": "4.0.1",
-        "System.Xml.XmlDocument": "4.0.1",
-        "System.Xml.XPath.XmlDocument": "4.0.1"
-      },
-      "buildOptions": {
-        "define": [
-          "FEATURE_ENCODING_ASCII",
-          "FEATURE_DIAGNOSTICS_TRACESOURCE",
-          "FEATURE_DIRECTORYINFO_ENUMERATEFILES",
-          "FEATURE_MEMORYSTREAM_TRYGETBUFFER",
-          "FEATURE_REFLECTION_TYPEINFO",
-          "FEATURE_RNG_CREATE",
-          "FEATURE_SOCKET_TAP",
-          "FEATURE_SOCKET_EAP",
-          "FEATURE_SOCKET_SYNC",
-          "FEATURE_SOCKET_SETSOCKETOPTION",
-          "FEATURE_SOCKET_POLL",
-          "FEATURE_DNS_TAP",
-          "FEATURE_STREAM_TAP",
-          "FEATURE_THREAD_COUNTDOWNEVENT",
-          "FEATURE_THREAD_THREADPOOL",
-          "FEATURE_THREAD_SLEEP",
-          "FEATURE_HASH_MD5",
-          "FEATURE_HASH_SHA1_CREATE",
-          "FEATURE_HASH_SHA256_CREATE",
-          "FEATURE_HASH_SHA384_CREATE",
-          "FEATURE_HASH_SHA512_CREATE",
-          "FEATURE_HMAC_MD5",
-          "FEATURE_HMAC_SHA1",
-          "FEATURE_HMAC_SHA256",
-          "FEATURE_HMAC_SHA384",
-          "FEATURE_HMAC_SHA512"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/Renci.SshNet.VS2015.sln b/src/Renci.SshNet.VS2015.sln
index 9ad41ee38..8171be891 100644
--- a/src/Renci.SshNet.VS2015.sln
+++ b/src/Renci.SshNet.VS2015.sln
@@ -37,12 +37,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Renci.SshNet.Shared.Tests",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.WindowsPhone8.Tests", "..\test\Renci.SshNet.WindowsPhone8.Tests\Renci.SshNet.WindowsPhone8.Tests.csproj", "{26F0D644-B3EF-47DF-8040-E9E4B2E63884}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Renci.SshNet.NETCore", "Renci.SshNet.NETCore\Renci.SshNet.NETCore.xproj", "{8E8229EB-6780-4A8A-B470-E2023FA55AB5}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\test\Renci.SshNet.Shared.Tests\Renci.SshNet.Shared.Tests.projitems*{fae3948f-a438-458e-8e0e-7f6e39a5dd8a}*SharedItemsImports = 13
 		..\test\Renci.SshNet.Shared.Tests\Renci.SshNet.Shared.Tests.projitems*{26f0d644-b3ef-47df-8040-e9e4b2e63884}*SharedItemsImports = 4
+		..\test\Renci.SshNet.Shared.Tests\Renci.SshNet.Shared.Tests.projitems*{fae3948f-a438-458e-8e0e-7f6e39a5dd8a}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -183,26 +181,6 @@ Global
 		{26F0D644-B3EF-47DF-8040-E9E4B2E63884}.Release|x86.ActiveCfg = Release|x86
 		{26F0D644-B3EF-47DF-8040-E9E4B2E63884}.Release|x86.Build.0 = Release|x86
 		{26F0D644-B3EF-47DF-8040-E9E4B2E63884}.Release|x86.Deploy.0 = Release|x86
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|ARM.Build.0 = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x64.Build.0 = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Renci.SshNet.VS2017.sln b/src/Renci.SshNet.VS2017.sln
new file mode 100644
index 000000000..00469f612
--- /dev/null
+++ b/src/Renci.SshNet.VS2017.sln
@@ -0,0 +1,117 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26014.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}"
+	ProjectSection(SolutionItems) = preProject
+		..\build\build.cmd = ..\build\build.cmd
+		..\build\build.proj = ..\build\build.proj
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{94EE3919-19FA-4D9B-8DA9-249050B15232}"
+	ProjectSection(SolutionItems) = preProject
+		..\build\nuget\SSH.NET.nuspec = ..\build\nuget\SSH.NET.nuspec
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandcastle", "sandcastle", "{A6C3FFD3-16A5-44D3-8C1F-3613D6DD17D1}"
+	ProjectSection(SolutionItems) = preProject
+		..\build\sandcastle\SSH.NET.shfbproj = ..\build\sandcastle\SSH.NET.shfbproj
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet", "Renci.SshNet\Renci.SshNet.csproj", "{2F5F8C90-0BD1-424F-997C-7BC6280919D1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.Tests", "Renci.SshNet.Tests\Renci.SshNet.Tests.csproj", "{C45379B9-17B1-4E89-BC2E-6D41726413E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.NET35", "Renci.SshNet.NET35\Renci.SshNet.NET35.csproj", "{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Renci.SshNet.NETCore", "Renci.SshNet.NETCore\Renci.SshNet.NETCore.csproj", "{8E8229EB-6780-4A8A-B470-E2023FA55AB5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F5F8C90-0BD1-424F-997C-7BC6280919D1}.Release|x86.ActiveCfg = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{C45379B9-17B1-4E89-BC2E-6D41726413E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD1C552F-7F48-4269-ABB3-2E4C89B7E43A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|ARM.Build.0 = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x64.Build.0 = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E8229EB-6780-4A8A-B470-E2023FA55AB5}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{94EE3919-19FA-4D9B-8DA9-249050B15232} = {2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}
+		{A6C3FFD3-16A5-44D3-8C1F-3613D6DD17D1} = {2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = Renci.SshNet1.vsmdi
+	EndGlobalSection
+EndGlobal

From 9747d9caefad1dc760aed67744ef6107c66e27af Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 30 Dec 2016 13:14:35 +0100
Subject: [PATCH 004/128] Revert "Add ClientIP to client info to allow select
 client IP that should be used for connection (#132)"

This reverts commit 78679a3c30e689aeb2ad8990aa4db6d71b48db99.
---
 src/Renci.SshNet/ConnectionInfo.cs | 70 ------------------------------
 src/Renci.SshNet/Session.cs        |  2 +-
 2 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/src/Renci.SshNet/ConnectionInfo.cs b/src/Renci.SshNet/ConnectionInfo.cs
index 6e13755ae..ba8f38b93 100644
--- a/src/Renci.SshNet/ConnectionInfo.cs
+++ b/src/Renci.SshNet/ConnectionInfo.cs
@@ -9,7 +9,6 @@
 using Renci.SshNet.Messages.Authentication;
 using Renci.SshNet.Security.Cryptography.Ciphers.Modes;
 using Renci.SshNet.Security.Cryptography.Ciphers;
-using System.Net;
 
 namespace Renci.SshNet
 {
@@ -206,14 +205,6 @@ public class ConnectionInfo : IConnectionInfoInternal
         /// </summary>
         public string ClientVersion { get; internal set; }
 
-        /// <summary>
-        /// Gets the client ip to use for connection when client has multiple IP addresses availble.
-        /// </summary>
-        /// <value>
-        /// The client ip to use for connection.
-        /// </value>
-        public IPAddress ClientIP { get; internal set; }
-
         /// <summary>
         /// Gets the current client compression algorithm.
         /// </summary>
@@ -272,66 +263,6 @@ public ConnectionInfo(string host, int port, string username, params Authenticat
         /// <exception cref="ArgumentNullException"><paramref name="authenticationMethods"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">No <paramref name="authenticationMethods"/> specified.</exception>
         public ConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params AuthenticationMethod[] authenticationMethods)
-            : this(host, DefaultPort, username, null, ProxyTypes.None, null, 0, null, null, authenticationMethods)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
-        /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="username">The username.</param>
-        /// <param name="clientIP">The client IP to be used.</param>
-        /// <param name="authenticationMethods">The authentication methods.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
-        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramref name="host" /> is a zero-length string.</exception>
-        public ConnectionInfo(string host, string username, IPAddress clientIP, params AuthenticationMethod[] authenticationMethods)
-            : this(host, DefaultPort, username, clientIP, ProxyTypes.None, null, 0, null, null, authenticationMethods)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
-        /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="username">The username.</param>
-        /// <param name="clientIP">The client IP to be used.</param>
-        /// <param name="authenticationMethods">The authentication methods.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="port" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="host" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
-        public ConnectionInfo(string host, int port, string username, IPAddress clientIP, params AuthenticationMethod[] authenticationMethods)
-            : this(host, port, username, clientIP, ProxyTypes.None, null, 0, null, null, authenticationMethods)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectionInfo" /> class.
-        /// </summary>
-        /// <param name="host">Connection host.</param>
-        /// <param name="port">Connection port.</param>
-        /// <param name="username">Connection username.</param>
-        /// <param name="clientIP">The client IP to be used.</param>
-        /// <param name="proxyType">Type of the proxy.</param>
-        /// <param name="proxyHost">The proxy host.</param>
-        /// <param name="proxyPort">The proxy port.</param>
-        /// <param name="proxyUsername">The proxy username.</param>
-        /// <param name="proxyPassword">The proxy password.</param>
-        /// <param name="authenticationMethods">The authentication methods.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="host"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramref name="username" /> is <c>null</c>, a zero-length string or contains only whitespace characters.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="port" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="proxyType"/> is not <see cref="ProxyTypes.None"/> and <paramref name="proxyHost" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="proxyType"/> is not <see cref="ProxyTypes.None"/> and <paramref name="proxyPort" /> is not within <see cref="F:System.Net.IPEndPoint.MinPort" /> and <see cref="F:System.Net.IPEndPoint.MaxPort" />.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="authenticationMethods"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException">No <paramref name="authenticationMethods"/> specified.</exception>
-        public ConnectionInfo(string host, int port, string username, IPAddress clientIP, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params AuthenticationMethod[] authenticationMethods)
         {
             if (host == null)
                 throw new ArgumentNullException("host");
@@ -455,7 +386,6 @@ public ConnectionInfo(string host, int port, string username, IPAddress clientIP
             Host = host;
             Port = port;
             Username = username;
-            ClientIP = clientIP;
 
             ProxyType = proxyType;
             ProxyHost = proxyHost;
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 0bebddfcf..e26743098 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1600,7 +1600,7 @@ internal static string ToHex(byte[] bytes)
         /// <exception cref="SocketException">An error occurred trying to establish the connection.</exception>
         private void SocketConnect(string host, int port)
         {
-            var ipAddress = ConnectionInfo.ClientIP ?? DnsAbstraction.GetHostAddresses(host)[0];
+            var ipAddress = DnsAbstraction.GetHostAddresses(host)[0];
             var ep = new IPEndPoint(ipAddress, port);
 
             DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));

From d95276d8614a503309c7248f99e233bdea3bb4bb Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 4 Jan 2017 18:51:09 +0100
Subject: [PATCH 005/128] Document the fact that we now use VS 2017 to build
 the .NET Standard 1.3 flavor of SSH.NET.

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b83365f93..21e11db1c 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 **SSH.NET** supports the following target frameworks:
 * .NET Framework 3.5
 * .NET Framework 4.0 (and higher)
-* .NET Platform Standard 1.3
+* .NET Standard 1.3
 * Silverlight 4
 * Silverlight 5
 * Windows Phone 7.1
@@ -64,6 +64,7 @@ Software                          | net35 | net40 | netstandard1.3 | sl4 | sl5 |
 --------------------------------- | :---: | :---: | :------------: | :-: | :-: | :--: | :-: | :-----: |
 Windows Phone SDK 8.0             |       |       |                | x   | x   | x    | x   |
 Visual Studio 2012 Update 5       | x     | x     |                | x   | x   | x    | x   |
-Visual Studio 2015 Update 3       | x     | x     | x              |     | x   |      | x   | x
+Visual Studio 2015 Update 3       | x     | x     |                |     | x   |      | x   | x
+Visual Studio 2017                |       | x     | x              |     |     |      |     | 
 
 [![NDepend](http://download-codeplex.sec.s-msft.com/Download?ProjectName=sshnet&DownloadId=629750)](http://ndepend.com)

From 3f28d8c1758a10b9f08d9cbcf4008aec268ffbd8 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 8 Jan 2017 15:15:59 +0100
Subject: [PATCH 006/128] Revert changes in BigInteger.Random(int bitLength)
 from commit  1b881f5df30491c7a6e1fb5957d3c0fe25170805. Fixes issue #147.

---
 .../Classes/Common/BigIntegerTest.cs          | 14 ++++++++++
 src/Renci.SshNet/Common/BigInteger.cs         | 28 +++----------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
index dc8bddc0b..0ab772d03 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs
@@ -1651,6 +1651,20 @@ public void Zero()
             Assert.AreEqual(0, zero.Sign);
         }
 
+        [TestMethod]
+        public void Random()
+        {
+            var max = "26432534714839143538998938508341375449389492936207135611931371046236385860280414659368073862189301615603000443463893527273703804361856647266218472759410964268979057798543462774631912259980510080575520846081682603934587649566608158932346151315049355432937004801361578344502537300865702429436253728164365180058583916866804254965536833106467354901266304654706123552932560896874808786957654734387252964281680963136344135750381838556467139236094522411774117748615141352874979928570068255439327082539676660277104989857941859821396157749462154431239343148671646397611770487668571604363151098131876313773395912355145689712506";
+            BigInteger maxBigInt;
+            Assert.IsTrue(BigInteger.TryParse(max, NumberStyles.Number, NumberFormatInfo.CurrentInfo, out maxBigInt));
+
+            var random = BigInteger.One;
+            while (random <= BigInteger.One || random >= maxBigInt)
+            {
+                random = BigInteger.Random(2048);
+            }
+        }
+
         [TestMethod]
         public void TestClientExhcangeGenerationItem130()
         {
diff --git a/src/Renci.SshNet/Common/BigInteger.cs b/src/Renci.SshNet/Common/BigInteger.cs
index 73cce8bdf..611b74dde 100644
--- a/src/Renci.SshNet/Common/BigInteger.cs
+++ b/src/Renci.SshNet/Common/BigInteger.cs
@@ -171,30 +171,10 @@ public static BigInteger PositiveMod(BigInteger dividend, BigInteger divisor)
         /// <returns>A random number of the specified length.</returns>
         public static BigInteger Random(int bitLength)
         {
-            int dwords = bitLength >> 5;
-            int remBits = bitLength & 0x1F;
-
-            if (remBits != 0)
-                dwords++;
-
-            BigInteger ret = new BigInteger(1, new uint[(uint)dwords + 1]);
-            byte[] random = new byte[dwords << 2];
-
-            CryptoAbstraction.GenerateRandom(random);
-            Buffer.BlockCopy(random, 0, ret._data, 0, (int)dwords << 2);
-
-            if (remBits != 0)
-            {
-                uint mask = (uint)(0x01 << (remBits - 1));
-                ret._data[dwords - 1] |= mask;
-
-                mask = (uint)(0xFFFFFFFF >> (32 - remBits));
-                ret._data[dwords - 1] &= mask;
-            }
-            else
-                ret._data[dwords - 1] |= 0x80000000;
-
-            return ret;
+            var bytesArray = new byte[bitLength / 8 + (((bitLength % 8) > 0) ? 1 : 0)];
+            CryptoAbstraction.GenerateRandom(bytesArray);
+            bytesArray[bytesArray.Length - 1] = (byte) (bytesArray[bytesArray.Length - 1] & 0x7F);   //  Ensure not a negative value 
+            return new BigInteger(bytesArray);
         }
 
         #endregion SSH.NET additions

From ffda76a15b8bea686bf3846496b11a00fa9a83a8 Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Thu, 12 Jan 2017 18:00:29 +0200
Subject: [PATCH 007/128] Remove unused variables, fixes mcs warnings on Mono

---
 src/Renci.SshNet/ScpClient.NET.cs | 2 --
 src/Renci.SshNet/ScpClient.cs     | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/Renci.SshNet/ScpClient.NET.cs b/src/Renci.SshNet/ScpClient.NET.cs
index c3a3ce103..73b1770d4 100644
--- a/src/Renci.SshNet/ScpClient.NET.cs
+++ b/src/Renci.SshNet/ScpClient.NET.cs
@@ -202,7 +202,6 @@ private void InternalDownload(IChannelSession channel, Stream input, FileSystemI
                     SendConfirmation(channel); //  Send reply
 
                     //  Read directory
-                    var mode = long.Parse(match.Result("${mode}"));
                     var filename = match.Result("${filename}");
 
                     DirectoryInfo newDirectoryInfo;
@@ -230,7 +229,6 @@ private void InternalDownload(IChannelSession channel, Stream input, FileSystemI
                     //  Read file
                     SendConfirmation(channel); //  Send reply
 
-                    var mode = match.Result("${mode}");
                     var length = long.Parse(match.Result("${length}"));
                     var fileName = match.Result("${filename}");
 
diff --git a/src/Renci.SshNet/ScpClient.cs b/src/Renci.SshNet/ScpClient.cs
index a3f5e13f9..dfdec27c9 100644
--- a/src/Renci.SshNet/ScpClient.cs
+++ b/src/Renci.SshNet/ScpClient.cs
@@ -231,7 +231,6 @@ public void Download(string filename, Stream destination)
                     //  Read file
                     SendConfirmation(channel); //  Send reply
 
-                    var mode = match.Result("${mode}");
                     var length = long.Parse(match.Result("${length}"));
                     var fileName = match.Result("${filename}");
 

From 0b04aaa79d7abbbeb4b47105b0c154f3cb5ceb43 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 11:12:37 +0100
Subject: [PATCH 008/128] Add more tests for .NET 3.5 test project.

---
 .../Renci.SshNet.Tests.NET35.csproj           | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 9fdeeb6a3..a9ea6dbfe 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Moq">
+    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net35\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -77,6 +77,9 @@
     <Compile Include="..\..\test\Renci.SshNet.Shared.Tests\ForwardedPortStatusTest_Stopping.cs">
       <Link>Classes\ForwardedPortStatusTest_Stopping.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs">
+      <Link>Classes\BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelDirectTcpipTest.cs">
       <Link>Classes\Channels\ChannelDirectTcpipTest.cs</Link>
     </Compile>
@@ -839,6 +842,45 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest.HttpProxy.cs">
       <Link>Classes\SessionTest.HttpProxy.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected.cs">
+      <Link>Classes\SessionTest_Connected.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_ConnectedBase.cs">
+      <Link>Classes\SessionTest_ConnectedBase.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ConnectionReset.cs">
+      <Link>Classes\SessionTest_Connected_ConnectionReset.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_Disconnect.cs">
+      <Link>Classes\SessionTest_Connected_Disconnect.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs">
+      <Link>Classes\SessionTest_Connected_GlobalRequestMessageAfterAuthenticationRace.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerAndClientDisconnectRace.cs">
+      <Link>Classes\SessionTest_Connected_ServerAndClientDisconnectRace.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerSendsBadPacket.cs">
+      <Link>Classes\SessionTest_Connected_ServerSendsBadPacket.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerSendsDisconnectMessage.cs">
+      <Link>Classes\SessionTest_Connected_ServerSendsDisconnectMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs">
+      <Link>Classes\SessionTest_Connected_ServerSendsDisconnectMessageAndShutsDownSocket.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerShutsDownSendAfterSendingIncompletePacket.cs">
+      <Link>Classes\SessionTest_Connected_ServerShutsDownSendAfterSendingIncompletePacket.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_Connected_ServerShutsDownSocket.cs">
+      <Link>Classes\SessionTest_Connected_ServerShutsDownSocket.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_NotConnected.cs">
+      <Link>Classes\SessionTest_NotConnected.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\SessionTest_SocketConnected_BadPacketAndDispose.cs">
+      <Link>Classes\SessionTest_SocketConnected_BadPacketAndDispose.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\SftpClientTest.ChangeDirectory.cs">
       <Link>Classes\SftpClientTest.ChangeDirectory.cs</Link>
     </Compile>
@@ -1304,7 +1346,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 7b55ec02f4bb0028e8161d3cda789a4f8a3a83d9 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 11:26:27 +0100
Subject: [PATCH 009/128] Also run .NET 3.5 tests.

---
 appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1ccbff649..cb7ae8dde 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,9 @@ build:
   verbosity: minimal
 
 test:
-  assemblies: src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
+  assemblies:
+  - src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
+  - src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll
   categories:
     except:
     - integration

From 34b7ce24e0d35c52b8e42a060dc9abdf9f5d0c96 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 11:38:25 +0100
Subject: [PATCH 010/128] Attempt to run both .NET 4.0 and .NET 3.5 tests.

---
 appveyor.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cb7ae8dde..4296d30e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,11 +7,6 @@ build:
   project: src\Renci.SshNet.VS2015.sln
   verbosity: minimal
 
-test:
-  assemblies:
-  - src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
-  - src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll
-  categories:
-    except:
-    - integration
-    - LongRunning
\ No newline at end of file
+on_success:
+- cmd: vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
+- cmd: vstest.console /logger:Appveyor src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
\ No newline at end of file

From 0baac6aebde6b1727a183225f84f3c7f5f5a908b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 11:38:25 +0100
Subject: [PATCH 011/128] Attempt to run both .NET 4.0 and .NET 3.5 tests.

---
 appveyor.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cb7ae8dde..19988da77 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,11 +7,7 @@ build:
   project: src\Renci.SshNet.VS2015.sln
   verbosity: minimal
 
-test:
-  assemblies:
-  - src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
-  - src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll
-  categories:
-    except:
-    - integration
-    - LongRunning
\ No newline at end of file
+test_script:
+- cmd: >-
+    vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
+    vstest.console /logger:Appveyor src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
\ No newline at end of file

From b63a0ea5249a8a1b2141a4422c45912041bffa92 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 14:52:07 +0100
Subject: [PATCH 012/128] Revert "Attempt to run tests against .NET 3.5 and
 4.0."

This reverts commit b6ee090ba5e52f1a65cda0fd94c1b1f6459ed99b, reversing
changes made to 0baac6aebde6b1727a183225f84f3c7f5f5a908b.
---
 .../Renci.SshNet.NET35.csproj                 |  16 +-
 .../Renci.SshNet.Tests.csproj                 |   4 +-
 src/Renci.SshNet/Common/AsyncResult.cs        |  30 +--
 src/Renci.SshNet/Common/SemaphoreLight.cs     |   1 +
 src/Renci.SshNet/Renci.SshNet.csproj          |   7 +-
 src/Renci.SshNet/Session.cs                   |  28 +--
 src/Renci.SshNet/Sftp/ISftpSession.cs         |  13 -
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 229 ------------------
 src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs  |  12 -
 src/Renci.SshNet/Sftp/SftpSession.cs          |  46 ----
 src/Renci.SshNet/SftpClient.cs                | 118 ++-------
 src/Renci.SshNet/SubsystemSession.cs          |   2 +-
 12 files changed, 37 insertions(+), 469 deletions(-)
 delete mode 100644 src/Renci.SshNet/Sftp/SftpFileReader.cs
 delete mode 100644 src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index eb2af8621..3d399f394 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,33 +12,29 @@
     <AssemblyName>Renci.SshNet</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_SOCKET_SELECT;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
-    <LangVersion>5</LangVersion>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_SOCKET_SELECT;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
     <NoWarn>
     </NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -865,9 +861,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
-      <Link>Sftp\SftpFileReader.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -883,9 +876,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
-      <Link>Sftp\SftpReadAsyncResult.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 1ceb28721..4801475cf 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -42,8 +42,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\Users\Gert Driesen\Dropbox\Privé\Projects\SShNetTests\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq">
+      <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/src/Renci.SshNet/Common/AsyncResult.cs b/src/Renci.SshNet/Common/AsyncResult.cs
index 51995c14a..70726ed4b 100644
--- a/src/Renci.SshNet/Common/AsyncResult.cs
+++ b/src/Renci.SshNet/Common/AsyncResult.cs
@@ -29,12 +29,10 @@ public abstract class AsyncResult : IAsyncResult
         private Exception _exception;
 
         /// <summary>
-        /// Gets or sets a value indicating whether <see cref="EndInvoke()"/> has been called on the current
-        /// <see cref="AsyncResult"/>.
+        /// Gets or sets a value indicating whether EndInvoke has been called on the current AsyncResult.
         /// </summary>
         /// <value>
-        /// <c>true</c> if <see cref="EndInvoke()"/> has been called on the current <see cref="AsyncResult"/>;
-        /// otherwise, <c>false</c>.
+        /// <c>true</c> if <see cref="EndInvoke()"/> has been called on the current <see cref="AsyncResult"/>; otherwise, <c>false</c>.
         /// </value>
         public bool EndInvokeCalled { get; private set; }
 
@@ -77,7 +75,7 @@ public void SetAsCompleted(Exception exception, bool completedSynchronously)
         /// <summary>
         /// Waits until the asynchronous operation completes, and then returns. 
         /// </summary>
-        internal void EndInvoke()
+        public void EndInvoke()
         {
             // This method assumes that only 1 thread calls EndInvoke for this object
             if (!IsCompleted)
@@ -95,28 +93,6 @@ internal void EndInvoke()
                 throw _exception;
         }
 
-        /// <summary>
-        /// Waits until the asynchronous operation completes, and then returns. 
-        /// </summary>
-        internal void EndInvoke(TimeSpan timeout)
-        {
-            // This method assumes that only 1 thread calls EndInvoke for this object
-            if (!IsCompleted)
-            {
-                // If the operation isn't done, wait for it
-                var completed = AsyncWaitHandle.WaitOne(timeout);
-                _asyncWaitHandle = null;  // Allow early GC
-                AsyncWaitHandle.Dispose();
-
-            }
-
-            EndInvokeCalled = true;
-
-            // Operation is done: if an exception occurred, throw it
-            if (_exception != null)
-                throw _exception;
-        }
-
         #region Implementation of IAsyncResult
 
         /// <summary>
diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 19fa79649..4ff28acb6 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -64,6 +64,7 @@ public int Release(int releaseCount)
         /// </summary>
         public void Wait()
         {
+
             lock (_lock)
             {
                 while (_currentCount < 1)
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 05b839b78..fd278e17b 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
@@ -29,14 +29,13 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
     <NoWarn>
     </NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -417,7 +416,6 @@
     <Compile Include="Sftp\SftpDownloadAsyncResult.cs" />
     <Compile Include="Sftp\SftpFile.cs" />
     <Compile Include="Sftp\SftpFileAttributes.cs" />
-    <Compile Include="Sftp\SftpFileReader.cs" />
     <Compile Include="Sftp\SftpFileStream.cs" />
     <Compile Include="Sftp\SftpFileSystemInformation.cs">
       <SubType>Code</SubType>
@@ -427,7 +425,6 @@
     <Compile Include="Sftp\SftpMessageTypes.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Sftp\SftpReadAsyncResult.cs" />
     <Compile Include="Sftp\SftpSession.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 4cf4c2ded..e26743098 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1815,16 +1815,14 @@ private void SocketDisconnectAndDispose()
         /// </summary>
         private void MessageListener()
         {
-#if FEATURE_SOCKET_SELECT
-            var readSockets = new List<Socket> { _socket };
-#endif // FEATURE_SOCKET_SELECT
-
             try
             {
+                var readSockets = new List<Socket> {_socket};
+
                 // remain in message loop until socket is shut down or until we're disconnecting
                 while (_socket.IsConnected())
                 {
-#if FEATURE_SOCKET_SELECT
+#if FEATURE_SOCKET_POLL
                     // if the socket is already disposed when Select is invoked, then a SocketException
                     // stating "An operation was attempted on something that is not a socket" is thrown;
                     // we attempt to avoid this exception by having an IsConnected() that can break the
@@ -1837,8 +1835,7 @@ private void MessageListener()
 
                     // perform a blocking select to determine whether there's is data available to be
                     // read; we do not use a blocking read to allow us to use Socket.Poll to determine
-                    // if the connection is still available (in IsSocketConnected)
-
+                    // if the connection is still available (in IsSocketConnected
                     Socket.Select(readSockets, null, null, -1);
 
                     // the Select invocation will be interrupted in one of the following conditions:
@@ -1858,19 +1855,7 @@ private void MessageListener()
                         // break out of the message loop
                         break;
                     }
-#elif FEATURE_SOCKET_POLL
-                    // when Socket.Select(IList, IList, IList, Int32) is not available or is buggy, we use
-                    // Socket.Poll(Int, SelectMode) to block until either data is available or the socket
-                    // is closed
-
-                    var status = _socket.Poll(-1, SelectMode.SelectRead);
-                    if (!_socket.IsConnected())
-                    {
-                        // connection with SSH server was closed;
-                        // break out of the message loop
-                        break;
-                    }
-#endif // FEATURE_SOCKET_SELECT
+#endif // FEATURE_SOCKET_POLL
 
                     var message = ReceiveMessage();
                     if (message == null)
@@ -1884,7 +1869,7 @@ private void MessageListener()
                     message.Process(this);
                 }
 
-                // connection with SSH server was closed or socket was disposed
+                // connection with SSH server was closed
                 RaiseError(CreateConnectionAbortedByServerException());
             }
             catch (SocketException ex)
@@ -2216,7 +2201,6 @@ private void RaiseError(Exception exp)
                     return;
             }
 
-            // "save" exception and set exception wait handle to ensure any waits are interrupted
             _exception = exp;
             _exceptionWaitHandle.Set();
 
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 1c7660bd7..56190a9da 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -2,20 +2,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using Renci.SshNet.Sftp.Responses;
-using Renci.SshNet.Channels;
 
 namespace Renci.SshNet.Sftp
 {
     internal interface ISftpSession : ISubsystemSession
     {
-        /// <summary>
-        /// Gets the channel associated with this session.
-        /// </summary>
-        /// <value>
-        /// The channel associated with this session.
-        /// </value>
-        IChannelSession Channel { get; }
-
         /// <summary>
         /// Gets the SFTP protocol version.
         /// </summary>
@@ -104,10 +95,6 @@ internal interface ISftpSession : ISubsystemSession
         /// <returns>data array; null if EOF</returns>
         byte[] RequestRead(byte[] handle, ulong offset, uint length);
 
-        SftpReadAsyncResult BeginRead(byte[] handle, ulong offset, uint length, AsyncCallback callback, object state);
-
-        byte[] EndRead(IAsyncResult asyncResult);
-
         /// <summary>
         /// Performs SSH_FXP_READDIR request
         /// </summary>
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
deleted file mode 100644
index 3c0fad6f5..000000000
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using Renci.SshNet.Abstractions;
-using Renci.SshNet.Common;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-namespace Renci.SshNet.Sftp
-{
-    internal class SftpFileReader
-    {
-        private const int MaxReadAhead = 10;
-
-        private readonly byte[] _handle;
-        private readonly ISftpSession _sftpSession;
-        private SemaphoreLight _semaphore;
-        private bool _isCompleted;
-        private uint _chunkLength;
-        private int _readAheadChunkIndex;
-        private int _nextChunkIndex;
-        private ulong _readAheadOffset;
-        private ulong _offset;
-        private ulong _fileSize;
-        private readonly IDictionary<int, BufferedRead> _queue;
-        private readonly object _readLock;
-
-        public SftpFileReader(byte[] handle, ISftpSession sftpSession)
-        {
-            _handle = handle;
-            _sftpSession = sftpSession;
-            _chunkLength = 16 * 1024; // TODO !
-            _semaphore = new SemaphoreLight(MaxReadAhead);
-            _queue = new Dictionary<int, BufferedRead>(MaxReadAhead);
-            _readLock = new object();
-
-            _fileSize = (ulong)_sftpSession.RequestFStat(_handle).Size;
-
-            ThreadAbstraction.ExecuteThread(() =>
-            {
-                while (!_isCompleted)
-                {
-                    if (_readAheadOffset >= _fileSize)
-                        break;
-
-                    // TODO implement cancellation!?
-                    _semaphore.Wait();
-
-                    // start reading next chunk
-                    _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
-                                           new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
-
-                    // advance read-ahead offset
-                    _readAheadOffset += _chunkLength;
-
-                    _readAheadChunkIndex++;
-                }
-            });
-        }
-
-        public byte[] Read()
-        {
-            lock (_readLock)
-            {
-                BufferedRead nextChunk;
-
-                while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && !_isCompleted)
-                    Monitor.Wait(_readLock);
-
-                if (_isCompleted)
-                    return new byte[0];
-
-                if (nextChunk.Offset == _offset)
-                {
-                    var data = nextChunk.Data;
-                    _offset += (ulong) data.Length;
-
-                    // remove processed chunk
-                    _queue.Remove(_nextChunkIndex);
-                    // move to next chunk
-                    _nextChunkIndex++;
-                    // allow read ahead of a new chunk
-                    _semaphore.Release();
-                    return data;
-                }
-
-                // when the server returned less bytes than requested (for the previous chunk)
-                // we'll synchronously request the remaining data
-
-                var catchUp = new byte[nextChunk.Offset - _offset];
-                var bytesCaughtUp = 0L;
-
-                while (bytesCaughtUp < catchUp.Length)
-                {
-                    // TODO: break loop and interrupt blocking wait in case of exception
-                    var read = _sftpSession.RequestRead(_handle, _offset, (uint) catchUp.Length);
-                    if (read.Length == 0)
-                    {
-                        // break in loop in "read-ahead" thread (once a blocking wait is interrupted)
-                        _isCompleted = true;
-                        // interrupt blocking wait in "read-ahead" thread
-                        lock (_readLock)
-                            Monitor.PulseAll(_readLock);
-                        // signal failure
-                        throw new SshException("Unexpectedly reached end of file.");
-                    }
-
-                    bytesCaughtUp += read.Length;
-                    _offset += (ulong) bytesCaughtUp;
-                }
-
-                return catchUp;
-            }
-        }
-
-        private void ReadCompleted(IAsyncResult result)
-        {
-            var readAsyncResult = result as SftpReadAsyncResult;
-            if (readAsyncResult == null)
-                return;
-
-            var data = readAsyncResult.EndInvoke();
-            if (data.Length == 0)
-            {
-                _isCompleted = true;
-            }
-            else
-            {
-                var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
-                bufferedRead.Complete(data);
-                _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
-            }
-
-            // signal that a chunk has been read or EOF has been reached;
-            // in both cases, we want to unblock the "read-ahead" thread
-            lock (_readLock)
-            {
-                Monitor.Pulse(_readLock);
-            }
-        }
-    }
-
-    //private class BufferedReadState
-    //{
-    //    private BlockingQueue<BufferedRead> _queue;
-    //    private long _offset;
-
-    //    public BufferedReadState(long offset, SemaphoreLight semaphore, BlockingQueue<BufferedRead> queue)
-    //    {
-    //        _queue = queue;
-    //        _offset = offset;
-    //        _semaphore = semaphore;
-    //    }
-
-    //    public long Offset
-    //    {
-    //        get { return _offset; }
-    //    }
-
-    //    public BlockingQueue<BufferedRead> Queue
-    //    {
-    //        get { return _queue; }
-    //    }
-
-    //    public SemaphoreLight Semaphore
-    //    {
-    //        get { return _semaphore; }
-    //    }
-    //}
-
-    //private class BlockingQueue<T>
-    //{
-    //    private readonly object _lock = new object();
-    //    private Queue<T> _queue;
-    //    private bool _isClosed;
-
-    //    public BlockingQueue(int capacity)
-    //    {
-    //        _queue = new Queue<T>(capacity);
-    //    }
-
-    //    public T Dequeue()
-    //    {
-    //        lock (_lock)
-    //        {
-    //            while (!_isClosed && _queue.Count == 0)
-    //                Monitor.Wait(_lock);
-
-    //            if (_queue.Count == 0)
-    //                return default(T);
-
-    //            return _queue.Dequeue();
-    //        }
-    //    }
-
-    //    public void Enqueue(T item)
-    //    {
-    //        lock (_lock)
-    //        {
-    //            _queue.Enqueue(item);
-    //            Monitor.PulseAll(_lock);
-    //        }
-    //    }
-
-    //    public void Close()
-    //    {
-    //        _isClosed = true;
-    //        Monitor.PulseAll(_lock);
-    //    }
-    //}
-
-    internal class BufferedRead
-    {
-        public int ChunkIndex { get; private set; }
-
-        public byte[] Data { get; private set; }
-
-        public ulong Offset { get; private set; }
-
-        public BufferedRead(int chunkIndex, ulong offset)
-        {
-            ChunkIndex = chunkIndex;
-            Offset = offset;
-        }
-
-        public void Complete(byte[] data)
-        {
-            Data = data;
-        }
-    }
-}
diff --git a/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs
deleted file mode 100644
index 65911d222..000000000
--- a/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Renci.SshNet.Common;
-using System;
-
-namespace Renci.SshNet.Sftp
-{
-    internal class SftpReadAsyncResult : AsyncResult<byte[]>
-    {
-        public SftpReadAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
-        {
-        }
-    }
-}
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index f00842a4a..8a3c6773a 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -169,8 +169,6 @@ protected override void OnDataReceived(byte[] data)
             var offset = 0;
             var count = data.Length;
 
-            //Console.WriteLine("Data received: " + count);
-
             // improve performance and reduce GC pressure by not buffering channel data if the received
             // chunk contains the complete packet data.
             //
@@ -186,8 +184,6 @@ protected override void OnDataReceived(byte[] data)
 
                     var packetTotalLength = packetDataLength + packetLengthByteCount;
 
-                    //Console.WriteLine("Current: " + data.Length + " | Total: " + packetTotalLength);
-
                     // check if complete packet data (or more) is available
                     if (count >= packetTotalLength)
                     {
@@ -245,8 +241,6 @@ protected override void OnDataReceived(byte[] data)
 
                 var packetTotalLength = packetDataLength + packetLengthByteCount;
 
-                //Console.WriteLine("Current: " + data.Length + " | Total: " + packetTotalLength);
-
                 // check if complete packet data is available
                 if (_data.Count < packetTotalLength)
                 {
@@ -403,46 +397,6 @@ public void RequestClose(byte[] handle)
             }
         }
 
-        public SftpReadAsyncResult BeginRead(byte[] handle, ulong offset, uint length, AsyncCallback callback, object state)
-        {
-            var asyncResult = new SftpReadAsyncResult(callback, state);
-
-            var request = new SftpReadRequest(ProtocolVersion, NextRequestId, handle, offset, length,
-                response =>
-                {
-                    asyncResult.SetAsCompleted(response.Data, false);
-                },
-                response =>
-                {
-                    if (response.StatusCode != StatusCodes.Eof)
-                    {
-                        asyncResult.SetAsCompleted(GetSftpException(response), false);
-                    }
-                    else
-                    {
-                        asyncResult.SetAsCompleted(Array<byte>.Empty, false);
-                    }
-                });
-            SendRequest(request);
-
-            return asyncResult;
-        }
-
-        public byte[] EndRead(IAsyncResult asyncResult)
-        {
-            if (asyncResult == null)
-                throw new ArgumentNullException("asyncResult");
-
-            var sftpReadAsyncResult = asyncResult as SftpReadAsyncResult;
-            if (sftpReadAsyncResult == null)
-                throw new ArgumentException("IDIOT", "asyncResult");
-
-            if (sftpReadAsyncResult.EndInvokeCalled)
-                throw new InvalidOperationException("EndRead has already been called.");
-
-            return sftpReadAsyncResult.EndInvoke();
-        }
-
         /// <summary>
         /// Performs SSH_FXP_READ request.
         /// </summary>
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index dc04a5c8a..c98e3fffd 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1996,120 +1996,40 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
             var handle = _sftpSession.RequestOpen(fullPath, Flags.Read);
-            var async = true;
-            if (async)
-            {
-                var fileReader = new SftpFileReader(handle, _sftpSession);
-                var totalBytesRead = 0UL;
-
-                while (true)
-                {
-                    var data = fileReader.Read();
-                    if (data.Length == 0)
-                        break;
 
-                    output.Write(data, 0, data.Length);
+            ulong offset = 0;
 
-                    totalBytesRead += (ulong) data.Length;
+            var optimalReadLength = _sftpSession.CalculateOptimalReadLength(_bufferSize);
 
-                    //Console.WriteLine(totalBytesRead);
+            var data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
 
-                    if (downloadCallback != null)
-                        downloadCallback(totalBytesRead);
-                }
-            }
-            else
+            //  Read data while available
+            while (data.Length > 0)
             {
-                ulong offset = 0;
-
-                var optimalReadLength = _sftpSession.CalculateOptimalReadLength(_bufferSize);
-
-                var data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
-
-                //  Read data while available
-                while (data.Length > 0)
-                {
-                    //  Cancel download
-                    if (asyncResult != null && asyncResult.IsDownloadCanceled)
-                        break;
-
-                    output.Write(data, 0, data.Length);
-
-                    output.Flush();
-
-                    offset += (ulong)data.Length;
-
-                    //Console.WriteLine("" + data.Length + " => " + offset);
+                //  Cancel download
+                if (asyncResult != null && asyncResult.IsDownloadCanceled)
+                    break;
 
-                    //  Call callback to report number of bytes read
-                    if (downloadCallback != null)
-                    {
-                        // copy offset to ensure it's not modified between now and execution of callback
-                        var downloadOffset = offset;
+                output.Write(data, 0, data.Length);
 
-                        //  Execute callback on different thread
-                        ThreadAbstraction.ExecuteThread(() => { downloadCallback(downloadOffset); });
-                    }
+                output.Flush();
 
-                    data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
-                }
-            }
-
-            _sftpSession.RequestClose(handle);
-        }
+                offset += (ulong)data.Length;
 
-        private class BlockingQueue<T>
-        {
-            private readonly object _lock = new object();
-            private Queue<T> _queue;
-            private bool _isClosed;
-
-            public BlockingQueue(int capacity)
-            {
-                _queue = new Queue<T>(capacity);
-            }
-
-            public T Dequeue()
-            {
-                lock (_lock)
+                //  Call callback to report number of bytes read
+                if (downloadCallback != null)
                 {
-                    while (!_isClosed && _queue.Count == 0)
-                        Monitor.Wait(_lock);
+                    // copy offset to ensure it's not modified between now and execution of callback
+                    var downloadOffset = offset;
 
-                    if (_queue.Count == 0)
-                        return default(T);
-
-                    return _queue.Dequeue();
-                }
-            }
-
-            public void Enqueue(T item)
-            {
-                lock (_lock)
-                {
-                    _queue.Enqueue(item);
-                    Monitor.PulseAll(_lock);
+                    //  Execute callback on different thread
+                    ThreadAbstraction.ExecuteThread(() => { downloadCallback(downloadOffset); });
                 }
-            }
 
-            public void Close()
-            {
-                _isClosed = true;
-                Monitor.PulseAll(_lock);
+                data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
             }
-        }
 
-        private class BufferedRead
-        {
-            public byte[] Data { get; private set; }
-
-            public ulong Offset { get; private set; }
-
-            public BufferedRead(ulong offset, byte[] data)
-            {
-                Offset = offset;
-                Data = data;
-            }
+            _sftpSession.RequestClose(handle);
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/SubsystemSession.cs b/src/Renci.SshNet/SubsystemSession.cs
index 6bbd783b2..5cb0e8a05 100644
--- a/src/Renci.SshNet/SubsystemSession.cs
+++ b/src/Renci.SshNet/SubsystemSession.cs
@@ -42,7 +42,7 @@ internal abstract class SubsystemSession : ISubsystemSession
         /// <value>
         /// The channel associated with this session.
         /// </value>
-        public IChannelSession Channel
+        internal IChannelSession Channel
         {
             get
             {

From 44f3f03873ffdfe80060f756d42748c86a4ca271 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 15:01:42 +0100
Subject: [PATCH 013/128] One more try...

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 19988da77..ab8e88d55 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,4 +10,5 @@ build:
 test_script:
 - cmd: >-
     vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
+
     vstest.console /logger:Appveyor src\Renci.SshNet.Tests.NET35\bin\Debug\Renci.SshNet.Tests.NET35.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
\ No newline at end of file

From 710aa37bd583ced661b02d008514c07c505e6f3d Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 15:46:57 +0100
Subject: [PATCH 014/128] Do not use Socket.Select on .NET Framework 3.5 as
 will not block when -1 is specified as timeout. More information is available
 here: https://support.microsoft.com/kb/2615314

Fixes issue #113.
---
 .../Renci.SshNet.NETCore.csproj               | 12 ++------
 src/Renci.SshNet/Renci.SshNet.csproj          |  4 +--
 src/Renci.SshNet/Session.cs                   | 28 +++++++++++++++----
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
index 872901d03..229146f79 100644
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-
   <PropertyGroup>
     <AssemblyTitle>SSH.NET</AssemblyTitle>
     <TargetFramework>netstandard1.3</TargetFramework>
@@ -19,20 +18,17 @@
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="**\*.cs" />
     <Compile Include="..\Renci.SshNet\**\*.cs" Exclude="..\Renci.SshNet\Properties\AssemblyInfo.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NETStandard.Library">
       <Version>1.6.0</Version>
     </PackageReference>
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="Microsoft.CSharp">
       <Version>4.0.1</Version>
@@ -101,17 +97,13 @@
       <Version>4.0.1</Version>
     </PackageReference>
   </ItemGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>none</DebugType>
   </PropertyGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index fd278e17b..8126fe772 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
@@ -29,7 +29,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
+    <DefineConstants>FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index e26743098..7721c11f2 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1815,14 +1815,16 @@ private void SocketDisconnectAndDispose()
         /// </summary>
         private void MessageListener()
         {
+#if FEATURE_SOCKET_SELECT
+            var readSockets = new List<Socket> { _socket };
+#endif // FEATURE_SOCKET_SELECT
+
             try
             {
-                var readSockets = new List<Socket> {_socket};
-
                 // remain in message loop until socket is shut down or until we're disconnecting
                 while (_socket.IsConnected())
                 {
-#if FEATURE_SOCKET_POLL
+#if FEATURE_SOCKET_SELECT
                     // if the socket is already disposed when Select is invoked, then a SocketException
                     // stating "An operation was attempted on something that is not a socket" is thrown;
                     // we attempt to avoid this exception by having an IsConnected() that can break the
@@ -1835,7 +1837,8 @@ private void MessageListener()
 
                     // perform a blocking select to determine whether there's is data available to be
                     // read; we do not use a blocking read to allow us to use Socket.Poll to determine
-                    // if the connection is still available (in IsSocketConnected
+                    // if the connection is still available (in IsSocketConnected)
+
                     Socket.Select(readSockets, null, null, -1);
 
                     // the Select invocation will be interrupted in one of the following conditions:
@@ -1855,7 +1858,19 @@ private void MessageListener()
                         // break out of the message loop
                         break;
                     }
-#endif // FEATURE_SOCKET_POLL
+#elif FEATURE_SOCKET_POLL
+                    // when Socket.Select(IList, IList, IList, Int32) is not available or is buggy, we use
+                    // Socket.Poll(Int, SelectMode) to block until either data is available or the socket
+                    // is closed
+                    _socket.Poll(-1, SelectMode.SelectRead);
+
+                    if (!_socket.IsConnected())
+                    {
+                        // connection with SSH server was closed or socket was disposed;
+                        // break out of the message loop
+                        break;
+                    }
+#endif // FEATURE_SOCKET_SELECT
 
                     var message = ReceiveMessage();
                     if (message == null)
@@ -1869,7 +1884,7 @@ private void MessageListener()
                     message.Process(this);
                 }
 
-                // connection with SSH server was closed
+                // connection with SSH server was closed or socket was disposed
                 RaiseError(CreateConnectionAbortedByServerException());
             }
             catch (SocketException ex)
@@ -2201,6 +2216,7 @@ private void RaiseError(Exception exp)
                     return;
             }
 
+            // "save" exception and set exception wait handle to ensure any waits are interrupted
             _exception = exp;
             _exceptionWaitHandle.Set();
 

From 31e204b6341991c4061664527083b21febbae62c Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 16:01:52 +0100
Subject: [PATCH 015/128] Modify assert order to first get details of
 exception.

---
 ...ardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs b/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
index 3dddb2065..2ec4c9c90 100644
--- a/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
@@ -171,8 +171,8 @@ public void ChannelShouldShutdownSocketToRemoteListener()
         [TestMethod]
         public void BindShouldHaveFinishedWithoutException()
         {
-            Assert.IsTrue(_channelBindFinishedWaitHandle.WaitOne(0));
             Assert.IsNull(_channelException, _channelException != null ? _channelException.ToString() : null);
+            Assert.IsTrue(_channelBindFinishedWaitHandle.WaitOne(0));
         }
 
         [TestMethod]

From e643378cfc6ff57df997ff0a93a1776b49ebb53e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 19:49:40 +0100
Subject: [PATCH 016/128] Added EndInvoke(TimeSpan timeout).

---
 src/Renci.SshNet/Common/AsyncResult.cs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Renci.SshNet/Common/AsyncResult.cs b/src/Renci.SshNet/Common/AsyncResult.cs
index 70726ed4b..066f4015c 100644
--- a/src/Renci.SshNet/Common/AsyncResult.cs
+++ b/src/Renci.SshNet/Common/AsyncResult.cs
@@ -29,10 +29,12 @@ public abstract class AsyncResult : IAsyncResult
         private Exception _exception;
 
         /// <summary>
-        /// Gets or sets a value indicating whether EndInvoke has been called on the current AsyncResult.
+        /// Gets or sets a value indicating whether <see cref="EndInvoke()"/> has been called on the current
+        /// <see cref="AsyncResult"/>.
         /// </summary>
         /// <value>
-        /// <c>true</c> if <see cref="EndInvoke()"/> has been called on the current <see cref="AsyncResult"/>; otherwise, <c>false</c>.
+        /// <c>true</c> if <see cref="EndInvoke()"/> has been called on the current <see cref="AsyncResult"/>;
+        /// otherwise, <c>false</c>.
         /// </value>
         public bool EndInvokeCalled { get; private set; }
 
@@ -75,15 +77,24 @@ public void SetAsCompleted(Exception exception, bool completedSynchronously)
         /// <summary>
         /// Waits until the asynchronous operation completes, and then returns. 
         /// </summary>
-        public void EndInvoke()
+        internal void EndInvoke()
+        {
+            EndInvoke(Session.InfiniteTimeSpan);
+        }
+
+        /// <summary>
+        /// Waits until the asynchronous operation completes, and then returns. 
+        /// </summary>
+        internal void EndInvoke(TimeSpan timeout)
         {
             // This method assumes that only 1 thread calls EndInvoke for this object
             if (!IsCompleted)
             {
                 // If the operation isn't done, wait for it
-                AsyncWaitHandle.WaitOne();
-                AsyncWaitHandle.Dispose();
+                var completed = AsyncWaitHandle.WaitOne(timeout);
                 _asyncWaitHandle = null;  // Allow early GC
+                AsyncWaitHandle.Dispose();
+
             }
 
             EndInvokeCalled = true;

From 54215ffd747d6325062e8a904fbfe6aec93fd977 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 19:49:54 +0100
Subject: [PATCH 017/128] Remove empty line.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 4ff28acb6..19fa79649 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -64,7 +64,6 @@ public int Release(int releaseCount)
         /// </summary>
         public void Wait()
         {
-
             lock (_lock)
             {
                 while (_currentCount < 1)

From fe27ec31e11bf640416c39c4e00c7520437de9d0 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 22 Jan 2017 19:53:56 +0100
Subject: [PATCH 018/128] Added BeginRead/EndRead to ISftpSession and
 SftpSession. Draft of read-ahead implementation for DownloadFile and
 BeginDownloadFile overloads of SftpClient.

---
 .../Renci.SshNet.NET35.csproj                 |   8 +-
 src/Renci.SshNet/Renci.SshNet.csproj          |   2 +
 src/Renci.SshNet/Sftp/ISftpSession.cs         |  27 +++
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 163 ++++++++++++++++++
 src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs  |  12 ++
 src/Renci.SshNet/Sftp/SftpSession.cs          |  64 ++++++-
 src/Renci.SshNet/SftpClient.cs                |  34 ++--
 7 files changed, 288 insertions(+), 22 deletions(-)
 create mode 100644 src/Renci.SshNet/Sftp/SftpFileReader.cs
 create mode 100644 src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 3d399f394..d4b838ec7 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -861,6 +861,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -876,6 +879,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -921,7 +927,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 8126fe772..2d42abd07 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -416,6 +416,7 @@
     <Compile Include="Sftp\SftpDownloadAsyncResult.cs" />
     <Compile Include="Sftp\SftpFile.cs" />
     <Compile Include="Sftp\SftpFileAttributes.cs" />
+    <Compile Include="Sftp\SftpFileReader.cs" />
     <Compile Include="Sftp\SftpFileStream.cs" />
     <Compile Include="Sftp\SftpFileSystemInformation.cs">
       <SubType>Code</SubType>
@@ -425,6 +426,7 @@
     <Compile Include="Sftp\SftpMessageTypes.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Sftp\SftpReadAsyncResult.cs" />
     <Compile Include="Sftp\SftpSession.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 56190a9da..17c8c9c19 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -95,6 +95,33 @@ internal interface ISftpSession : ISubsystemSession
         /// <returns>data array; null if EOF</returns>
         byte[] RequestRead(byte[] handle, ulong offset, uint length);
 
+        /// <summary>
+        /// Begins an asynchronous read using a SSH_FXP_READ request.
+        /// </summary>
+        /// <param name="handle">The handle to the file to read from.</param>
+        /// <param name="offset">The offset in the file to start reading from.</param>
+        /// <param name="length">The number of bytes to read.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginRead(byte[], ulong, uint, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpReadAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SftpReadAsyncResult BeginRead(byte[] handle, ulong offset, uint length, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpReadAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// A <see cref="byte"/> array representing the data read.
+        /// </returns>
+        /// <remarks>
+        /// If all available data has been read, the <see cref="EndRead(SftpReadAsyncResult)"/> method completes
+        /// immediately and returns zero bytes.
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        byte[] EndRead(SftpReadAsyncResult asyncResult);
+
         /// <summary>
         /// Performs SSH_FXP_READDIR request
         /// </summary>
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
new file mode 100644
index 000000000..71db3685f
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -0,0 +1,163 @@
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpFileReader
+    {
+        private const int MaxReadAhead = 15;
+
+        private readonly byte[] _handle;
+        private readonly ISftpSession _sftpSession;
+        private SemaphoreLight _semaphore;
+        private bool _isCompleted;
+        private uint _chunkLength;
+        private int _readAheadChunkIndex;
+        private int _nextChunkIndex;
+        private ulong _readAheadOffset;
+        private ulong _offset;
+        private ulong _fileSize;
+        private readonly IDictionary<int, BufferedRead> _queue;
+        private readonly object _readLock;
+
+        public SftpFileReader(byte[] handle, ISftpSession sftpSession)
+        {
+            _handle = handle;
+            _sftpSession = sftpSession;
+            _chunkLength = 32 * 1024; // TODO !
+            _semaphore = new SemaphoreLight(MaxReadAhead);
+            _queue = new Dictionary<int, BufferedRead>(MaxReadAhead);
+            _readLock = new object();
+
+            _fileSize = (ulong)_sftpSession.RequestFStat(_handle).Size;
+
+            ThreadAbstraction.ExecuteThread(() =>
+            {
+                while (!_isCompleted)
+                {
+                    // we reach one chunk beyond the file size to get an EOF
+                    if (_readAheadOffset > _fileSize)
+                        break;
+
+                    // TODO implement cancellation!?
+                    _semaphore.Wait();
+
+                    // start reading next chunk
+                    _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
+                                           new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
+
+                    // advance read-ahead offset
+                    _readAheadOffset += _chunkLength;
+
+                    _readAheadChunkIndex++;
+                }
+            });
+        }
+
+        public byte[] Read()
+        {
+            lock (_readLock)
+            {
+                BufferedRead nextChunk;
+
+                while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && !_isCompleted)
+                    Monitor.Wait(_readLock);
+
+                if (_isCompleted)
+                    return new byte[0];
+
+                if (nextChunk.Offset == _offset)
+                {
+                    var data = nextChunk.Data;
+                    _offset += (ulong) data.Length;
+
+                    // remove processed chunk
+                    _queue.Remove(_nextChunkIndex);
+                    // move to next chunk
+                    _nextChunkIndex++;
+                    // allow read-ahead of a new chunk
+                    _semaphore.Release();
+                    return data;
+                }
+
+                // when the server returned less bytes than requested (for the previous chunk)
+                // we'll synchronously request the remaining data
+
+                var catchUp = new byte[nextChunk.Offset - _offset];
+                var bytesCaughtUp = 0L;
+
+                while (bytesCaughtUp < catchUp.Length)
+                {
+                    // TODO: break loop and interrupt blocking wait in case of exception
+                    var read = _sftpSession.RequestRead(_handle, _offset, (uint) catchUp.Length);
+                    if (read.Length == 0)
+                    {
+                        // break in loop in "read-ahead" thread (once a blocking wait is interrupted)
+                        _isCompleted = true;
+                        // interrupt blocking wait in "read-ahead" thread
+                        lock (_readLock)
+                            Monitor.PulseAll(_readLock);
+                        // signal failure
+                        throw new SshException("Unexpectedly reached end of file.");
+                    }
+
+                    bytesCaughtUp += read.Length;
+                    _offset += (ulong) bytesCaughtUp;
+                }
+
+                return catchUp;
+            }
+        }
+
+        private void ReadCompleted(IAsyncResult result)
+        {
+            var readAsyncResult = result as SftpReadAsyncResult;
+            if (readAsyncResult == null)
+                return;
+
+            var data = readAsyncResult.EndInvoke();
+            if (data.Length == 0)
+            {
+                Console.WriteLine("EOF");
+
+                _isCompleted = true;
+            }
+            else
+            {
+                var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
+                bufferedRead.Complete(data);
+                _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
+            }
+
+            // signal that a chunk has been read or EOF has been reached;
+            // in both cases, we want to unblock the "read-ahead" thread
+            lock (_readLock)
+            {
+                Monitor.Pulse(_readLock);
+            }
+        }
+
+        private class BufferedRead
+        {
+            public int ChunkIndex { get; private set; }
+
+            public byte[] Data { get; private set; }
+
+            public ulong Offset { get; private set; }
+
+            public BufferedRead(int chunkIndex, ulong offset)
+            {
+                ChunkIndex = chunkIndex;
+                Offset = offset;
+            }
+
+            public void Complete(byte[] data)
+            {
+                Data = data;
+            }
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs
new file mode 100644
index 000000000..65911d222
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpReadAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpReadAsyncResult : AsyncResult<byte[]>
+    {
+        public SftpReadAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index 8a3c6773a..e91e58b89 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -397,6 +397,65 @@ public void RequestClose(byte[] handle)
             }
         }
 
+        /// <summary>
+        /// Begins an asynchronous read using a SSH_FXP_READ request.
+        /// </summary>
+        /// <param name="handle">The handle to the file to read from.</param>
+        /// <param name="offset">The offset in the file to start reading from.</param>
+        /// <param name="length">The number of bytes to read.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginRead(byte[], ulong, uint, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpReadAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SftpReadAsyncResult BeginRead(byte[] handle, ulong offset, uint length, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SftpReadAsyncResult(callback, state);
+
+            var request = new SftpReadRequest(ProtocolVersion, NextRequestId, handle, offset, length,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(response.Data, false);
+                },
+                response =>
+                {
+                    if (response.StatusCode != StatusCodes.Eof)
+                    {
+                        asyncResult.SetAsCompleted(GetSftpException(response), false);
+                    }
+                    else
+                    {
+                        asyncResult.SetAsCompleted(Array<byte>.Empty, false);
+                    }
+                });
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpReadAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// A <see cref="byte"/> array representing the data read.
+        /// </returns>
+        /// <remarks>
+        /// If all available data has been read, the <see cref="EndRead(SftpReadAsyncResult)"/> method completes
+        /// immediately and returns zero bytes.
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public byte[] EndRead(SftpReadAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndRead has already been called.");
+
+            return asyncResult.EndInvoke();
+        }
+
         /// <summary>
         /// Performs SSH_FXP_READ request.
         /// </summary>
@@ -424,7 +483,10 @@ public byte[] RequestRead(byte[] handle, ulong offset, uint length)
                             {
                                 exception = GetSftpException(response);
                             }
-                            data = Array<byte>.Empty;
+                            else
+                            {
+                                data = Array<byte>.Empty;
+                            }
                             wait.Set();
                         });
 
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index c98e3fffd..b8ad0f62f 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1996,37 +1996,31 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
             var handle = _sftpSession.RequestOpen(fullPath, Flags.Read);
+            
+            // TODO close handle in case of exception
+            // TODO decide whether to move opening (and closing) of handle to SftpFileReader
 
-            ulong offset = 0;
-
-            var optimalReadLength = _sftpSession.CalculateOptimalReadLength(_bufferSize);
-
-            var data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
+            var fileReader = new SftpFileReader(handle, _sftpSession);
+            var totalBytesRead = 0UL;
 
-            //  Read data while available
-            while (data.Length > 0)
+            while (true)
             {
+                // TODO: cancel read ahead when download is canceled by user
+
                 //  Cancel download
                 if (asyncResult != null && asyncResult.IsDownloadCanceled)
                     break;
 
-                output.Write(data, 0, data.Length);
+                var data = fileReader.Read();
+                if (data.Length == 0)
+                    break;
 
-                output.Flush();
+                output.Write(data, 0, data.Length);
 
-                offset += (ulong)data.Length;
+                totalBytesRead += (ulong) data.Length;
 
-                //  Call callback to report number of bytes read
                 if (downloadCallback != null)
-                {
-                    // copy offset to ensure it's not modified between now and execution of callback
-                    var downloadOffset = offset;
-
-                    //  Execute callback on different thread
-                    ThreadAbstraction.ExecuteThread(() => { downloadCallback(downloadOffset); });
-                }
-
-                data = _sftpSession.RequestRead(handle, offset, optimalReadLength);
+                    downloadCallback(totalBytesRead);
             }
 
             _sftpSession.RequestClose(handle);

From 9f637304703fea5de31b9a100d225282996b4f6b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Sun, 22 Jan 2017 20:45:45 +0100
Subject: [PATCH 019/128] Sync project files, and remove stray CWL.

---
 .../Renci.SshNet.Silverlight.csproj                       | 8 +++++++-
 .../Renci.SshNet.Silverlight5.csproj                      | 8 +++++++-
 src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj          | 6 ++++++
 .../Renci.SshNet.WindowsPhone.csproj                      | 6 ++++++
 .../Renci.SshNet.WindowsPhone8.csproj                     | 8 +++++++-
 src/Renci.SshNet/Sftp/SftpFileReader.cs                   | 2 --
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index 17a97fb2f..8ff8d9e47 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -851,6 +851,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -866,6 +869,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -916,7 +922,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 68df28661..794924a6f 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -860,6 +860,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -875,6 +878,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -922,7 +928,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index e57a90099..5f9cc211c 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -930,6 +930,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -945,6 +948,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 4ea13cac6..9f07f8bb7 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -839,6 +839,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -854,6 +857,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 59635c586..927ea1766 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -886,6 +886,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileAttributes.cs">
       <Link>Sftp\SftpFileAttributes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpFileReader.cs">
+      <Link>Sftp\SftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpFileStream.cs">
       <Link>Sftp\SftpFileStream.cs</Link>
     </Compile>
@@ -901,6 +904,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
+      <Link>Sftp\SftpReadAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -949,7 +955,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 71db3685f..20d3a6f12 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -121,8 +121,6 @@ private void ReadCompleted(IAsyncResult result)
             var data = readAsyncResult.EndInvoke();
             if (data.Length == 0)
             {
-                Console.WriteLine("EOF");
-
                 _isCompleted = true;
             }
             else

From f29b4826a3d84f1ffb69381ae8427164a62dc92e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 24 Jan 2017 18:20:58 +0100
Subject: [PATCH 020/128] Use PulseAll instead of Pulse as we want to signal
 all threads.

---
 src/Renci.SshNet/Sftp/SftpFileReader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 20d3a6f12..9f79625c2 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -38,7 +38,7 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession)
             {
                 while (!_isCompleted)
                 {
-                    // we reach one chunk beyond the file size to get an EOF
+                    // we read one chunk beyond the file size to get an EOF
                     if (_readAheadOffset > _fileSize)
                         break;
 
@@ -134,7 +134,7 @@ private void ReadCompleted(IAsyncResult result)
             // in both cases, we want to unblock the "read-ahead" thread
             lock (_readLock)
             {
-                Monitor.Pulse(_readLock);
+                Monitor.PulseAll(_readLock);
             }
         }
 

From 5b3e64e368d251291199cbf8da84355b8b63b270 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 24 Jan 2017 21:25:12 +0100
Subject: [PATCH 021/128] Harden read-ahead by relying Throw SshException when
 read has completed. Identify more tasks that need to be completed before the
 implementation can be considered done.

---
 src/Renci.SshNet/Sftp/SftpFileReader.cs | 81 +++++++++++++++++--------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 9f79625c2..27509ba8a 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -20,6 +20,7 @@ internal class SftpFileReader
         private ulong _readAheadOffset;
         private ulong _offset;
         private ulong _fileSize;
+        private Exception _exception;
         private readonly IDictionary<int, BufferedRead> _queue;
         private readonly object _readLock;
 
@@ -36,15 +37,23 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession)
 
             ThreadAbstraction.ExecuteThread(() =>
             {
-                while (!_isCompleted)
-                {
-                    // we read one chunk beyond the file size to get an EOF
-                    if (_readAheadOffset > _fileSize)
-                        break;
+                // read one chunk beyond the chunk in which we read "file size" bytes
+                // to get an EOF
 
+                while (_readAheadOffset <= (_fileSize + _chunkLength) && _exception == null)
+                {
                     // TODO implement cancellation!?
+                    // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
+                    // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
                     _semaphore.Wait();
 
+                    // don't bother reading any more chunks if we reached EOF, or an exception has occurred
+                    // while processing a chunk
+                    if (_isCompleted || _exception != null)
+                        break;
+
+                    // TODO: catch exception, signal error to Read() and break loop
+
                     // start reading next chunk
                     _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
                                            new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
@@ -54,20 +63,28 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession)
 
                     _readAheadChunkIndex++;
                 }
+
+                Console.WriteLine("Finished read-ahead");
             });
         }
 
         public byte[] Read()
         {
+            if (_isCompleted)
+                throw new SshException("Attempting to read beyond the end of the file.");
+
             lock (_readLock)
             {
                 BufferedRead nextChunk;
 
-                while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && !_isCompleted)
+                // TODO: break when we've reached file size and still haven't received an EOF ?
+
+                // wait until either the next chunk is avalable or an exception has occurred
+                while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && _exception == null)
                     Monitor.Wait(_readLock);
 
-                if (_isCompleted)
-                    return new byte[0];
+                if (_exception != null)
+                    throw _exception;
 
                 if (nextChunk.Offset == _offset)
                 {
@@ -78,11 +95,28 @@ public byte[] Read()
                     _queue.Remove(_nextChunkIndex);
                     // move to next chunk
                     _nextChunkIndex++;
-                    // allow read-ahead of a new chunk
+                    // have we reached EOF?
+                    if (data.Length == 0)
+                    {
+                        _isCompleted = true;
+                    }
+                    // unblock wait in read-ahead
                     _semaphore.Release();
                     return data;
                 }
 
+                // when we received an EOF for the next chunk, then we only complete the current
+                // chunk if we haven't already read up to the file size
+                if (nextChunk.Data.Length == 0 && _offset == _fileSize)
+                {
+                    _isCompleted = true;
+
+                    // unblock wait in read-ahead
+                    _semaphore.Release();
+                    // signal EOF to caller
+                    return nextChunk.Data;
+                }
+
                 // when the server returned less bytes than requested (for the previous chunk)
                 // we'll synchronously request the remaining data
 
@@ -95,13 +129,12 @@ public byte[] Read()
                     var read = _sftpSession.RequestRead(_handle, _offset, (uint) catchUp.Length);
                     if (read.Length == 0)
                     {
-                        // break in loop in "read-ahead" thread (once a blocking wait is interrupted)
-                        _isCompleted = true;
-                        // interrupt blocking wait in "read-ahead" thread
-                        lock (_readLock)
-                            Monitor.PulseAll(_readLock);
-                        // signal failure
-                        throw new SshException("Unexpectedly reached end of file.");
+                        // move reader to error state
+                        _exception = new SshException("Unexpectedly reached end of file.");
+                        // unblock wait in read-ahead
+                        _semaphore.Release();
+                        // notify caller of error
+                        throw _exception;
                     }
 
                     bytesCaughtUp += read.Length;
@@ -119,16 +152,12 @@ private void ReadCompleted(IAsyncResult result)
                 return;
 
             var data = readAsyncResult.EndInvoke();
-            if (data.Length == 0)
-            {
-                _isCompleted = true;
-            }
-            else
-            {
-                var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
-                bufferedRead.Complete(data);
-                _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
-            }
+
+            // a read that completes with a zero-byte result signals EOF
+            // but there may be pending reads before that read
+            var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
+            bufferedRead.Complete(data);
+            _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
 
             // signal that a chunk has been read or EOF has been reached;
             // in both cases, we want to unblock the "read-ahead" thread

From 4e801fb35470d99bd0704ab6b798f6533aae1bee Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 29 Jan 2017 19:37:22 +0100
Subject: [PATCH 022/128] Specify C# language version.

---
 src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj | 3 ++-
 src/Renci.SshNet/Renci.SshNet.csproj             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index d4b838ec7..a35dfadb9 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -23,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -927,7 +928,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 2d42abd07..6969b54b6 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -23,7 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>4</LangVersion>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

From e937c9d841fb0da5467f8c5fde3253e095310717 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 29 Jan 2017 19:38:19 +0100
Subject: [PATCH 023/128] Improve exception handler for SftpFileReader. Add
 more tests (WIP).

---
 .../Classes/Sftp/SftpFileReaderTestBase.cs    |  49 ++++
 ...ReaderTest_LastChunkBeforeEofIsComplete.cs | 129 +++++++++
 ...eReaderTest_LastChunkBeforeEofIsPartial.cs | 129 +++++++++
 ...iousChunkIsIncompleteAndEofIsNotReached.cs | 251 ++++++++++++++++++
 ...reviousChunkIsIncompleteAndEofIsReached.cs | 158 +++++++++++
 ...eReaderTest_ReadAheadBeginReadException.cs |  11 +
 ...vokeException_DiscardsFurtherReadAheads.cs | 142 ++++++++++
 ...vokeException_PreventsFurtherReadAheads.cs | 155 +++++++++++
 ...leReaderTest_ReadBackBeginReadException.cs |  11 +
 ...leReaderTest_ReadBackEndInvokeException.cs |  11 +
 ...ileReaderTest_Read_ExceptionInReadAhead.cs | 135 ++++++++++
 .../Renci.SshNet.Tests.csproj                 |  11 +
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 204 +++++++++-----
 src/Renci.SshNet/SftpClient.cs                |   2 +-
 14 files changed, 1332 insertions(+), 66 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackBeginReadException.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackEndInvokeException.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
new file mode 100644
index 000000000..e3e0c62d4
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
@@ -0,0 +1,49 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using System;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    public abstract class SftpFileReaderTestBase
+    {
+        internal Mock<ISftpSession> SftpSessionMock {  get; private set;}
+
+        protected abstract void SetupData();
+
+        protected void CreateMocks()
+        {
+            SftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        }
+
+        protected abstract void SetupMocks();
+
+        protected virtual void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
+        }
+
+        [TestInitialize]
+        public void SetUp()
+        {
+            Arrange();
+            Act();
+        }
+
+        protected abstract void Act();
+
+        protected static SftpFileAttributes CreateSftpFileAttributes(long size)
+        {
+            return new SftpFileAttributes(default(DateTime), default(DateTime), size, default(int), default(int), default(uint), null);
+        }
+
+        protected static byte[] CreateByteArray(Random random, int length)
+        {
+            var chunk = new byte[length];
+            random.NextBytes(chunk);
+            return chunk;
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
new file mode 100644
index 000000000..85e4564ae
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
@@ -0,0 +1,129 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_LastChunkBeforeEofIsComplete : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private byte[] _chunk3;
+        private SftpFileReader _reader;
+        private byte[] _actualChunk1;
+        private byte[] _actualChunk2;
+        private byte[] _actualChunk3;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            // chunk is less than the requested length, but - together with chunk 1 - contains all data up to the EOF
+            _chunk2 = CreateByteArray(random, ChunkLength - 10);
+            _chunk3 = new byte[0];
+            _fileSize = _chunk1.Length + _chunk2.Length;
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk1, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk2, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 15);
+        }
+
+        protected override void Act()
+        {
+            _actualChunk1 = _reader.Read();
+            _actualChunk2 = _reader.Read();
+            _actualChunk3 = _reader.Read();
+        }
+
+        [TestMethod]
+        public void FirstReadShouldReturnChunk1()
+        {
+            Assert.IsNotNull(_actualChunk1);
+            Assert.AreSame(_chunk1, _actualChunk1);
+        }
+
+        [TestMethod]
+        public void SecondReadShouldReturnChunk2()
+        {
+            Assert.IsNotNull(_actualChunk2);
+            Assert.AreSame(_chunk2, _actualChunk2);
+        }
+
+        [TestMethod]
+        public void ThirdReadShouldReturnChunk3()
+        {
+            Assert.IsNotNull(_actualChunk3);
+            Assert.AreSame(_chunk3, _actualChunk3);
+        }
+
+        [TestMethod]
+        public void ReadAfterEndOfFileShouldThrowSshException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Attempting to read beyond the end of the file.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
new file mode 100644
index 000000000..0f034293b
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
@@ -0,0 +1,129 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_LastChunkBeforeEofIsPartial : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private byte[] _chunk3;
+        private SftpFileReader _reader;
+        private byte[] _actualChunk1;
+        private byte[] _actualChunk2;
+        private byte[] _actualChunk3;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk2 = CreateByteArray(random, ChunkLength);
+            _chunk3 = new byte[0];
+            _fileSize = _chunk1.Length + _chunk2.Length;
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_chunk1.Length + _chunk2.Length));
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk1, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk2, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 15);
+        }
+
+        protected override void Act()
+        {
+            _actualChunk1 = _reader.Read();
+            _actualChunk2 = _reader.Read();
+            _actualChunk3 = _reader.Read();
+        }
+
+        [TestMethod]
+        public void FirstReadShouldReturnChunk1()
+        {
+            Assert.IsNotNull(_actualChunk1);
+            Assert.AreSame(_chunk1, _actualChunk1);
+        }
+
+        [TestMethod]
+        public void SecondReadShouldReturnChunk2()
+        {
+            Assert.IsNotNull(_actualChunk2);
+            Assert.AreSame(_chunk2, _actualChunk2);
+        }
+
+        [TestMethod]
+        public void ThirdReadShouldReturnChunk3()
+        {
+            Assert.IsNotNull(_actualChunk3);
+            Assert.AreSame(_chunk3, _actualChunk3);
+        }
+
+        [TestMethod]
+        public void ReadAfterEndOfFileShouldThrowSshException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Attempting to read beyond the end of the file.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
new file mode 100644
index 000000000..a1b1e171a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
@@ -0,0 +1,251 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private byte[] _chunk2CatchUp1;
+        private byte[] _chunk2CatchUp2;
+        private byte[] _chunk3;
+        private byte[] _chunk4;
+        private byte[] _chunk5;
+        private SftpFileReader _reader;
+        private byte[] _actualChunk1;
+        private byte[] _actualChunk2;
+        private byte[] _actualChunk3;
+        private ManualResetEvent _chunk1BeginRead;
+        private ManualResetEvent _chunk2BeginRead;
+        private ManualResetEvent _chunk3BeginRead;
+        private ManualResetEvent _chunk4BeginRead;
+        private ManualResetEvent _chunk5BeginRead;
+        private ManualResetEvent _chunk6BeginRead;
+        private byte[] _actualChunk4;
+        private byte[] _actualChunk2CatchUp1;
+        private byte[] _actualChunk2CatchUp2;
+        private byte[] _chunk6;
+        private byte[] _actualChunk5;
+        private byte[] _actualChunk6;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 3);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk2 = CreateByteArray(random, ChunkLength - 17);
+            _chunk2CatchUp1 = CreateByteArray(random, 10);
+            _chunk2CatchUp2 = CreateByteArray(random, 7);
+            _chunk3 = CreateByteArray(random, ChunkLength);
+            _chunk4 = CreateByteArray(random, ChunkLength);
+            _chunk5 = CreateByteArray(random, ChunkLength);
+            _chunk6 = new byte[0];
+            _chunk1BeginRead = new ManualResetEvent(false);
+            _chunk2BeginRead = new ManualResetEvent(false);
+            _chunk3BeginRead = new ManualResetEvent(false);
+            _chunk4BeginRead = new ManualResetEvent(false);
+            _chunk5BeginRead = new ManualResetEvent(false);
+            _chunk6BeginRead = new ManualResetEvent(false);
+            _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp1.Length + _chunk2CatchUp2.Length + _chunk3.Length + _chunk4.Length + _chunk5.Length;
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk1BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk1, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk2BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk2, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk3BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 3 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk4BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk4, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 4 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk5BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk5, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 17, 17))
+                            .Returns(_chunk2CatchUp1);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 7, 7))
+                            .Returns(_chunk2CatchUp2);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 5 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk6BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk6, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+        }
+
+        protected override void Act()
+        {
+            // reader is configured to read-ahead max. 3 chunks, so chunk4 should not have been read
+            Assert.IsFalse(_chunk4BeginRead.WaitOne(0));
+            // consume chunk 1
+            _actualChunk1 = _reader.Read();
+            // consuming chunk1 allows chunk4 to be read-ahead
+            Assert.IsTrue(_chunk4BeginRead.WaitOne(200));
+            // verify that chunk5 has not yet been read-ahead
+            Assert.IsFalse(_chunk5BeginRead.WaitOne(0));
+            // consume chunk 2
+            _actualChunk2 = _reader.Read();
+            // consuming chunk2 allows chunk5 to be read-ahead
+            Assert.IsTrue(_chunk5BeginRead.WaitOne(200));
+            // consume remaining parts of chunk 2
+            _actualChunk2CatchUp1 = _reader.Read();
+            _actualChunk2CatchUp2 = _reader.Read();
+            // verify that chunk6 has not yet been read-ahead
+            Assert.IsFalse(_chunk6BeginRead.WaitOne(0));
+            // consume chunk 3
+            _actualChunk3 = _reader.Read();
+            // consuming chunk3 allows chunk6 to be read-ahead
+            Assert.IsTrue(_chunk6BeginRead.WaitOne(200));
+            // consume chunk 4
+            _actualChunk4 = _reader.Read();
+            // consume chunk 5
+            _actualChunk5 = _reader.Read();
+            // consume chunk 6
+            _actualChunk6 = _reader.Read();
+        }
+
+        [TestMethod]
+        public void FirstReadShouldReturnChunk1()
+        {
+            Assert.IsNotNull(_actualChunk1);
+            Assert.AreSame(_chunk1, _actualChunk1);
+        }
+
+        [TestMethod]
+        public void SecondReadShouldReturnChunk2()
+        {
+            Assert.IsNotNull(_actualChunk2);
+            Assert.AreSame(_chunk2, _actualChunk2);
+        }
+
+        [TestMethod]
+        public void ThirdReadShouldReturnChunk2CatchUp1()
+        {
+            Assert.IsNotNull(_actualChunk2CatchUp1);
+            Assert.AreSame(_chunk2CatchUp1, _actualChunk2CatchUp1);
+        }
+
+        [TestMethod]
+        public void FourthReadShouldReturnChunk2CatchUp2()
+        {
+            Assert.IsNotNull(_actualChunk2CatchUp2);
+            Assert.AreSame(_chunk2CatchUp2, _actualChunk2CatchUp2);
+        }
+
+        [TestMethod]
+        public void FifthReadShouldReturnChunk3()
+        {
+            Assert.IsNotNull(_actualChunk3);
+            Assert.AreSame(_chunk3, _actualChunk3);
+        }
+
+        [TestMethod]
+        public void SixthReadShouldReturnChunk4()
+        {
+            Assert.IsNotNull(_actualChunk4);
+            Assert.AreSame(_chunk4, _actualChunk4);
+        }
+
+        [TestMethod]
+        public void SeventhReadShouldReturnChunk5()
+        {
+            Assert.IsNotNull(_actualChunk5);
+            Assert.AreSame(_chunk5, _actualChunk5);
+        }
+
+        [TestMethod]
+        public void EightReadShouldReturnChunk6()
+        {
+            Assert.IsNotNull(_actualChunk6);
+            Assert.AreSame(_chunk6, _actualChunk6);
+        }
+
+        [TestMethod]
+        public void ReadAfterEndOfFileShouldThrowSshException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Attempting to read beyond the end of the file.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
new file mode 100644
index 000000000..04b4b0a66
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
@@ -0,0 +1,158 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private byte[] _chunk2CatchUp;
+        private byte[] _chunk3;
+        private SftpFileReader _reader;
+        private byte[] _actualChunk1;
+        private byte[] _actualChunk2;
+        private byte[] _actualChunk2CatchUp;
+        private byte[] _actualChunk3;
+        private ManualResetEvent _chunk1BeginRead;
+        private ManualResetEvent _chunk2BeginRead;
+        private ManualResetEvent _chunk3BeginRead;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 3);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk2 = CreateByteArray(random, ChunkLength - 10);
+            _chunk2CatchUp = CreateByteArray(random, 10);
+            _chunk3 = new byte[0];
+            _chunk1BeginRead = new ManualResetEvent(false);
+            _chunk2BeginRead = new ManualResetEvent(false);
+            _chunk3BeginRead = new ManualResetEvent(false);
+            _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp.Length + _chunk3.Length;
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk1BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk1, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk2BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk2, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _chunk3BeginRead.Set();
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 10, 10))
+                            .Returns(_chunk2CatchUp);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+        }
+
+        protected override void Act()
+        {
+            // consume chunk 1
+            _actualChunk1 = _reader.Read();
+            // consume chunk 2
+            _actualChunk2 = _reader.Read();
+            // wait until chunk3 has been read-ahead
+            Assert.IsTrue(_chunk3BeginRead.WaitOne(200));
+            // consume remaining parts of chunk 2
+            _actualChunk2CatchUp = _reader.Read();
+            // consume chunk 3
+            _actualChunk3 = _reader.Read();
+        }
+
+        [TestMethod]
+        public void FirstReadShouldReturnChunk1()
+        {
+            Assert.IsNotNull(_actualChunk1);
+            Assert.AreSame(_chunk1, _actualChunk1);
+        }
+
+        [TestMethod]
+        public void SecondReadShouldReturnChunk2()
+        {
+            Assert.IsNotNull(_actualChunk2);
+            Assert.AreSame(_chunk2, _actualChunk2);
+        }
+
+        [TestMethod]
+        public void ThirdReadShouldReturnChunk2CatchUp()
+        {
+            Assert.IsNotNull(_actualChunk2CatchUp);
+            Assert.AreSame(_chunk2CatchUp, _actualChunk2CatchUp);
+        }
+
+        [TestMethod]
+        public void FourthReadShouldReturnChunk3()
+        {
+            Assert.IsNotNull(_actualChunk3);
+            Assert.AreSame(_chunk3, _actualChunk3);
+        }
+
+        [TestMethod]
+        public void ReadAfterEndOfFileShouldThrowSshException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Attempting to read beyond the end of the file.", ex.Message);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
new file mode 100644
index 000000000..82f8da7be
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    class SftpFileReaderTest_ReadAheadBeginReadException
+    {
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
new file mode 100644
index 000000000..cb52dc532
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -0,0 +1,142 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk3;
+        private ManualResetEvent _readAheadChunk3Completed;
+        private SftpFileReader _reader;
+        private SshException _exception;
+        private SshException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk3 = CreateByteArray(random, ChunkLength);
+            _fileSize = 3 * ChunkLength;
+
+            _readAheadChunk3Completed = new ManualResetEvent(false);
+
+            _exception = new SshException();
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                           {
+                               var asyncResult = new SftpReadAsyncResult(callback, state);
+                               asyncResult.SetAsCompleted(_chunk1, false);
+                           })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                ThreadAbstraction.ExecuteThread(() =>
+                                {
+                                    // wait until the read-ahead for chunk3 has completed
+                                    _readAheadChunk3Completed.WaitOne(TimeSpan.FromSeconds(5));
+
+                                    // complete async read of chunk2 with exception
+                                    var asyncResult = new SftpReadAsyncResult(callback, state);
+                                    asyncResult.SetAsCompleted(_exception, false);
+                                });
+                            })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+
+                                // signal that we've com^meted the read-ahead for chunk3
+                                _readAheadChunk3Completed.Set();
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 2);
+        }
+
+        protected override void Act()
+        {
+            _reader.Read();
+
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadOfSecondChunkShouldThrowExceptionThatOccurredInReadAhead()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_exception, _actualException);
+        }
+
+        [TestMethod]
+        public void ReahAheadOfChunk3ShouldHaveBeenDone()
+        {
+            SftpSessionMock.Verify(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
new file mode 100644
index 000000000..481cf5226
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
@@ -0,0 +1,155 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk3;
+        private SftpFileReader _reader;
+        private ManualResetEvent _readAheadChunk2;
+        private ManualResetEvent _readChunk2;
+        private SshException _exception;
+        private SshException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk3 = CreateByteArray(random, ChunkLength);
+            _fileSize = 3 * _chunk1.Length;
+
+            _readAheadChunk2 = new ManualResetEvent(false);
+            _readChunk2 = new ManualResetEvent(false);
+
+            _exception = new SshException();
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                           {
+                               var asyncResult = new SftpReadAsyncResult(callback, state);
+                               asyncResult.SetAsCompleted(_chunk1, false);
+                           })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                ThreadAbstraction.ExecuteThread(() =>
+                                {
+                                    // signal that we're in the read-ahead for chunk2
+                                    _readAheadChunk2.Set();
+                                    // wait for client to start reading this chunk
+                                    _readChunk2.WaitOne(TimeSpan.FromSeconds(5));
+                                    // sleep a short time to make sure the client is in the blocking wait
+                                    Thread.Sleep(500);
+                                    // complete async read of chunk2 with exception
+                                    var asyncResult = new SftpReadAsyncResult(callback, state);
+                                    asyncResult.SetAsCompleted(_exception, false);
+                                });
+                            })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                // this chunk should never be read
+                                Thread.Sleep(20000);
+
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk3, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            // use a max. read-ahead of 1 to allow us to verify that the next read-ahead is not done
+            // when a read-ahead has failed
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 1);
+        }
+
+        protected override void Act()
+        {
+            _reader.Read();
+
+            // wait until SftpFileReader has starting reading ahead chunk 2
+            Assert.IsTrue(_readAheadChunk2.WaitOne(TimeSpan.FromSeconds(5)));
+            // signal that we are about to read chunk 2
+            _readChunk2.Set();
+
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadOfSecondChunkShouldThrowExceptionThatOccurredInReadAhead()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_exception, _actualException);
+        }
+
+        [TestMethod]
+        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+
+        [TestMethod]
+        public void ExceptionInReadAheadShouldPreventFurtherReadAheads()
+        {
+            SftpSessionMock.Verify(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()), Times.Never);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackBeginReadException.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackBeginReadException.cs
new file mode 100644
index 000000000..f00a0273a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackBeginReadException.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    class SftpFileReaderTest_ReadBackBeginReadException
+    {
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackEndInvokeException.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackEndInvokeException.cs
new file mode 100644
index 000000000..19c816fc8
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadBackEndInvokeException.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    class SftpFileReaderTest_ReadBackEndInvokeException
+    {
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
new file mode 100644
index 000000000..3296cdb34
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
@@ -0,0 +1,135 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_Read_ExceptionInReadAhead : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private byte[] _handle;
+        private int _fileSize;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private SftpFileReader _reader;
+        private ManualResetEvent _readAhead;
+        private ManualResetEvent _readChunk3;
+        private SshException _exception;
+        private SshException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk2 = CreateByteArray(random, ChunkLength);
+            _fileSize = _chunk1.Length + _chunk2.Length + 1;
+
+            _readAhead = new ManualResetEvent(false);
+            _readChunk3 = new ManualResetEvent(false);
+
+            _exception = new SshException();
+        }
+
+        protected override void SetupMocks()
+        {
+            var seq = new MockSequence();
+
+            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
+            SftpSessionMock.InSequence(seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                                {
+                                    var asyncResult = new SftpReadAsyncResult(callback, state);
+                                    asyncResult.SetAsCompleted(_chunk1, false);
+                                })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk2, false);
+                            })
+                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(seq)
+                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                _readAhead.Set();
+                                _readChunk3.WaitOne(TimeSpan.FromSeconds(5));
+                                // sleep a short time to make sure the client is in the blocking wait
+                                Thread.Sleep(500);
+                            })
+                            .Throws(_exception);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+        }
+
+        protected override void Act()
+        {
+            _reader.Read();
+            _reader.Read();
+
+            // wait until we've the SftpFileReader has starting reading ahead chunk 3
+            Assert.IsTrue(_readAhead.WaitOne(TimeSpan.FromSeconds(5)));
+            // signal that we are about to read chunk 3
+            _readChunk3.Set();
+
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadOfThirdChunkShouldThrowExceptionThatOccurredInReadAhead()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_exception, _actualException);
+        }
+
+        [TestMethod]
+        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 4801475cf..5ca58ca8a 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -340,6 +340,17 @@
     <Compile Include="Classes\SftpClientTest_Dispose_Disconnected.cs" />
     <Compile Include="Classes\SftpClientTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\SftpClientTest_Finalize_Connected.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTestBase.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadAheadBeginReadException.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadBackBeginReadException.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadBackEndInvokeException.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ExceptionInReadAhead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 27509ba8a..1110d2997 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -6,71 +6,54 @@
 
 namespace Renci.SshNet.Sftp
 {
-    internal class SftpFileReader
+    internal class SftpFileReader : IDisposable
     {
-        private const int MaxReadAhead = 15;
-
         private readonly byte[] _handle;
         private readonly ISftpSession _sftpSession;
-        private SemaphoreLight _semaphore;
-        private bool _isCompleted;
         private uint _chunkLength;
-        private int _readAheadChunkIndex;
-        private int _nextChunkIndex;
-        private ulong _readAheadOffset;
         private ulong _offset;
         private ulong _fileSize;
-        private Exception _exception;
         private readonly IDictionary<int, BufferedRead> _queue;
+
+        private int _readAheadChunkIndex;
+        private ulong _readAheadOffset;
+        private ManualResetEvent _readAheadCompleted;
+        private int _nextChunkIndex;
+
+        private bool _isEndOfFile;
+        private SemaphoreLight _semaphore;
         private readonly object _readLock;
 
-        public SftpFileReader(byte[] handle, ISftpSession sftpSession)
+        private Exception _exception;
+        private bool _disposed;
+
+        /// <summary>
+        /// Initializes a new <see cref="SftpFileReader"/> instance with the specified handle,
+        /// <see cref="ISftpSession"/> and the maximum number of pending reads.
+        /// </summary>
+        /// <param name="handle"></param>
+        /// <param name="sftpSession"></param>
+        /// <param name="maxReadHead">The maximum number of pending reads.</param>
+        public SftpFileReader(byte[] handle, ISftpSession sftpSession, int maxReadHead)
         {
             _handle = handle;
             _sftpSession = sftpSession;
-            _chunkLength = 32 * 1024; // TODO !
-            _semaphore = new SemaphoreLight(MaxReadAhead);
-            _queue = new Dictionary<int, BufferedRead>(MaxReadAhead);
+            _chunkLength = 32 * 1024 - 13; // TODO !
+            _semaphore = new SemaphoreLight(maxReadHead);
+            _queue = new Dictionary<int, BufferedRead>(maxReadHead);
             _readLock = new object();
+            _readAheadCompleted = new ManualResetEvent(false);
 
             _fileSize = (ulong)_sftpSession.RequestFStat(_handle).Size;
 
-            ThreadAbstraction.ExecuteThread(() =>
-            {
-                // read one chunk beyond the chunk in which we read "file size" bytes
-                // to get an EOF
-
-                while (_readAheadOffset <= (_fileSize + _chunkLength) && _exception == null)
-                {
-                    // TODO implement cancellation!?
-                    // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
-                    // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
-                    _semaphore.Wait();
-
-                    // don't bother reading any more chunks if we reached EOF, or an exception has occurred
-                    // while processing a chunk
-                    if (_isCompleted || _exception != null)
-                        break;
-
-                    // TODO: catch exception, signal error to Read() and break loop
-
-                    // start reading next chunk
-                    _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
-                                           new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
-
-                    // advance read-ahead offset
-                    _readAheadOffset += _chunkLength;
-
-                    _readAheadChunkIndex++;
-                }
-
-                Console.WriteLine("Finished read-ahead");
-            });
+            StartReadAhead();
         }
 
         public byte[] Read()
         {
-            if (_isCompleted)
+            if (_exception != null || _disposed)
+                throw new ObjectDisposedException(GetType().FullName);
+            if (_isEndOfFile)
                 throw new SshException("Attempting to read beyond the end of the file.");
 
             lock (_readLock)
@@ -81,7 +64,9 @@ public byte[] Read()
 
                 // wait until either the next chunk is avalable or an exception has occurred
                 while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && _exception == null)
+                {
                     Monitor.Wait(_readLock);
+                }
 
                 if (_exception != null)
                     throw _exception;
@@ -98,7 +83,7 @@ public byte[] Read()
                     // have we reached EOF?
                     if (data.Length == 0)
                     {
-                        _isCompleted = true;
+                        _isEndOfFile = true;
                     }
                     // unblock wait in read-ahead
                     _semaphore.Release();
@@ -109,7 +94,7 @@ public byte[] Read()
                 // chunk if we haven't already read up to the file size
                 if (nextChunk.Data.Length == 0 && _offset == _fileSize)
                 {
-                    _isCompleted = true;
+                    _isEndOfFile = true;
 
                     // unblock wait in read-ahead
                     _semaphore.Release();
@@ -120,29 +105,94 @@ public byte[] Read()
                 // when the server returned less bytes than requested (for the previous chunk)
                 // we'll synchronously request the remaining data
 
-                var catchUp = new byte[nextChunk.Offset - _offset];
-                var bytesCaughtUp = 0L;
+                var bytesToCatchUp = nextChunk.Offset - _offset;
+
+                // TODO: break loop and interrupt blocking wait in case of exception
+                var read = _sftpSession.RequestRead(_handle, _offset, (uint) bytesToCatchUp);
+                if (read.Length == 0)
+                {
+                    // move reader to error state
+                    _exception = new SshException("Unexpectedly reached end of file.");
+                    // unblock wait in read-ahead
+                    _semaphore.Release();
+                    // notify caller of error
+                    throw _exception;
+                }
+
+                _offset += (uint) read.Length;
+
+                return read;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                var readAheadCompleted = _readAheadCompleted;
+                if (readAheadCompleted != null)
+                {
+                    _readAheadCompleted = null;
+                    if (!readAheadCompleted.WaitOne(TimeSpan.FromSeconds(1)))
+                    {
+                        DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
+                    }
+                    readAheadCompleted.Dispose();
+                }
 
-                while (bytesCaughtUp < catchUp.Length)
+                _disposed = true;
+            }
+        }
+
+        private void StartReadAhead()
+        {
+            ThreadAbstraction.ExecuteThread(() =>
+            {
+                while (_exception == null)
                 {
-                    // TODO: break loop and interrupt blocking wait in case of exception
-                    var read = _sftpSession.RequestRead(_handle, _offset, (uint) catchUp.Length);
-                    if (read.Length == 0)
+                    // TODO implement cancellation!?
+                    // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
+                    // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
+                    _semaphore.Wait();
+
+                    // don't bother reading any more chunks if we reached EOF, or an exception has occurred
+                    // while processing a chunk
+                    if (_isEndOfFile || _exception != null)
+                        break;
+
+                    // start reading next chunk
+                    try
                     {
-                        // move reader to error state
-                        _exception = new SshException("Unexpectedly reached end of file.");
-                        // unblock wait in read-ahead
-                        _semaphore.Release();
-                        // notify caller of error
-                        throw _exception;
+                        _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
+                                               new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
+                    }
+                    catch (Exception ex)
+                    {
+                        HandleFailure(ex);
+                        break;
                     }
 
-                    bytesCaughtUp += read.Length;
-                    _offset += (ulong) bytesCaughtUp;
+                    if (_readAheadOffset >= _fileSize)
+                    {
+                        // read one chunk beyond the chunk in which we read "file size" bytes
+                        // to get an EOF
+                        break;
+                    }
+
+                    // advance read-ahead offset
+                    _readAheadOffset += _chunkLength;
+
+                    _readAheadChunkIndex++;
                 }
 
-                return catchUp;
-            }
+                _readAheadCompleted.Set();
+            });
         }
 
         private void ReadCompleted(IAsyncResult result)
@@ -151,7 +201,17 @@ private void ReadCompleted(IAsyncResult result)
             if (readAsyncResult == null)
                 return;
 
-            var data = readAsyncResult.EndInvoke();
+            byte[] data = null;
+
+            try
+            {
+                data = readAsyncResult.EndInvoke();
+            }
+            catch (Exception ex)
+            {
+                HandleFailure(ex);
+                return;
+            }
 
             // a read that completes with a zero-byte result signals EOF
             // but there may be pending reads before that read
@@ -167,7 +227,21 @@ private void ReadCompleted(IAsyncResult result)
             }
         }
 
-        private class BufferedRead
+        private void HandleFailure(Exception cause)
+        {
+            _exception = cause;
+
+            // unblock read-ahead
+            _semaphore.Release();
+
+            // unblock Read()
+            lock (_readLock)
+            {
+                Monitor.PulseAll(_readLock);
+            }
+        }
+
+        internal class BufferedRead
         {
             public int ChunkIndex { get; private set; }
 
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index b8ad0f62f..220e4d9e5 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -2000,7 +2000,7 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
             // TODO close handle in case of exception
             // TODO decide whether to move opening (and closing) of handle to SftpFileReader
 
-            var fileReader = new SftpFileReader(handle, _sftpSession);
+            var fileReader = new SftpFileReader(handle, _sftpSession, 15);
             var totalBytesRead = 0UL;
 
             while (true)

From ccefd706a3d712f43eb8e2bdd9226b7b8a19fdc0 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 29 Jan 2017 20:21:06 +0100
Subject: [PATCH 024/128] Set C# language version to 5 for release and debug
 configuration.

---
 src/Renci.SshNet/Renci.SshNet.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 6969b54b6..4ee3af315 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -36,6 +36,7 @@
     <NoWarn>
     </NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>

From 191b704691185e5c7e6d266578b46c124fd40501 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 10:17:25 +0100
Subject: [PATCH 025/128] Eliminate extra String.Format.

---
 src/Renci.SshNet/ShellStream.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/ShellStream.cs b/src/Renci.SshNet/ShellStream.cs
index 91df9fb02..9f632bf53 100644
--- a/src/Renci.SshNet/ShellStream.cs
+++ b/src/Renci.SshNet/ShellStream.cs
@@ -658,8 +658,7 @@ public void Write(string text)
         /// </remarks>
         public void WriteLine(string line)
         {
-            var commandText = string.Format("{0}{1}", line, "\r");
-            Write(commandText);
+            Write(line + "\r");
         }
 
         /// <summary>

From 807e9fc14e0568b90004d05c911d5f0282550177 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 17:18:51 +0100
Subject: [PATCH 026/128] Optimize handling response actions.

---
 .../ExtendedRequests/FStatVfsRequest.cs       | 18 +++++-
 .../ExtendedRequests/StatVfsRequest.cs        | 17 +++++-
 .../Sftp/Requests/SftpFStatRequest.cs         | 17 +++++-
 .../Sftp/Requests/SftpLStatRequest.cs         | 16 +++++-
 .../Sftp/Requests/SftpOpenDirRequest.cs       | 17 +++++-
 .../Sftp/Requests/SftpOpenRequest.cs          | 16 +++++-
 .../Sftp/Requests/SftpReadDirRequest.cs       | 18 +++++-
 .../Sftp/Requests/SftpReadLinkRequest.cs      | 17 +++++-
 .../Sftp/Requests/SftpReadRequest.cs          | 17 +++++-
 .../Sftp/Requests/SftpRealPathRequest.cs      | 20 +++++--
 src/Renci.SshNet/Sftp/Requests/SftpRequest.cs | 57 ++-----------------
 .../Sftp/Requests/SftpStatRequest.cs          | 16 +++++-
 12 files changed, 179 insertions(+), 67 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
index cf04beeaf..5b5b02ecd 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
@@ -5,6 +5,8 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class FStatVfsRequest : SftpExtendedRequest
     {
+        private readonly Action<SftpExtendedReplyResponse> _extendedReplyAction;
+
         public byte[] Handle { get; private set; }
 
         /// <summary>
@@ -28,7 +30,8 @@ public FStatVfsRequest(uint protocolVersion, uint requestId, byte[] handle, Acti
             : base(protocolVersion, requestId, statusAction, "fstatvfs@openssh.com")
         {
             Handle = handle;
-            SetAction(extendedAction);
+
+            _extendedReplyAction = extendedAction;
         }
 
         protected override void SaveData()
@@ -36,5 +39,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(Handle);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var extendedReplyResponse = response as SftpExtendedReplyResponse;
+            if (extendedReplyResponse != null)
+            {
+                _extendedReplyAction(extendedReplyResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
index 0771ddcc4..b1bda3c06 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class StatVfsRequest : SftpExtendedRequest
     {
         private byte[] _path;
+        private readonly Action<SftpExtendedReplyResponse> _extendedReplyAction;
 
         public string Path
         {
@@ -38,7 +39,8 @@ public StatVfsRequest(uint protocolVersion, uint requestId, string path, Encodin
         {
             Encoding = encoding;
             Path = path;
-            SetAction(extendedAction);
+
+            _extendedReplyAction = extendedAction;
         }
 
         protected override void SaveData()
@@ -46,5 +48,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var extendedReplyResponse = response as SftpExtendedReplyResponse;
+            if (extendedReplyResponse != null)
+            {
+                _extendedReplyAction(extendedReplyResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
index 0ea0b7a42..da71a62ea 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
@@ -5,6 +5,8 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpFStatRequest : SftpRequest
     {
+        private readonly Action<SftpAttrsResponse> _attrsAction;
+
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.FStat; }
@@ -33,7 +35,7 @@ public SftpFStatRequest(uint protocolVersion, uint requestId, byte[] handle, Act
             : base(protocolVersion, requestId, statusAction)
         {
             Handle = handle;
-            SetAction(attrsAction);
+            _attrsAction = attrsAction;
         }
 
         protected override void LoadData()
@@ -47,5 +49,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(Handle);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var attrsResponse = response as SftpAttrsResponse;
+            if (attrsResponse != null)
+            {
+                _attrsAction(attrsResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
index c3f51dea6..1edb9c695 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class SftpLStatRequest : SftpRequest
     {
         private byte[] _path;
+        private readonly Action<SftpAttrsResponse> _attrsAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -43,7 +44,7 @@ public SftpLStatRequest(uint protocolVersion, uint requestId, string path, Encod
         {
             Encoding = encoding;
             Path = path;
-            SetAction(attrsAction);
+            _attrsAction = attrsAction;
         }
 
         protected override void LoadData()
@@ -57,5 +58,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var attrsResponse = response as SftpAttrsResponse;
+            if (attrsResponse != null)
+            {
+                _attrsAction(attrsResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
index 0db4f93ed..81a54b62d 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class SftpOpenDirRequest : SftpRequest
     {
         private byte[] _path;
+        private readonly Action<SftpHandleResponse> _handleAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -43,7 +44,8 @@ public SftpOpenDirRequest(uint protocolVersion, uint requestId, string path, Enc
         {
             Encoding = encoding;
             Path = path;
-            SetAction(handleAction);
+
+            _handleAction = handleAction;
         }
 
         protected override void LoadData()
@@ -59,5 +61,18 @@ protected override void SaveData()
 
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var handleResponse = response as SftpHandleResponse;
+            if (handleResponse != null)
+            {
+                _handleAction(handleResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
index df9a07440..da7a7a095 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
@@ -8,6 +8,7 @@ internal class SftpOpenRequest : SftpRequest
     {
         private byte[] _fileName;
         private byte[] _attributes;
+        private readonly Action<SftpHandleResponse> _handleAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -62,7 +63,7 @@ private SftpOpenRequest(uint protocolVersion, uint requestId, string fileName, E
             Flags = flags;
             Attributes = attributes;
 
-            SetAction(handleAction);
+            _handleAction = handleAction;
         }
 
         protected override void LoadData()
@@ -79,5 +80,18 @@ protected override void SaveData()
             Write((uint) Flags);
             Write(_attributes);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var handleResponse = response as SftpHandleResponse;
+            if (handleResponse != null)
+            {
+                _handleAction(handleResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
index 313ca216b..9d46c69bd 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
@@ -5,6 +5,8 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpReadDirRequest : SftpRequest
     {
+        private readonly Action<SftpNameResponse> _nameAction;
+
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.ReadDir; }
@@ -33,7 +35,8 @@ public SftpReadDirRequest(uint protocolVersion, uint requestId, byte[] handle, A
             : base(protocolVersion, requestId, statusAction)
         {
             Handle = handle;
-            SetAction(nameAction);
+
+            _nameAction = nameAction;
         }
 
         protected override void LoadData()
@@ -47,5 +50,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(Handle);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var nameResponse = response as SftpNameResponse;
+            if (nameResponse != null)
+            {
+                _nameAction(nameResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
index 238a68430..90e36b69b 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class SftpReadLinkRequest : SftpRequest
     {
         private byte[] _path;
+        private readonly Action<SftpNameResponse> _nameAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -43,7 +44,8 @@ public SftpReadLinkRequest(uint protocolVersion, uint requestId, string path, En
         {
             Encoding = encoding;
             Path = path;
-            SetAction(nameAction);
+
+            _nameAction = nameAction;
         }
 
         protected override void LoadData()
@@ -59,5 +61,18 @@ protected override void SaveData()
 
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var nameResponse = response as SftpNameResponse;
+            if (nameResponse != null)
+            {
+                _nameAction(nameResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
index e462ee5ab..72dc92877 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
@@ -5,6 +5,8 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpReadRequest : SftpRequest
     {
+        private readonly Action<SftpDataResponse> _dataAction;
+
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Read; }
@@ -41,7 +43,7 @@ public SftpReadRequest(uint protocolVersion, uint requestId, byte[] handle, UInt
             Handle = handle;
             Offset = offset;
             Length = length;
-            SetAction(dataAction);
+            _dataAction = dataAction;
         }
 
         protected override void LoadData()
@@ -59,5 +61,18 @@ protected override void SaveData()
             Write(Offset);
             Write(Length);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var dataResponse = response as SftpDataResponse;
+            if (dataResponse != null)
+            {
+                _dataAction(dataResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
index 614bcb457..44b11e90b 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class SftpRealPathRequest : SftpRequest
     {
         private byte[] _path;
+        private readonly Action<SftpNameResponse> _nameAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -43,13 +44,11 @@ public SftpRealPathRequest(uint protocolVersion, uint requestId, string path, En
         {
             if (nameAction == null)
                 throw new ArgumentNullException("nameAction");
-            if (statusAction == null)
-                throw new ArgumentNullException("statusAction");
 
             Encoding = encoding;
             Path = path;
-            SetAction(nameAction);
-            
+
+            _nameAction = nameAction;
         }
 
         protected override void SaveData()
@@ -57,5 +56,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var nameResponse = response as SftpNameResponse;
+            if (nameResponse != null)
+            {
+                _nameAction(nameResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
index 8b6bd3a04..88458e5fa 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
@@ -6,11 +6,6 @@ namespace Renci.SshNet.Sftp.Requests
     internal abstract class SftpRequest : SftpMessage
     {
         private readonly Action<SftpStatusResponse> _statusAction;
-        private Action<SftpAttrsResponse> _attrsAction;
-        private Action<SftpDataResponse> _dataAction;
-        private Action<SftpExtendedReplyResponse> _extendedReplyAction;
-        private Action<SftpHandleResponse> _handleAction;
-        private Action<SftpNameResponse> _nameAction;
 
         public uint RequestId { get; private set; }
         
@@ -39,31 +34,12 @@ protected SftpRequest(uint protocolVersion, uint requestId, Action<SftpStatusRes
             _statusAction = statusAction;
         }
 
-        public void Complete(SftpResponse response)
+        public virtual void Complete(SftpResponse response)
         {
-            if (response is SftpStatusResponse)
+            var statusResponse = response as SftpStatusResponse;
+            if (statusResponse != null)
             {
-                _statusAction(response as SftpStatusResponse);
-            }
-            else if (response is SftpAttrsResponse)
-            {
-                _attrsAction(response as SftpAttrsResponse);
-            }
-            else if (response is SftpDataResponse)
-            {
-                _dataAction(response as SftpDataResponse);
-            }
-            else if (response is SftpExtendedReplyResponse)
-            {
-                _extendedReplyAction(response as SftpExtendedReplyResponse);
-            }
-            else if (response is SftpHandleResponse)
-            {
-                _handleAction(response as SftpHandleResponse);
-            }
-            else if (response is SftpNameResponse)
-            {
-                _nameAction(response as SftpNameResponse);
+                _statusAction(statusResponse);
             }
             else
             {
@@ -71,31 +47,6 @@ public void Complete(SftpResponse response)
             }
         }
 
-        protected void SetAction(Action<SftpAttrsResponse> action)
-        {
-            _attrsAction = action;
-        }
-
-        protected void SetAction(Action<SftpDataResponse> action)
-        {
-            _dataAction = action;
-        }
-
-        protected void SetAction(Action<SftpExtendedReplyResponse> action)
-        {
-            _extendedReplyAction = action;
-        }
-
-        protected void SetAction(Action<SftpHandleResponse> action)
-        {
-            _handleAction = action;
-        }
-
-        protected void SetAction(Action<SftpNameResponse> action)
-        {
-            _nameAction = action;
-        }
-
         protected override void LoadData()
         {
             throw new InvalidOperationException("Request cannot be saved.");
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
index 3d8c8432d..91e8823da 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
@@ -7,6 +7,7 @@ namespace Renci.SshNet.Sftp.Requests
     internal class SftpStatRequest : SftpRequest
     {
         private byte[] _path;
+        private readonly Action<SftpAttrsResponse> _attrsAction;
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -43,7 +44,7 @@ public SftpStatRequest(uint protocolVersion, uint requestId, string path, Encodi
         {
             Encoding = encoding;
             Path = path;
-            SetAction(attrsAction);
+            _attrsAction = attrsAction;
         }
 
         protected override void LoadData()
@@ -57,5 +58,18 @@ protected override void SaveData()
             base.SaveData();
             WriteBinaryString(_path);
         }
+
+        public override void Complete(SftpResponse response)
+        {
+            var attrsResponse = response as SftpAttrsResponse;
+            if (attrsResponse != null)
+            {
+                _attrsAction(attrsResponse);
+            }
+            else
+            {
+                base.Complete(response);
+            }
+        }
     }
 }

From 1f2c7f2547f03587013424244ffa7c3685e2e037 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 18:11:55 +0100
Subject: [PATCH 027/128] Do not use reported file size to determine whether
 read-ahead should be stopped. Only use file size for optimization.

---
 src/Renci.SshNet/Sftp/SftpFileReader.cs | 112 ++++++++++++++++--------
 1 file changed, 75 insertions(+), 37 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 1110d2997..559197b19 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -6,13 +6,17 @@
 
 namespace Renci.SshNet.Sftp
 {
-    internal class SftpFileReader : IDisposable
+    internal class SftpFileReader : ISftpFileReader
     {
         private readonly byte[] _handle;
         private readonly ISftpSession _sftpSession;
-        private uint _chunkLength;
+        private readonly uint _chunkSize;
         private ulong _offset;
-        private ulong _fileSize;
+
+        /// <summary>
+        /// Holds the size of the file, when available.
+        /// </summary>
+        private long? _fileSize;
         private readonly IDictionary<int, BufferedRead> _queue;
 
         private int _readAheadChunkIndex;
@@ -20,7 +24,14 @@ internal class SftpFileReader : IDisposable
         private ManualResetEvent _readAheadCompleted;
         private int _nextChunkIndex;
 
-        private bool _isEndOfFile;
+        /// <summary>
+        /// Holds a value indicating whether EOF has already been signaled by the SSH server.
+        /// </summary>
+        private bool _endOfFileReceived;
+        /// <summary>
+        /// Holds a value indicating whether the client has read up to the end of the file.
+        /// </summary>
+        private bool _isEndOfFileRead;
         private SemaphoreLight _semaphore;
         private readonly object _readLock;
 
@@ -33,19 +44,20 @@ internal class SftpFileReader : IDisposable
         /// </summary>
         /// <param name="handle"></param>
         /// <param name="sftpSession"></param>
-        /// <param name="maxReadHead">The maximum number of pending reads.</param>
-        public SftpFileReader(byte[] handle, ISftpSession sftpSession, int maxReadHead)
+        /// <param name="chunkSize">The size of a individual read-ahead chunk.</param>
+        /// <param name="maxPendingReads">The maximum number of pending reads.</param>
+        /// <param name="fileSize">The size of the file, if known; otherwise, <c>null</c>.</param>
+        public SftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
         {
             _handle = handle;
             _sftpSession = sftpSession;
-            _chunkLength = 32 * 1024 - 13; // TODO !
-            _semaphore = new SemaphoreLight(maxReadHead);
-            _queue = new Dictionary<int, BufferedRead>(maxReadHead);
+            _fileSize = fileSize;
+            _chunkSize = chunkSize;
+            _semaphore = new SemaphoreLight(maxPendingReads);
+            _queue = new Dictionary<int, BufferedRead>(maxPendingReads);
             _readLock = new object();
             _readAheadCompleted = new ManualResetEvent(false);
 
-            _fileSize = (ulong)_sftpSession.RequestFStat(_handle).Size;
-
             StartReadAhead();
         }
 
@@ -53,7 +65,7 @@ public byte[] Read()
         {
             if (_exception != null || _disposed)
                 throw new ObjectDisposedException(GetType().FullName);
-            if (_isEndOfFile)
+            if (_isEndOfFileRead)
                 throw new SshException("Attempting to read beyond the end of the file.");
 
             lock (_readLock)
@@ -74,27 +86,32 @@ public byte[] Read()
                 if (nextChunk.Offset == _offset)
                 {
                     var data = nextChunk.Data;
-                    _offset += (ulong) data.Length;
 
-                    // remove processed chunk
-                    _queue.Remove(_nextChunkIndex);
-                    // move to next chunk
-                    _nextChunkIndex++;
                     // have we reached EOF?
                     if (data.Length == 0)
                     {
-                        _isEndOfFile = true;
+                        _isEndOfFileRead = true;
+                    }
+                    else
+                    {
+                        // remove processed chunk
+                        _queue.Remove(_nextChunkIndex);
+                        // update offset
+                        _offset += (ulong)data.Length;
+                        // move to next chunk
+                        _nextChunkIndex++;
                     }
                     // unblock wait in read-ahead
                     _semaphore.Release();
                     return data;
                 }
 
-                // when we received an EOF for the next chunk, then we only complete the current
-                // chunk if we haven't already read up to the file size
-                if (nextChunk.Data.Length == 0 && _offset == _fileSize)
+                // when we received an EOF for the next chunk and the size of the file is known, then
+                // we only complete the current chunk if we haven't already read up to the file size;
+                // this way we save an extra round-trip to the server
+                if (nextChunk.Data.Length == 0 && _fileSize.HasValue && _offset == (ulong)_fileSize.Value)
                 {
-                    _isEndOfFile = true;
+                    _isEndOfFileRead = true;
 
                     // unblock wait in read-ahead
                     _semaphore.Release();
@@ -104,6 +121,13 @@ public byte[] Read()
 
                 // when the server returned less bytes than requested (for the previous chunk)
                 // we'll synchronously request the remaining data
+                //
+                // due to the optimization above, we'll only get here in one of the following cases:
+                // - an EOF situation for files for which we were unable to obtain the file size
+                // - fewer bytes that requested were returned
+                // 
+                // according to the SSH specification, this last case should never happen for normal
+                // disk files (but can happen for device files).
 
                 var bytesToCatchUp = nextChunk.Offset - _offset;
 
@@ -111,6 +135,18 @@ public byte[] Read()
                 var read = _sftpSession.RequestRead(_handle, _offset, (uint) bytesToCatchUp);
                 if (read.Length == 0)
                 {
+                    // a zero-length (EOF) response is only valid for the read-back when EOF has
+                    // been signaled for the next read-ahead chunk
+                    if (nextChunk.Data.Length == 0)
+                    {
+                        _isEndOfFileRead = true;
+
+                        // unblock wait in read-ahead
+                        _semaphore.Release();
+                        // signal EOF to caller
+                        return read;
+                    }
+
                     // move reader to error state
                     _exception = new SshException("Unexpectedly reached end of file.");
                     // unblock wait in read-ahead
@@ -128,7 +164,6 @@ public byte[] Read()
         public void Dispose()
         {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         protected void Dispose(bool disposing)
@@ -138,14 +173,16 @@ protected void Dispose(bool disposing)
                 var readAheadCompleted = _readAheadCompleted;
                 if (readAheadCompleted != null)
                 {
-                    _readAheadCompleted = null;
                     if (!readAheadCompleted.WaitOne(TimeSpan.FromSeconds(1)))
                     {
                         DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
                     }
                     readAheadCompleted.Dispose();
+                    _readAheadCompleted = null;
                 }
 
+                _sftpSession.RequestClose(_handle);
+
                 _disposed = true;
             }
         }
@@ -154,6 +191,7 @@ private void StartReadAhead()
         {
             ThreadAbstraction.ExecuteThread(() =>
             {
+                // TODO: take dispose into account
                 while (_exception == null)
                 {
                     // TODO implement cancellation!?
@@ -161,15 +199,15 @@ private void StartReadAhead()
                     // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
                     _semaphore.Wait();
 
-                    // don't bother reading any more chunks if we reached EOF, or an exception has occurred
+                    // don't bother reading any more chunks if we received EOF, or an exception has occurred
                     // while processing a chunk
-                    if (_isEndOfFile || _exception != null)
+                    if (_endOfFileReceived || _exception != null)
                         break;
 
                     // start reading next chunk
                     try
                     {
-                        _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkLength, ReadCompleted,
+                        _sftpSession.BeginRead(_handle, _readAheadOffset, _chunkSize, ReadCompleted,
                                                new BufferedRead(_readAheadChunkIndex, _readAheadOffset));
                     }
                     catch (Exception ex)
@@ -178,15 +216,8 @@ private void StartReadAhead()
                         break;
                     }
 
-                    if (_readAheadOffset >= _fileSize)
-                    {
-                        // read one chunk beyond the chunk in which we read "file size" bytes
-                        // to get an EOF
-                        break;
-                    }
-
                     // advance read-ahead offset
-                    _readAheadOffset += _chunkLength;
+                    _readAheadOffset += _chunkSize;
 
                     _readAheadChunkIndex++;
                 }
@@ -201,7 +232,7 @@ private void ReadCompleted(IAsyncResult result)
             if (readAsyncResult == null)
                 return;
 
-            byte[] data = null;
+            byte[] data;
 
             try
             {
@@ -219,8 +250,15 @@ private void ReadCompleted(IAsyncResult result)
             bufferedRead.Complete(data);
             _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
 
+            // check if server signaled EOF
+            if (data.Length == 0)
+            {
+                // set a flag to stop read-aheads
+                _endOfFileReceived = true;
+            }
+
             // signal that a chunk has been read or EOF has been reached;
-            // in both cases, we want to unblock the "read-ahead" thread
+            // in both cases, Read() will eventually also unblock the "read-ahead" thread
             lock (_readLock)
             {
                 Monitor.PulseAll(_readLock);

From 3f78ad3002656f9ddbd26c1820c451377870e6a7 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 18:16:07 +0100
Subject: [PATCH 028/128] Add CreateFileReader method on SftpSession in which
 we use the size of the file to determine the maximum pending reads to allow,
 and calculate the size of individual chunks. Add CreateSftpFileReader method
 to ServiceFactory. Add nullOnError argument to SftpSession.RequestFStat.

---
 .../Renci.SshNet.NET35.csproj                 |  5 +-
 ...ReaderTest_LastChunkBeforeEofIsComplete.cs |  3 +-
 ...eReaderTest_LastChunkBeforeEofIsPartial.cs |  3 +-
 ...iousChunkIsIncompleteAndEofIsNotReached.cs |  3 +-
 ...reviousChunkIsIncompleteAndEofIsReached.cs |  3 +-
 ...vokeException_DiscardsFurtherReadAheads.cs |  3 +-
 ...vokeException_PreventsFurtherReadAheads.cs |  3 +-
 ...ileReaderTest_Read_ExceptionInReadAhead.cs |  3 +-
 ...treamTest_CanRead_Closed_FileAccessRead.cs |  2 +-
 ...Test_CanRead_Closed_FileAccessReadWrite.cs |  2 +-
 ...reamTest_CanRead_Closed_FileAccessWrite.cs |  2 +-
 ...eamTest_CanRead_Disposed_FileAccessRead.cs |  2 +-
 ...st_CanRead_Disposed_FileAccessReadWrite.cs |  2 +-
 ...amTest_CanRead_Disposed_FileAccessWrite.cs |  2 +-
 ...Test_CanRead_SessionOpen_FileAccessRead.cs |  2 +-
 ...CanRead_SessionOpen_FileAccessReadWrite.cs |  2 +-
 ...est_CanRead_SessionOpen_FileAccessWrite.cs |  2 +-
 ...reamTest_CanWrite_Closed_FileAccessRead.cs |  2 +-
 ...est_CanWrite_Closed_FileAccessReadWrite.cs |  2 +-
 ...eamTest_CanWrite_Closed_FileAccessWrite.cs |  2 +-
 ...amTest_CanWrite_Disposed_FileAccessRead.cs |  2 +-
 ...t_CanWrite_Disposed_FileAccessReadWrite.cs |  2 +-
 ...mTest_CanWrite_Disposed_FileAccessWrite.cs |  2 +-
 ...est_CanWrite_SessionOpen_FileAccessRead.cs |  2 +-
 ...anWrite_SessionOpen_FileAccessReadWrite.cs |  2 +-
 ...st_CanWrite_SessionOpen_FileAccessWrite.cs |  2 +-
 .../Sftp/SftpFileStreamTest_Close_Closed.cs   |  2 +-
 .../Sftp/SftpFileStreamTest_Close_Disposed.cs |  2 +-
 ...SftpFileStreamTest_Close_SessionNotOpen.cs |  2 +-
 .../SftpFileStreamTest_Close_SessionOpen.cs   |  2 +-
 .../Sftp/SftpFileStreamTest_Dispose_Closed.cs |  2 +-
 .../SftpFileStreamTest_Dispose_Disposed.cs    |  2 +-
 ...tpFileStreamTest_Dispose_SessionNotOpen.cs |  2 +-
 .../SftpFileStreamTest_Dispose_SessionOpen.cs |  2 +-
 ...SftpFileStreamTest_Finalize_SessionOpen.cs |  2 +-
 .../SftpFileStreamTest_SetLength_Closed.cs    |  2 +-
 .../SftpFileStreamTest_SetLength_Disposed.cs  |  2 +-
 ...FileStreamTest_SetLength_SessionNotOpen.cs |  2 +-
 ...st_SetLength_SessionOpen_FIleAccessRead.cs |  2 +-
 ...tLength_SessionOpen_FIleAccessReadWrite.cs |  2 +-
 ...t_SetLength_SessionOpen_FIleAccessWrite.cs |  2 +-
 ...tGreatherThanTwoTimesTheWriteBufferSize.cs | 69 ++++++++++++++++++-
 .../SftpSessionTest_Connected_RequestRead.cs  |  3 +-
 ...ftpSessionTest_Connected_RequestStatVfs.cs |  4 +-
 src/Renci.SshNet/IServiceFactory.cs           |  6 ++
 src/Renci.SshNet/Renci.SshNet.csproj          |  1 +
 src/Renci.SshNet/ServiceFactory.cs            |  7 +-
 src/Renci.SshNet/Sftp/ISftpFileReader.cs      | 12 ++++
 src/Renci.SshNet/Sftp/ISftpSession.cs         |  5 +-
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  6 +-
 src/Renci.SshNet/Sftp/SftpSession.cs          | 36 ++++++++--
 src/Renci.SshNet/SftpClient.cs                | 43 ++++++------
 52 files changed, 202 insertions(+), 82 deletions(-)
 create mode 100644 src/Renci.SshNet/Sftp/ISftpFileReader.cs

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index a35dfadb9..43d6928ba 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -736,6 +736,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -928,7 +931,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
index 85e4564ae..71292ca87 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
@@ -39,7 +39,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -70,7 +69,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 15);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 15, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
index 0f034293b..e38594fea 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
@@ -39,7 +39,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_chunk1.Length + _chunk2.Length));
             SftpSessionMock.InSequence(seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -70,7 +69,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 15);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 15, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
index a1b1e171a..8e6262863 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
@@ -66,7 +66,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -133,7 +132,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 3, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
index 04b4b0a66..ba37c3dec 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
@@ -48,7 +48,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -85,7 +84,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 3, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
index cb52dc532..8c7092523 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -42,7 +42,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -83,7 +82,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 2);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 2, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
index 481cf5226..b1134a4b5 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
@@ -44,7 +44,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -91,7 +90,7 @@ protected override void Arrange()
 
             // use a max. read-ahead of 1 to allow us to verify that the next read-ahead is not done
             // when a read-ahead has failed
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 1);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 1, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
index 3296cdb34..1a38920f8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
@@ -43,7 +43,6 @@ protected override void SetupMocks()
         {
             var seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq).Setup(p => p.RequestFStat(_handle)).Returns(CreateSftpFileAttributes(_fileSize));
             SftpSessionMock.InSequence(seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -76,7 +75,7 @@ protected override void Arrange()
         {
             base.Arrange();
 
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, 3);
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 3, _fileSize);
         }
 
         protected override void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
index f11cd8f6c..995dcab87 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
index 296728d4b..87d3ba31d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
index f988edff9..b68e69ed8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
index 5d69b4682..016c4b989 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
index a6e8fe31d..540803cfe 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
index 448b373b7..41bf419a7 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
index d1c0747d0..01a7a759f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
index 041a20bc0..772be07ba 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
index 8fc229d43..1c72aaf19 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
index 424b2e4dc..ca6d7bb9a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
index 9d94a2221..c23396583 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
index 9952030fe..8f3c473a3 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
index 540dc1f27..9a81e61e6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
index 2554d22cc..3e0f53b06 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
index d02389bcc..2b0dc8a27 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
index c95b92805..c8a1b84e3 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
index 4501f40df..0c90a2c2b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
index 4049d5271..f7ef9d8ee 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
index 08949600c..964da09e5 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
index 0257b1baa..a5500e00f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
index 97b590b18..0e5019774 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
index fb220b585..b7f7623db 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
index af2683e55..6c2e8bef1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
index 9fda20d8b..0e3e7ff23 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
index 0436f0562..e28edf0fc 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
index 1a08ffb97..5db317a83 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
index 32db6393b..dc6b7668a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
@@ -42,7 +42,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
index fbd84b0bf..dbaccba9b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
index ce521f71c..9b8d341ad 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
@@ -43,7 +43,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
index bab89847a..381990f99 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
@@ -46,7 +46,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
index f2fa6bcdc..4668daf6b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
@@ -46,7 +46,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
index dbfad31d1..f6d8c3905 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
@@ -46,7 +46,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
index 477ec749d..d4e1ad067 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
@@ -46,7 +46,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
index 5e8b5327f..de3788460 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
@@ -80,7 +80,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle)).Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
@@ -134,7 +134,7 @@ public void LengthShouldFlushBufferAndReturnSizeOfFile()
                             .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
                             .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
             _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestFStat(_handle))
+                            .Setup(p => p.RequestFStat(_handle, true))
                             .Returns(lengthFileAttributes);
 
             Assert.AreEqual(lengthFileAttributes.Size, _sftpFileStream.Length);
@@ -143,6 +143,71 @@ public void LengthShouldFlushBufferAndReturnSizeOfFile()
             _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
         }
 
+        [TestMethod]
+        public void LengthShouldThrowIOExceptionIfRequestFStatReturnsNull()
+        {
+            const SftpFileAttributes lengthFileAttributes = null;
+            byte[] actualFlushedData = null;
+
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.IsOpen)
+                            .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestFStat(_handle, true))
+                            .Returns(lengthFileAttributes);
+
+            try
+            {
+                var length = _sftpFileStream.Length;
+                Assert.Fail();
+            }
+            catch (IOException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Seek operation failed.", ex.Message);
+            }
+
+            Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
+
+            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void LengthShouldThrowIOExceptionIfSizeIsMinusOne()
+        {
+            var lengthFileAttributes = new SftpFileAttributes(DateTime.Now, DateTime.Now, -1, _random.Next(), _random.Next(), (uint)_random.Next(0, int.MaxValue), null);
+            byte[] actualFlushedData = null;
+
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.IsOpen)
+                            .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestFStat(_handle, true))
+                            .Returns(lengthFileAttributes);
+
+            try
+            {
+                var length = _sftpFileStream.Length;
+                Assert.Fail();
+            }
+            catch (IOException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Seek operation failed.", ex.Message);
+            }
+
+            Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
+
+            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+        }
+
+
         [TestMethod]
         public void DisposeShouldFlushBufferAndCloseRequest()
         {
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index c87800365..5b82692b2 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -14,6 +14,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
     public class SftpSessionTest_Connected_RequestRead
     {
         private Mock<ISession> _sessionMock;
+        private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<IChannelSession> _channelSessionMock;
         private SftpSession _sftpSession;
         private TimeSpan _operationTimeout;
@@ -82,7 +83,7 @@ protected void Arrange()
                     }
                 );
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index 1fbc2a45d..4328b5994 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -14,6 +14,7 @@ public class SftpSessionTest_Connected_RequestStatVfs
     {
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
+        private Mock<IServiceFactory> _serviceFactoryMock;
         private SftpSession _sftpSession;
         private TimeSpan _operationTimeout;
         private SftpFileSytemInformation _actual;
@@ -39,6 +40,7 @@ protected void Arrange()
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
 
             var sequence = new MockSequence();
 
@@ -82,7 +84,7 @@ protected void Arrange()
                     }
                 );
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 372071016..84d4e7d0e 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -57,5 +57,11 @@ internal partial interface IServiceFactory
         /// <exception cref="ArgumentNullException"><paramref name="serverAlgorithms"/> is <c>null</c>.</exception>
         /// <exception cref="SshConnectionException">No key exchange algorithm is supported by both client and server.</exception>
         IKeyExchange CreateKeyExchange(IDictionary<string, Type> clientAlgorithms, string[] serverAlgorithms);
+
+        ISftpFileReader CreateSftpFileReader(byte[] handle,
+                                             ISftpSession sftpSession,
+                                             uint chunkSize,
+                                             int maxPendingReads,
+                                             long? fileSize);
     }
 }
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 4ee3af315..bea84e6e8 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -170,6 +170,7 @@
     <Compile Include="Security\KeyExchangeDiffieHellmanGroupExchangeShaBase.cs" />
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceFactory.NET.cs" />
+    <Compile Include="Sftp\ISftpFileReader.cs" />
     <Compile Include="Sftp\ISftpSession.cs" />
     <Compile Include="Common\SshDataStream.cs" />
     <Compile Include="ExpectAsyncResult.cs" />
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index e06cf7f16..fc496586f 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -50,7 +50,7 @@ public ISession CreateSession(ConnectionInfo connectionInfo)
         /// </returns>
         public ISftpSession CreateSftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding)
         {
-            return new SftpSession(session, operationTimeout, encoding);
+            return new SftpSession(session, operationTimeout, encoding, this);
         }
 
         /// <summary>
@@ -96,5 +96,10 @@ from s in serverAlgorithms
 
             return keyExchangeAlgorithmType.CreateInstance<IKeyExchange>();
         }
+
+        public ISftpFileReader CreateSftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
+        {
+            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/ISftpFileReader.cs b/src/Renci.SshNet/Sftp/ISftpFileReader.cs
new file mode 100644
index 000000000..bab6151c9
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/ISftpFileReader.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Sftp
+{
+    internal interface ISftpFileReader : IDisposable
+    {
+        byte[] Read();
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 17c8c9c19..67782e30b 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -42,10 +42,11 @@ internal interface ISftpSession : ISubsystemSession
         /// Performs SSH_FXP_FSTAT request.
         /// </summary>
         /// <param name="handle">The handle.</param>
+        /// <param name="nullOnError">if set to <c>true</c> returns <c>null</c> instead of throwing an exception.</param>
         /// <returns>
         /// File attributes
         /// </returns>
-        SftpFileAttributes RequestFStat(byte[] handle);
+        SftpFileAttributes RequestFStat(byte[] handle, bool nullOnError);
 
         /// <summary>
         /// Performs SSH_FXP_LSTAT request.
@@ -222,5 +223,7 @@ void RequestWrite(byte[] handle,
         /// Currently, we do not take the remote window size into account.
         /// </remarks>
         uint CalculateOptimalWriteLength(uint bufferSize, byte[] handle);
+
+        ISftpFileReader CreateFileReader(string fileName, uint bufferSize);
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index d02fe7710..4a349f243 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -102,7 +102,7 @@ public override long Length
                     }
 
                     //  Update file attributes
-                    _attributes = _session.RequestFStat(_handle);
+                    _attributes = _session.RequestFStat(_handle, true);
 
                     if (_attributes != null && _attributes.Size > -1)
                     {
@@ -269,7 +269,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             if (_handle == null)
                 _handle = _session.RequestOpen(path, flags);
 
-            _attributes = _session.RequestFStat(_handle);
+            _attributes = _session.RequestFStat(_handle, false);
 
             // instead of using the specified buffer size as is, we use it to calculate a buffer size
             // that ensures we always receive or send the max. number of bytes in a single SSH_FXP_READ
@@ -475,7 +475,7 @@ public override long Seek(long offset, SeekOrigin origin)
                     return _position;
                 }
 
-                _attributes = _session.RequestFStat(_handle);
+                _attributes = _session.RequestFStat(_handle, false);
 
                 // The behaviour depends upon the read/write mode.
                 if (_bufferOwnedByWrite)
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index e91e58b89..a6ecaa301 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -17,6 +17,7 @@ internal class SftpSession : SubsystemSession, ISftpSession
         private readonly Dictionary<uint, SftpRequest> _requests = new Dictionary<uint, SftpRequest>();
         //FIXME: obtain from SftpClient!
         private readonly List<byte> _data = new List<byte>(32 * 1024);
+        private readonly IServiceFactory _serviceFactory;
         private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false);
         private IDictionary<string, string> _supportedExtensions;
 
@@ -37,6 +38,7 @@ internal class SftpSession : SubsystemSession, ISftpSession
         public uint ProtocolVersion { get; private set; }
 
         private long _requestId;
+
         /// <summary>
         /// Gets the next request id for sftp session.
         /// </summary>
@@ -48,9 +50,10 @@ public uint NextRequestId
             }
         }
 
-        public SftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding)
+        public SftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding, IServiceFactory serviceFactory)
             : base(session, "sftp", operationTimeout, encoding)
         {
+            _serviceFactory = serviceFactory;
         }
 
         /// <summary>
@@ -127,6 +130,30 @@ public string GetCanonicalPath(string path)
             return string.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", canonizedPath, slash, pathParts[pathParts.Length - 1]);
         }
 
+        public ISftpFileReader CreateFileReader(string fileName, uint bufferSize)
+        {
+            var handle = RequestOpen(fileName, Flags.Read);
+
+            long? fileSize;
+            int maxPendingReads;
+
+            var chunkSize = CalculateOptimalReadLength(bufferSize);
+
+            var fileAttributes = RequestFStat(handle, true);
+            if (fileAttributes == null)
+            {
+                fileSize = null;
+                maxPendingReads = 5;
+            }
+            else
+            {
+                fileSize = fileAttributes.Size;
+                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
+            }
+
+            return _serviceFactory.CreateSftpFileReader(handle, this, chunkSize, maxPendingReads, fileSize);
+        }
+
         internal string GetFullRemotePath(string path)
         {
             var fullPath = path;
@@ -590,10 +617,11 @@ public SftpFileAttributes RequestLStat(string path)
         /// Performs SSH_FXP_FSTAT request.
         /// </summary>
         /// <param name="handle">The handle.</param>
+        /// <param name="nullOnError">if set to <c>true</c> returns <c>null</c> instead of throwing an exception.</param>
         /// <returns>
         /// File attributes
         /// </returns>
-        public SftpFileAttributes RequestFStat(byte[] handle)
+        public SftpFileAttributes RequestFStat(byte[] handle, bool nullOnError)
         {
             SshException exception = null;
             SftpFileAttributes attributes = null;
@@ -617,7 +645,7 @@ public SftpFileAttributes RequestFStat(byte[] handle)
                 WaitOnHandle(wait, OperationTimeout);
             }
 
-            if (exception != null)
+            if (exception != null && !nullOnError)
             {
                 throw exception;
             }
@@ -687,7 +715,7 @@ public void RequestFSetStat(byte[] handle, SftpFileAttributes attributes)
         /// Performs SSH_FXP_OPENDIR request
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <param name="nullOnError">if set to <c>true</c> returns null instead of throwing an exception.</param>
+        /// <param name="nullOnError">if set to <c>true</c> returns <c>null</c> instead of throwing an exception.</param>
         /// <returns>File handle.</returns>
         public byte[] RequestOpenDir(string path, bool nullOnError = false)
         {
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 220e4d9e5..0cbd68a77 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1995,35 +1995,36 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            var handle = _sftpSession.RequestOpen(fullPath, Flags.Read);
-            
-            // TODO close handle in case of exception
-            // TODO decide whether to move opening (and closing) of handle to SftpFileReader
+            using (var fileReader = _sftpSession.CreateFileReader(fullPath, _bufferSize))
+            {
+                var totalBytesRead = 0UL;
 
-            var fileReader = new SftpFileReader(handle, _sftpSession, 15);
-            var totalBytesRead = 0UL;
+                while (true)
+                {
+                    // TODO: cancel read ahead when download is canceled by user
 
-            while (true)
-            {
-                // TODO: cancel read ahead when download is canceled by user
+                    //  Cancel download
+                    if (asyncResult != null && asyncResult.IsDownloadCanceled)
+                        break;
 
-                //  Cancel download
-                if (asyncResult != null && asyncResult.IsDownloadCanceled)
-                    break;
+                    var data = fileReader.Read();
+                    if (data.Length == 0)
+                        break;
 
-                var data = fileReader.Read();
-                if (data.Length == 0)
-                    break;
+                    output.Write(data, 0, data.Length);
 
-                output.Write(data, 0, data.Length);
+                    totalBytesRead += (ulong)data.Length;
 
-                totalBytesRead += (ulong) data.Length;
+                    if (downloadCallback != null)
+                    {
+                        // copy offset to ensure it's not modified between now and execution of callback
+                        var downloadOffset = totalBytesRead;
 
-                if (downloadCallback != null)
-                    downloadCallback(totalBytesRead);
+                        //  Execute callback on different thread
+                        ThreadAbstraction.ExecuteThread(() => { downloadCallback(downloadOffset); });
+                    }
+                }
             }
-
-            _sftpSession.RequestClose(handle);
         }
 
         /// <summary>

From cd4fad7f67b385df71cc4bb647303803a2e4a857 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 18:22:14 +0100
Subject: [PATCH 029/128] As of VS 2017 RC3, the sources files in the project
 directory are implicitly included.

---
 src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
index 229146f79..c06afc025 100644
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -19,7 +19,6 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
     <Compile Include="..\Renci.SshNet\**\*.cs" Exclude="..\Renci.SshNet\Properties\AssemblyInfo.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>

From 61d45b12aafc0379a4d874c0102a3c33dc6c1367 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Thu, 2 Feb 2017 19:12:09 +0100
Subject: [PATCH 030/128] Add ISftpFileReader to remaining project files.

---
 src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj | 5 ++++-
 .../Renci.SshNet.Silverlight5.csproj                         | 5 ++++-
 src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj             | 3 +++
 .../Renci.SshNet.WindowsPhone.csproj                         | 3 +++
 .../Renci.SshNet.WindowsPhone8.csproj                        | 5 ++++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index 8ff8d9e47..7615d3d9b 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -725,6 +725,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -922,7 +925,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 794924a6f..55c2b61cb 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -734,6 +734,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -928,7 +931,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 5f9cc211c..4ba0f2462 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -801,6 +801,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 9f07f8bb7..6f14380c1 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -713,6 +713,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 927ea1766..18f2d0a68 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -760,6 +760,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
+      <Link>Sftp\ISftpFileReader.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -955,7 +958,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 61b415a31fb35d5c9323f85b0a9da700742c9297 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 19:20:12 +0100
Subject: [PATCH 031/128] Fix test.

---
 .../Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index 5b82692b2..386ceb61d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -40,6 +40,7 @@ protected void Arrange()
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
 
             var sequence = new MockSequence();
 

From e4a1a5dacad2a20dcccef75d34583a920670fab5 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 19:36:30 +0100
Subject: [PATCH 032/128] Fix some more tests.

---
 ...ReaderTest_LastChunkBeforeEofIsComplete.cs | 15 +++++++----
 ...eReaderTest_LastChunkBeforeEofIsPartial.cs | 16 +++++++-----
 ...iousChunkIsIncompleteAndEofIsNotReached.cs | 25 +++++++++++--------
 ...reviousChunkIsIncompleteAndEofIsReached.cs | 17 ++++++++-----
 ...ileReaderTest_Read_ExceptionInReadAhead.cs | 15 +++++++----
 5 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
index 71292ca87..ba55e424a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
@@ -13,6 +13,7 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsComplete : SftpFileReaderTes
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -37,9 +38,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -47,7 +48,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -55,7 +56,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -116,13 +117,17 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
index e38594fea..d0936bffe 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
@@ -4,7 +4,6 @@
 using Renci.SshNet.Sftp;
 using System;
 using System.Diagnostics;
-using System.Threading;
 using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
@@ -14,6 +13,7 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsPartial : SftpFileReaderTest
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -37,9 +37,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -47,7 +47,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -55,7 +55,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -116,13 +116,17 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
index 8e6262863..2bd75058f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
@@ -14,6 +14,7 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached : Sf
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -64,9 +65,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -75,7 +76,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -84,7 +85,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -93,7 +94,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk3, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 3 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -102,7 +103,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk4, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 4 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -111,13 +112,13 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk5, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 17, 17))
                             .Returns(_chunk2CatchUp1);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 7, 7))
                             .Returns(_chunk2CatchUp2);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 5 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -238,13 +239,17 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
index ba37c3dec..e6421adda 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
@@ -14,6 +14,7 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached : SftpF
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -46,9 +47,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -57,7 +58,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -66,7 +67,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -75,7 +76,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk3, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 10, 10))
                             .Returns(_chunk2CatchUp);
         }
@@ -145,13 +146,17 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
index 1a38920f8..b74b3ded0 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
@@ -14,6 +14,7 @@ public class SftpFileReaderTest_Read_ExceptionInReadAhead : SftpFileReaderTestBa
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -41,9 +42,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                                 {
@@ -51,7 +52,7 @@ protected override void SetupMocks()
                                     asyncResult.SetAsCompleted(_chunk1, false);
                                 })
                            .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -59,7 +60,7 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -122,13 +123,17 @@ public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }

From a51e82fcb893e2e9878788eb3dd681cacf7dd936 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Thu, 2 Feb 2017 20:09:35 +0100
Subject: [PATCH 033/128] Fix remaning tests.

---
 ...ndInvokeException_DiscardsFurtherReadAheads.cs | 15 ++++++++++-----
 ...ndInvokeException_PreventsFurtherReadAheads.cs | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
index 8c7092523..223847196 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -15,6 +15,7 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadA
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -40,9 +41,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                            {
@@ -50,7 +51,7 @@ protected override void SetupMocks()
                                asyncResult.SetAsCompleted(_chunk1, false);
                            })
                            .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -65,7 +66,7 @@ protected override void SetupMocks()
                                 });
                             })
                            .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -129,13 +130,17 @@ public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
index b1134a4b5..cdee15ae1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
@@ -15,6 +15,7 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadA
     {
         private const int ChunkLength = 32 * 1024;
 
+        private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
         private byte[] _chunk1;
@@ -42,9 +43,9 @@ protected override void SetupData()
 
         protected override void SetupMocks()
         {
-            var seq = new MockSequence();
+            _seq = new MockSequence();
 
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                            {
@@ -52,7 +53,7 @@ protected override void SetupMocks()
                                asyncResult.SetAsCompleted(_chunk1, false);
                            })
                            .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -70,7 +71,7 @@ protected override void SetupMocks()
                                 });
                             })
                            .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(seq)
+            SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
@@ -136,13 +137,17 @@ public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
         }
 
         [TestMethod]
-        public void DisposeShouldCompleteImmediately()
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
 
         [TestMethod]

From 9f87bc3f26dff5ff77e8e2854e285f66461a8e4e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 10:57:29 +0100
Subject: [PATCH 034/128] Compare server window size with uint zero.

---
 src/Renci.SshNet/Channels/Channel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Channels/Channel.cs b/src/Renci.SshNet/Channels/Channel.cs
index 21fb4b1fc..c13c832f3 100644
--- a/src/Renci.SshNet/Channels/Channel.cs
+++ b/src/Renci.SshNet/Channels/Channel.cs
@@ -773,7 +773,7 @@ private int GetDataLengthThatCanBeSentInMessage(int messageLength)
                 lock (_serverWindowSizeLock)
                 {
                     var serverWindowSize = RemoteWindowSize;
-                    if (serverWindowSize == 0)
+                    if (serverWindowSize == 0U)
                     {
                         // allow us to be signal when remote window size is adjusted
                         _channelServerWindowAdjustWaitHandle.Reset();

From 6ebb978bac74f00dca9af7384498135dc4f0b828 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:02:55 +0100
Subject: [PATCH 035/128] Minor slashdoc (syntax/format) updates.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 111 +++++++++++-------------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 4a349f243..50eb4ee2c 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -7,7 +7,7 @@
 namespace Renci.SshNet.Sftp
 {
     /// <summary>
-    /// Exposes a System.IO.Stream around a remote SFTP file, supporting both synchronous and asynchronous read and write operations.
+    /// Exposes a <see cref="Stream"/> around a remote SFTP file, supporting both synchronous and asynchronous read and write operations.
     /// </summary>
     public class SftpFileStream : Stream
     {
@@ -39,7 +39,9 @@ public class SftpFileStream : Stream
         /// <summary>
         /// Gets a value indicating whether the current stream supports reading.
         /// </summary>
-        /// <returns>true if the stream supports reading; otherwise, false.</returns>
+        /// <returns>
+        /// <c>true</c> if the stream supports reading; otherwise, <c>false</c>.
+        /// </returns>
         public override bool CanRead
         {
             get { return _canRead; }
@@ -48,7 +50,9 @@ public override bool CanRead
         /// <summary>
         /// Gets a value indicating whether the current stream supports seeking.
         /// </summary>
-        /// <returns>true if the stream supports seeking; otherwise, false.</returns>
+        /// <returns>
+        /// <c>true</c> if the stream supports seeking; otherwise, <c>false</c>.
+        /// </returns>
         public override bool CanSeek
         {
             get { return _canSeek; }
@@ -57,7 +61,9 @@ public override bool CanSeek
         /// <summary>
         /// Gets a value indicating whether the current stream supports writing.
         /// </summary>
-        /// <returns>true if the stream supports writing; otherwise, false.</returns>
+        /// <returns>
+        /// <c>true</c> if the stream supports writing; otherwise, <c>false</c>.
+        /// </returns>
         public override bool CanWrite
         {
             get { return _canWrite; }
@@ -78,9 +84,9 @@ public override bool CanTimeout
         /// Gets the length in bytes of the stream.
         /// </summary>
         /// <returns>A long value representing the length of the stream in bytes.</returns>
-        /// <exception cref="T:System.NotSupportedException">A class derived from Stream does not support seeking. </exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
-        /// <exception cref="T:System.IO.IOException">IO operation failed. </exception>
+        /// <exception cref="NotSupportedException">A class derived from Stream does not support seeking. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="IOException">IO operation failed. </exception>
         [SuppressMessage("Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations", Justification = "Be design this is the exception that stream need to throw.")]
         public override long Length
         {
@@ -117,12 +123,9 @@ public override long Length
         /// Gets or sets the position within the current stream.
         /// </summary>
         /// <returns>The current position within the stream.</returns>
-        ///   
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
-        ///   
-        /// <exception cref="T:System.NotSupportedException">The stream does not support seeking. </exception>
-        ///   
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support seeking. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override long Position
         {
             get
@@ -153,13 +156,19 @@ public virtual bool IsAsync
         }
 
         /// <summary>
-        /// Gets the name of the FileStream that was passed to the constructor.
+        /// Gets the name of the path that was used to construct the current <see cref="SftpFileStream"/>.
         /// </summary>
+        /// <value>
+        /// The name of the path that was used to construct the current <see cref="SftpFileStream"/>.
+        /// </value>
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the operating system file handle for the file that the current SftpFileStream object encapsulates.
+        /// Gets the operating system file handle for the file that the current <see cref="SftpFileStream"/> encapsulates.
         /// </summary>
+        /// <value>
+        /// The operating system file handle for the file that the current <see cref="SftpFileStream"/> encapsulates.
+        /// </value>
         public virtual byte[] Handle
         {
             get
@@ -178,32 +187,17 @@ public virtual byte[] Handle
         public TimeSpan Timeout { get; set; }
 
         internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAccess access, int bufferSize)
-            : this(session, path, mode, access, bufferSize, false)
-        {
-        }
-
-        internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAccess access, int bufferSize, bool useAsync)
         {
-            // Validate the parameters.
             if (session == null)
                 throw new SshConnectionException("Client not connected.");
-
             if (path == null)
-            {
                 throw new ArgumentNullException("path");
-            }
             if (bufferSize <= 0)
-            {
                 throw new ArgumentOutOfRangeException("bufferSize");
-            }
             if (access < FileAccess.Read || access > FileAccess.ReadWrite)
-            {
                 throw new ArgumentOutOfRangeException("access");
-            }
             if (mode < FileMode.CreateNew || mode > FileMode.Append)
-            {
                 throw new ArgumentOutOfRangeException("mode");
-            }
 
             Timeout = TimeSpan.FromSeconds(30);
             Name = path;
@@ -275,15 +269,16 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             // that ensures we always receive or send the max. number of bytes in a single SSH_FXP_READ
             // or SSH_FXP_WRITE message
 
-            _readBufferSize = (int)session.CalculateOptimalReadLength((uint)bufferSize);
+            _readBufferSize = (int) session.CalculateOptimalReadLength((uint)bufferSize);
             _readBuffer = new byte[_readBufferSize];
-            _writeBufferSize = (int)session.CalculateOptimalWriteLength((uint)bufferSize, _handle);
+            _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint)bufferSize, _handle);
             _writeBuffer = new byte[_writeBufferSize];
 
             if (mode == FileMode.Append)
             {
+                _attributes = _session.RequestFStat(_handle, false);
                 _position = _attributes.Size;
-                _serverFilePosition = (ulong)_attributes.Size;
+                _serverFilePosition = (ulong) _attributes.Size;
             }
         }
 
@@ -299,7 +294,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
         /// <summary>
         /// Clears all buffers for this stream and causes any buffered data to be written to the file.
         /// </summary>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
         /// <exception cref="ObjectDisposedException">Stream is closed.</exception>
         public override void Flush()
         {
@@ -327,12 +322,12 @@ public override void Flush()
         /// <returns>
         /// The total number of bytes read into the buffer. This can be less than the number of bytes requested if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
         /// </returns>
-        /// <exception cref="T:System.ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
-        /// <exception cref="T:System.ArgumentNullException"><paramref name="buffer"/> is <c>null</c>. </exception>
-        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
-        /// <exception cref="T:System.NotSupportedException">The stream does not support reading. </exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>. </exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override int Read(byte[] buffer, int offset, int count)
         {
             var readLen = 0;
@@ -446,13 +441,13 @@ public override int ReadByte()
         /// Sets the position within the current stream.
         /// </summary>
         /// <param name="offset">A byte offset relative to the <paramref name="origin"/> parameter.</param>
-        /// <param name="origin">A value of type <see cref="T:System.IO.SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
+        /// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
         /// <returns>
         /// The new position within the current stream.
         /// </returns>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
-        /// <exception cref="T:System.NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output. </exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override long Seek(long offset, SeekOrigin origin)
         {
             long newPosn = -1;
@@ -564,9 +559,9 @@ public override long Seek(long offset, SeekOrigin origin)
         /// When overridden in a derived class, sets the length of the current stream.
         /// </summary>
         /// <param name="value">The desired length of the current stream in bytes.</param>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs.</exception>
-        /// <exception cref="T:System.NotSupportedException">The stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output.</exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        /// <exception cref="IOException">An I/O error occurs.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         /// <exception cref="ArgumentOutOfRangeException"><paramref name="value"/> must be greater than zero.</exception>
         public override void SetLength(long value)
         {
@@ -593,12 +588,12 @@ public override void SetLength(long value)
         /// <param name="buffer">An array of bytes. This method copies <paramref name="count"/> bytes from <paramref name="buffer"/> to the current stream.</param>
         /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin copying bytes to the current stream.</param>
         /// <param name="count">The number of bytes to be written to the current stream.</param>
-        /// <exception cref="T:System.ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is greater than the buffer length.</exception>
-        /// <exception cref="T:System.ArgumentNullException"><paramref name="buffer"/> is <c>null</c>.</exception>
-        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs.</exception>
-        /// <exception cref="T:System.NotSupportedException">The stream does not support writing.</exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is greater than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
+        /// <exception cref="IOException">An I/O error occurs.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support writing.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         public override void Write(byte[] buffer, int offset, int count)
         {
             if (buffer == null)
@@ -678,9 +673,9 @@ public override void Write(byte[] buffer, int offset, int count)
         /// Writes a byte to the current position in the stream and advances the position within the stream by one byte.
         /// </summary>
         /// <param name="value">The byte to write to the stream.</param>
-        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
-        /// <exception cref="T:System.NotSupportedException">The stream does not support writing, or the stream is already closed. </exception>
-        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support writing, or the stream is already closed. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override void WriteByte(byte value)
         {
             // Lock down the file stream while we do this.
@@ -710,9 +705,9 @@ public override void WriteByte(byte value)
         }
 
         /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="T:System.IO.Stream"/> and optionally releases the managed resources.
+        /// Releases the unmanaged resources used by the <see cref="Stream"/> and optionally releases the managed resources.
         /// </summary>
-        /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);

From 94d02306087085aabadb8700a3ddaa908f92408b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:12:41 +0100
Subject: [PATCH 036/128] Removed IsAsync property.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 50eb4ee2c..a9f83eb7f 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -15,7 +15,6 @@ public class SftpFileStream : Stream
         // Internal state.
         private byte[] _handle;
         private readonly bool _ownsHandle;
-        private readonly bool _isAsync;
         private ISftpSession _session;
 
         // Buffer information.
@@ -141,20 +140,6 @@ public override long Position
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the FileStream was opened asynchronously or synchronously.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if this instance is async; otherwise, <c>false</c>.
-        /// </value>
-        public virtual bool IsAsync
-        {
-            get
-            {
-                return _isAsync;
-            }
-        }
-
         /// <summary>
         /// Gets the name of the path that was used to construct the current <see cref="SftpFileStream"/>.
         /// </summary>
@@ -205,7 +190,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             // Initialize the object state.
             _session = session;
             _ownsHandle = true;
-            _isAsync = useAsync;
             _bufferPosition = 0;
             _bufferLen = 0;
             _bufferOwnedByWrite = false;

From 8a5d8edb70c1e4d177e187268f476adbb76f8dc0 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:13:49 +0100
Subject: [PATCH 037/128] Removed _ownsHandle field.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index a9f83eb7f..30a9e6a9f 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -14,7 +14,6 @@ public class SftpFileStream : Stream
         //  TODO:   Add security method to set userid, groupid and other permission settings
         // Internal state.
         private byte[] _handle;
-        private readonly bool _ownsHandle;
         private ISftpSession _session;
 
         // Buffer information.
@@ -189,7 +188,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             // Initialize the object state.
             _session = session;
-            _ownsHandle = true;
             _bufferPosition = 0;
             _bufferLen = 0;
             _bufferOwnedByWrite = false;
@@ -717,10 +715,7 @@ protected override void Dispose(bool disposing)
                                         FlushWriteBuffer();
                                     }
 
-                                    if (_ownsHandle)
-                                    {
-                                        _session.RequestClose(_handle);
-                                    }
+                                    _session.RequestClose(_handle);
                                 }
 
                                 _handle = null;

From 54fbd8f5ba4f53172a9d850ca32741b513903ce7 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:15:24 +0100
Subject: [PATCH 038/128] Do not initialize fields to default values.

---
 ...st_DisposeShouldUnblockReadAndReadAhead.cs | 99 +++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                 |  1 +
 src/Renci.SshNet/Common/SemaphoreLight.cs     | 49 +++++++++
 src/Renci.SshNet/IServiceFactory.cs           |  6 +-
 src/Renci.SshNet/ServiceFactory.cs            | 23 ++++-
 src/Renci.SshNet/Sftp/ISftpSession.cs         | 12 ++-
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 43 +++++++-
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  6 --
 src/Renci.SshNet/Sftp/SftpSession.cs          | 25 +----
 src/Renci.SshNet/SftpClient.cs                |  6 +-
 10 files changed, 226 insertions(+), 44 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
new file mode 100644
index 000000000..94309127e
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -0,0 +1,99 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private MockSequence _seq;
+        private byte[] _handle;
+        private int _fileSize;
+        private SftpFileReader _reader;
+        private ObjectDisposedException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _fileSize = 5000;
+        }
+
+        protected override void SetupMocks()
+        {
+            _seq = new MockSequence();
+
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 1, _fileSize);
+        }
+
+        protected override void Act()
+        {
+            ThreadAbstraction.ExecuteThread(() =>
+            {
+                Thread.Sleep(500);
+                _reader.Dispose();
+            });
+
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveThrownObjectDisposedException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreEqual(typeof(SftpFileReader).FullName, _actualException.ObjectName);
+        }
+
+        [TestMethod]
+        public void ReadAfterDisposeShouldThrowObjectDisposedException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCompleteImmediately()
+        {
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 5ca58ca8a..594a34d5d 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -341,6 +341,7 @@
     <Compile Include="Classes\SftpClientTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\SftpClientTest_Finalize_Connected.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTestBase.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs" />
diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 19fa79649..0a0e69121 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -76,5 +76,54 @@ public void Wait()
                 Monitor.Pulse(_lock);
             }
         }
+
+        /// <summary>
+        /// Blocks the current thread until it can either enter the <see cref="SemaphoreLight"/>,
+        /// or until the specified timeout has expired.
+        /// </summary>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        public bool Wait(TimeSpan timeout)
+        {
+            var timeoutInMilliseconds = timeout.TotalMilliseconds;
+            if (timeoutInMilliseconds < -1d || timeoutInMilliseconds > int.MaxValue)
+                throw new ArgumentOutOfRangeException("timeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
+
+            lock (_lock)
+            {
+                if (timeoutInMilliseconds == -1)
+                {
+                    while (_currentCount < 1)
+                        Monitor.Wait(_lock);
+                }
+                else
+                {
+                    if (_currentCount < 1)
+                    {
+                        var remainingTimeInMilliseconds = (int) timeoutInMilliseconds;
+                        var startTicks = Environment.TickCount;
+
+                        while (_currentCount < 1)
+                        {
+                            if (!Monitor.Wait(_lock, remainingTimeInMilliseconds))
+                            {
+                                return false;
+                            }
+
+                            var elapsed = Environment.TickCount - startTicks;
+                            remainingTimeInMilliseconds -= elapsed;
+                            if (remainingTimeInMilliseconds < 0)
+                                return false;
+                        }
+                    }
+                }
+
+                _currentCount--;
+
+                Monitor.Pulse(_lock);
+
+                return true;
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 84d4e7d0e..2aa282f25 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -58,10 +58,6 @@ internal partial interface IServiceFactory
         /// <exception cref="SshConnectionException">No key exchange algorithm is supported by both client and server.</exception>
         IKeyExchange CreateKeyExchange(IDictionary<string, Type> clientAlgorithms, string[] serverAlgorithms);
 
-        ISftpFileReader CreateSftpFileReader(byte[] handle,
-                                             ISftpSession sftpSession,
-                                             uint chunkSize,
-                                             int maxPendingReads,
-                                             long? fileSize);
+        ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize);
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index fc496586f..3ed76cd78 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -97,9 +97,28 @@ from s in serverAlgorithms
             return keyExchangeAlgorithmType.CreateInstance<IKeyExchange>();
         }
 
-        public ISftpFileReader CreateSftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
+        public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize)
         {
-            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
+            var handle = sftpSession.RequestOpen(fileName, Flags.Read);
+
+            long? fileSize;
+            int maxPendingReads;
+
+            var chunkSize = sftpSession.CalculateOptimalReadLength(bufferSize);
+
+            var fileAttributes = sftpSession.RequestFStat(handle, true);
+            if (fileAttributes == null)
+            {
+                fileSize = null;
+                maxPendingReads = 5;
+            }
+            else
+            {
+                fileSize = fileAttributes.Size;
+                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
+            }
+
+            return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 67782e30b..a81a1ff16 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -48,6 +48,16 @@ internal interface ISftpSession : ISubsystemSession
         /// </returns>
         SftpFileAttributes RequestFStat(byte[] handle, bool nullOnError);
 
+        /// <summary>
+        /// Performs SSH_FXP_STAT request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="nullOnError">if set to <c>true</c> returns null instead of throwing an exception.</param>
+        /// <returns>
+        /// File attributes
+        /// </returns>
+        SftpFileAttributes RequestStat(string path, bool nullOnError = false);
+
         /// <summary>
         /// Performs SSH_FXP_LSTAT request.
         /// </summary>
@@ -224,6 +234,6 @@ void RequestWrite(byte[] handle,
         /// </remarks>
         uint CalculateOptimalWriteLength(uint bufferSize, byte[] handle);
 
-        ISftpFileReader CreateFileReader(string fileName, uint bufferSize);
+        ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize);
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 559197b19..6502a3a56 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -1,4 +1,6 @@
-using Renci.SshNet.Abstractions;
+//#define READAHEAD_DISPOSE
+
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using System;
 using System.Collections.Generic;
@@ -8,6 +10,11 @@ namespace Renci.SshNet.Sftp
 {
     internal class SftpFileReader : ISftpFileReader
     {
+#if READAHEAD_DISPOSE
+        private static readonly TimeSpan ReadAheadCompleteTimeout = TimeSpan.FromSeconds(5);
+        private static readonly TimeSpan ReadAheadSemaphoreWaitTimeout = TimeSpan.FromMilliseconds(1000);
+#endif // READAHEAD_DISPOSE
+
         private readonly byte[] _handle;
         private readonly ISftpSession _sftpSession;
         private readonly uint _chunkSize;
@@ -83,6 +90,9 @@ public byte[] Read()
                 if (_exception != null)
                     throw _exception;
 
+                //if (_disposed)
+                //    throw new ObjectDisposedException(GetType().FullName);
+
                 if (nextChunk.Offset == _offset)
                 {
                     var data = nextChunk.Data;
@@ -168,23 +178,31 @@ public void Dispose()
 
         protected void Dispose(bool disposing)
         {
+            if (_disposed)
+                return;
+
             if (disposing)
             {
+                _disposed = true;
+
+#if READAHEAD_DISPOSE
                 var readAheadCompleted = _readAheadCompleted;
                 if (readAheadCompleted != null)
                 {
-                    if (!readAheadCompleted.WaitOne(TimeSpan.FromSeconds(1)))
+                    if (!readAheadCompleted.WaitOne(ReadAheadCompleteTimeout))
                     {
-                        DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
+                        throw new Exception();
+                        //DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
                     }
                     readAheadCompleted.Dispose();
                     _readAheadCompleted = null;
                 }
+#endif // READAHEAD_DISPOSE
 
                 _sftpSession.RequestClose(_handle);
-
-                _disposed = true;
             }
+
+            _disposed = true;
         }
 
         private void StartReadAhead()
@@ -197,7 +215,22 @@ private void StartReadAhead()
                     // TODO implement cancellation!?
                     // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
                     // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
+#if READAHEAD_DISPOSE
+                    if (!_semaphore.Wait(ReadAheadSemaphoreWaitTimeout))
+                    {
+                        if (_disposed)
+                        {
+                            lock (_readLock)
+                            {
+                                Monitor.Pulse(_readLock);
+                            }
+                            break;
+                        }
+                        continue;
+                    }
+#else
                     _semaphore.Wait();
+#endif // READAHEAD_DISPOSE
 
                     // don't bother reading any more chunks if we received EOF, or an exception has occurred
                     // while processing a chunk
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 30a9e6a9f..dc74c2825 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -188,14 +188,9 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             // Initialize the object state.
             _session = session;
-            _bufferPosition = 0;
-            _bufferLen = 0;
-            _bufferOwnedByWrite = false;
             _canRead = ((access & FileAccess.Read) != 0);
             _canSeek = true;
             _canWrite = ((access & FileAccess.Write) != 0);
-            _position = 0;
-            _serverFilePosition = 0;
 
             var flags = Flags.None;
 
@@ -258,7 +253,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             if (mode == FileMode.Append)
             {
-                _attributes = _session.RequestFStat(_handle, false);
                 _position = _attributes.Size;
                 _serverFilePosition = (ulong) _attributes.Size;
             }
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index a6ecaa301..faecf7d2b 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -130,28 +130,9 @@ public string GetCanonicalPath(string path)
             return string.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", canonizedPath, slash, pathParts[pathParts.Length - 1]);
         }
 
-        public ISftpFileReader CreateFileReader(string fileName, uint bufferSize)
+        public ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
         {
-            var handle = RequestOpen(fileName, Flags.Read);
-
-            long? fileSize;
-            int maxPendingReads;
-
-            var chunkSize = CalculateOptimalReadLength(bufferSize);
-
-            var fileAttributes = RequestFStat(handle, true);
-            if (fileAttributes == null)
-            {
-                fileSize = null;
-                maxPendingReads = 5;
-            }
-            else
-            {
-                fileSize = fileAttributes.Size;
-                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
-            }
-
-            return _serviceFactory.CreateSftpFileReader(handle, this, chunkSize, maxPendingReads, fileSize);
+            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
 
         internal string GetFullRemotePath(string path)
@@ -922,7 +903,7 @@ internal KeyValuePair<string, SftpFileAttributes>[] RequestRealPath(string path,
         /// <returns>
         /// File attributes
         /// </returns>
-        internal SftpFileAttributes RequestStat(string path, bool nullOnError = false)
+        public SftpFileAttributes RequestStat(string path, bool nullOnError = false)
         {
             SshException exception = null;
 
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 0cbd68a77..e3ab75015 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -537,7 +537,7 @@ public SftpFile Get(string path)
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            var attributes = _sftpSession.RequestLStat(fullPath);
+            var attributes = _sftpSession.RequestStat(fullPath);
 
             return new SftpFile(_sftpSession, fullPath, attributes);
         }
@@ -1498,7 +1498,7 @@ public IEnumerable<string> ReadLines(string path, Encoding encoding)
         /// Sets the date and time the specified file was last accessed.
         /// </summary>
         /// <param name="path">The file for which to set the access date and time information.</param>
-        /// <param name="lastAccessTime">A <see cref="System.DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
+        /// <param name="lastAccessTime">A <see cref="DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastAccessTime(string path, DateTime lastAccessTime)
         {
@@ -1995,7 +1995,7 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            using (var fileReader = _sftpSession.CreateFileReader(fullPath, _bufferSize))
+            using (var fileReader = ServiceFactory.CreateSftpFileReader(fullPath, _sftpSession, _bufferSize))
             {
                 var totalBytesRead = 0UL;
 

From eb39b69b34b39ce7947c5f57154070ad40fcd14e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:16:10 +0100
Subject: [PATCH 039/128] Revert "Do not initialize fields to default values."

This reverts commit 54fbd8f5ba4f53172a9d850ca32741b513903ce7.
---
 ...st_DisposeShouldUnblockReadAndReadAhead.cs | 99 -------------------
 .../Renci.SshNet.Tests.csproj                 |  1 -
 src/Renci.SshNet/Common/SemaphoreLight.cs     | 49 ---------
 src/Renci.SshNet/IServiceFactory.cs           |  6 +-
 src/Renci.SshNet/ServiceFactory.cs            | 23 +----
 src/Renci.SshNet/Sftp/ISftpSession.cs         | 12 +--
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 43 +-------
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  6 ++
 src/Renci.SshNet/Sftp/SftpSession.cs          | 25 ++++-
 src/Renci.SshNet/SftpClient.cs                |  6 +-
 10 files changed, 44 insertions(+), 226 deletions(-)
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
deleted file mode 100644
index 94309127e..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Abstractions;
-using Renci.SshNet.Sftp;
-using System;
-using System.Diagnostics;
-using System.Threading;
-using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead : SftpFileReaderTestBase
-    {
-        private const int ChunkLength = 32 * 1024;
-
-        private MockSequence _seq;
-        private byte[] _handle;
-        private int _fileSize;
-        private SftpFileReader _reader;
-        private ObjectDisposedException _actualException;
-
-        protected override void SetupData()
-        {
-            var random = new Random();
-
-            _handle = CreateByteArray(random, 5);
-            _fileSize = 5000;
-        }
-
-        protected override void SetupMocks()
-        {
-            _seq = new MockSequence();
-
-            SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
-                           .Returns((SftpReadAsyncResult)null);
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
-        }
-
-        protected override void Arrange()
-        {
-            base.Arrange();
-
-            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 1, _fileSize);
-        }
-
-        protected override void Act()
-        {
-            ThreadAbstraction.ExecuteThread(() =>
-            {
-                Thread.Sleep(500);
-                _reader.Dispose();
-            });
-
-            try
-            {
-                _reader.Read();
-                Assert.Fail();
-            }
-            catch (ObjectDisposedException ex)
-            {
-                _actualException = ex;
-            }
-        }
-
-        [TestMethod]
-        public void ReadShouldHaveThrownObjectDisposedException()
-        {
-            Assert.IsNotNull(_actualException);
-            Assert.AreEqual(typeof(SftpFileReader).FullName, _actualException.ObjectName);
-        }
-
-        [TestMethod]
-        public void ReadAfterDisposeShouldThrowObjectDisposedException()
-        {
-            try
-            {
-                _reader.Read();
-                Assert.Fail();
-            }
-            catch (ObjectDisposedException ex)
-            {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
-            }
-        }
-
-        [TestMethod]
-        public void DisposeShouldCompleteImmediately()
-        {
-            var stopwatch = Stopwatch.StartNew();
-            _reader.Dispose();
-            stopwatch.Stop();
-
-            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 594a34d5d..5ca58ca8a 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -341,7 +341,6 @@
     <Compile Include="Classes\SftpClientTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\SftpClientTest_Finalize_Connected.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTestBase.cs" />
-    <Compile Include="Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs" />
diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 0a0e69121..19fa79649 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -76,54 +76,5 @@ public void Wait()
                 Monitor.Pulse(_lock);
             }
         }
-
-        /// <summary>
-        /// Blocks the current thread until it can either enter the <see cref="SemaphoreLight"/>,
-        /// or until the specified timeout has expired.
-        /// </summary>
-        /// <param name="timeout"></param>
-        /// <returns></returns>
-        public bool Wait(TimeSpan timeout)
-        {
-            var timeoutInMilliseconds = timeout.TotalMilliseconds;
-            if (timeoutInMilliseconds < -1d || timeoutInMilliseconds > int.MaxValue)
-                throw new ArgumentOutOfRangeException("timeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
-
-            lock (_lock)
-            {
-                if (timeoutInMilliseconds == -1)
-                {
-                    while (_currentCount < 1)
-                        Monitor.Wait(_lock);
-                }
-                else
-                {
-                    if (_currentCount < 1)
-                    {
-                        var remainingTimeInMilliseconds = (int) timeoutInMilliseconds;
-                        var startTicks = Environment.TickCount;
-
-                        while (_currentCount < 1)
-                        {
-                            if (!Monitor.Wait(_lock, remainingTimeInMilliseconds))
-                            {
-                                return false;
-                            }
-
-                            var elapsed = Environment.TickCount - startTicks;
-                            remainingTimeInMilliseconds -= elapsed;
-                            if (remainingTimeInMilliseconds < 0)
-                                return false;
-                        }
-                    }
-                }
-
-                _currentCount--;
-
-                Monitor.Pulse(_lock);
-
-                return true;
-            }
-        }
     }
 }
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 2aa282f25..84d4e7d0e 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -58,6 +58,10 @@ internal partial interface IServiceFactory
         /// <exception cref="SshConnectionException">No key exchange algorithm is supported by both client and server.</exception>
         IKeyExchange CreateKeyExchange(IDictionary<string, Type> clientAlgorithms, string[] serverAlgorithms);
 
-        ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize);
+        ISftpFileReader CreateSftpFileReader(byte[] handle,
+                                             ISftpSession sftpSession,
+                                             uint chunkSize,
+                                             int maxPendingReads,
+                                             long? fileSize);
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index 3ed76cd78..fc496586f 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -97,28 +97,9 @@ from s in serverAlgorithms
             return keyExchangeAlgorithmType.CreateInstance<IKeyExchange>();
         }
 
-        public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize)
+        public ISftpFileReader CreateSftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
         {
-            var handle = sftpSession.RequestOpen(fileName, Flags.Read);
-
-            long? fileSize;
-            int maxPendingReads;
-
-            var chunkSize = sftpSession.CalculateOptimalReadLength(bufferSize);
-
-            var fileAttributes = sftpSession.RequestFStat(handle, true);
-            if (fileAttributes == null)
-            {
-                fileSize = null;
-                maxPendingReads = 5;
-            }
-            else
-            {
-                fileSize = fileAttributes.Size;
-                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
-            }
-
-            return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
+            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index a81a1ff16..67782e30b 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -48,16 +48,6 @@ internal interface ISftpSession : ISubsystemSession
         /// </returns>
         SftpFileAttributes RequestFStat(byte[] handle, bool nullOnError);
 
-        /// <summary>
-        /// Performs SSH_FXP_STAT request.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="nullOnError">if set to <c>true</c> returns null instead of throwing an exception.</param>
-        /// <returns>
-        /// File attributes
-        /// </returns>
-        SftpFileAttributes RequestStat(string path, bool nullOnError = false);
-
         /// <summary>
         /// Performs SSH_FXP_LSTAT request.
         /// </summary>
@@ -234,6 +224,6 @@ void RequestWrite(byte[] handle,
         /// </remarks>
         uint CalculateOptimalWriteLength(uint bufferSize, byte[] handle);
 
-        ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize);
+        ISftpFileReader CreateFileReader(string fileName, uint bufferSize);
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 6502a3a56..559197b19 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -1,6 +1,4 @@
-//#define READAHEAD_DISPOSE
-
-using Renci.SshNet.Abstractions;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using System;
 using System.Collections.Generic;
@@ -10,11 +8,6 @@ namespace Renci.SshNet.Sftp
 {
     internal class SftpFileReader : ISftpFileReader
     {
-#if READAHEAD_DISPOSE
-        private static readonly TimeSpan ReadAheadCompleteTimeout = TimeSpan.FromSeconds(5);
-        private static readonly TimeSpan ReadAheadSemaphoreWaitTimeout = TimeSpan.FromMilliseconds(1000);
-#endif // READAHEAD_DISPOSE
-
         private readonly byte[] _handle;
         private readonly ISftpSession _sftpSession;
         private readonly uint _chunkSize;
@@ -90,9 +83,6 @@ public byte[] Read()
                 if (_exception != null)
                     throw _exception;
 
-                //if (_disposed)
-                //    throw new ObjectDisposedException(GetType().FullName);
-
                 if (nextChunk.Offset == _offset)
                 {
                     var data = nextChunk.Data;
@@ -178,31 +168,23 @@ public void Dispose()
 
         protected void Dispose(bool disposing)
         {
-            if (_disposed)
-                return;
-
             if (disposing)
             {
-                _disposed = true;
-
-#if READAHEAD_DISPOSE
                 var readAheadCompleted = _readAheadCompleted;
                 if (readAheadCompleted != null)
                 {
-                    if (!readAheadCompleted.WaitOne(ReadAheadCompleteTimeout))
+                    if (!readAheadCompleted.WaitOne(TimeSpan.FromSeconds(1)))
                     {
-                        throw new Exception();
-                        //DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
+                        DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
                     }
                     readAheadCompleted.Dispose();
                     _readAheadCompleted = null;
                 }
-#endif // READAHEAD_DISPOSE
 
                 _sftpSession.RequestClose(_handle);
-            }
 
-            _disposed = true;
+                _disposed = true;
+            }
         }
 
         private void StartReadAhead()
@@ -215,22 +197,7 @@ private void StartReadAhead()
                     // TODO implement cancellation!?
                     // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
                     // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
-#if READAHEAD_DISPOSE
-                    if (!_semaphore.Wait(ReadAheadSemaphoreWaitTimeout))
-                    {
-                        if (_disposed)
-                        {
-                            lock (_readLock)
-                            {
-                                Monitor.Pulse(_readLock);
-                            }
-                            break;
-                        }
-                        continue;
-                    }
-#else
                     _semaphore.Wait();
-#endif // READAHEAD_DISPOSE
 
                     // don't bother reading any more chunks if we received EOF, or an exception has occurred
                     // while processing a chunk
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index dc74c2825..30a9e6a9f 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -188,9 +188,14 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             // Initialize the object state.
             _session = session;
+            _bufferPosition = 0;
+            _bufferLen = 0;
+            _bufferOwnedByWrite = false;
             _canRead = ((access & FileAccess.Read) != 0);
             _canSeek = true;
             _canWrite = ((access & FileAccess.Write) != 0);
+            _position = 0;
+            _serverFilePosition = 0;
 
             var flags = Flags.None;
 
@@ -253,6 +258,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             if (mode == FileMode.Append)
             {
+                _attributes = _session.RequestFStat(_handle, false);
                 _position = _attributes.Size;
                 _serverFilePosition = (ulong) _attributes.Size;
             }
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index faecf7d2b..a6ecaa301 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -130,9 +130,28 @@ public string GetCanonicalPath(string path)
             return string.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", canonizedPath, slash, pathParts[pathParts.Length - 1]);
         }
 
-        public ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
+        public ISftpFileReader CreateFileReader(string fileName, uint bufferSize)
         {
-            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
+            var handle = RequestOpen(fileName, Flags.Read);
+
+            long? fileSize;
+            int maxPendingReads;
+
+            var chunkSize = CalculateOptimalReadLength(bufferSize);
+
+            var fileAttributes = RequestFStat(handle, true);
+            if (fileAttributes == null)
+            {
+                fileSize = null;
+                maxPendingReads = 5;
+            }
+            else
+            {
+                fileSize = fileAttributes.Size;
+                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
+            }
+
+            return _serviceFactory.CreateSftpFileReader(handle, this, chunkSize, maxPendingReads, fileSize);
         }
 
         internal string GetFullRemotePath(string path)
@@ -903,7 +922,7 @@ internal KeyValuePair<string, SftpFileAttributes>[] RequestRealPath(string path,
         /// <returns>
         /// File attributes
         /// </returns>
-        public SftpFileAttributes RequestStat(string path, bool nullOnError = false)
+        internal SftpFileAttributes RequestStat(string path, bool nullOnError = false)
         {
             SshException exception = null;
 
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index e3ab75015..0cbd68a77 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -537,7 +537,7 @@ public SftpFile Get(string path)
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            var attributes = _sftpSession.RequestStat(fullPath);
+            var attributes = _sftpSession.RequestLStat(fullPath);
 
             return new SftpFile(_sftpSession, fullPath, attributes);
         }
@@ -1498,7 +1498,7 @@ public IEnumerable<string> ReadLines(string path, Encoding encoding)
         /// Sets the date and time the specified file was last accessed.
         /// </summary>
         /// <param name="path">The file for which to set the access date and time information.</param>
-        /// <param name="lastAccessTime">A <see cref="DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
+        /// <param name="lastAccessTime">A <see cref="System.DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastAccessTime(string path, DateTime lastAccessTime)
         {
@@ -1995,7 +1995,7 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            using (var fileReader = ServiceFactory.CreateSftpFileReader(fullPath, _sftpSession, _bufferSize))
+            using (var fileReader = _sftpSession.CreateFileReader(fullPath, _bufferSize))
             {
                 var totalBytesRead = 0UL;
 

From 774951e0c44037332587add13655f746f5e6257b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 16:17:21 +0100
Subject: [PATCH 040/128] Do not initialize fields with default values.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 30a9e6a9f..dc74c2825 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -188,14 +188,9 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             // Initialize the object state.
             _session = session;
-            _bufferPosition = 0;
-            _bufferLen = 0;
-            _bufferOwnedByWrite = false;
             _canRead = ((access & FileAccess.Read) != 0);
             _canSeek = true;
             _canWrite = ((access & FileAccess.Write) != 0);
-            _position = 0;
-            _serverFilePosition = 0;
 
             var flags = Flags.None;
 
@@ -258,7 +253,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             if (mode == FileMode.Append)
             {
-                _attributes = _session.RequestFStat(_handle, false);
                 _position = _attributes.Size;
                 _serverFilePosition = (ulong) _attributes.Size;
             }

From 51bd8fa6fd4a2ee46534ffcf2dcbecfe154818b9 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 3 Feb 2017 18:43:50 +0100
Subject: [PATCH 041/128] Removed IsEof from SftpDataResponse.

---
 src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
index d07ab2e2a..610f90b3e 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
@@ -9,8 +9,6 @@ public override SftpMessageTypes SftpMessageType
 
         public byte[] Data { get; private set; }
 
-        public bool IsEof { get; private set; }
-
         public SftpDataResponse(uint protocolVersion)
             : base(protocolVersion)
         {
@@ -21,11 +19,6 @@ protected override void LoadData()
             base.LoadData();
             
             Data = ReadBinary();
-
-            if (!IsEndOfData)
-            {
-                IsEof = ReadBoolean();
-            }
         }
     }
 }

From bea764f812d67877d029af2cde78988dab0719c5 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 4 Feb 2017 13:39:14 +0100
Subject: [PATCH 042/128] Remove EndInvoke with timeout as we use the
 IAsyncResult.AsyncWaitHandle for this.

---
 src/Renci.SshNet/Common/AsyncResult.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Renci.SshNet/Common/AsyncResult.cs b/src/Renci.SshNet/Common/AsyncResult.cs
index 066f4015c..700285972 100644
--- a/src/Renci.SshNet/Common/AsyncResult.cs
+++ b/src/Renci.SshNet/Common/AsyncResult.cs
@@ -78,20 +78,12 @@ public void SetAsCompleted(Exception exception, bool completedSynchronously)
         /// Waits until the asynchronous operation completes, and then returns. 
         /// </summary>
         internal void EndInvoke()
-        {
-            EndInvoke(Session.InfiniteTimeSpan);
-        }
-
-        /// <summary>
-        /// Waits until the asynchronous operation completes, and then returns. 
-        /// </summary>
-        internal void EndInvoke(TimeSpan timeout)
         {
             // This method assumes that only 1 thread calls EndInvoke for this object
             if (!IsCompleted)
             {
                 // If the operation isn't done, wait for it
-                var completed = AsyncWaitHandle.WaitOne(timeout);
+                AsyncWaitHandle.WaitOne();
                 _asyncWaitHandle = null;  // Allow early GC
                 AsyncWaitHandle.Dispose();
 
@@ -161,6 +153,7 @@ public bool IsCompleted
         {
             get { return _completedState != StatePending; }
         }
+
         #endregion
     }
 

From 7e72af810cf8461163b05e17dcdfcec6c4018c1e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 4 Feb 2017 13:39:50 +0100
Subject: [PATCH 043/128] Implement Wait with timeout.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs | 72 +++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 19fa79649..c5cb25d9d 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -76,5 +76,77 @@ public void Wait()
                 Monitor.Pulse(_lock);
             }
         }
+
+        /// <summary>
+        /// Blocks the current thread until it can enter the <see cref="SemaphoreLight"/>, using a 32-bit signed
+        /// integer that specifies the timeout.
+        /// </summary>
+        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Infinite(-1) to wait indefinitely.</param>
+        /// <returns>
+        /// <c>true</c> if the current thread successfully entered the <see cref="SemaphoreLight"/>; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Wait(int millisecondsTimeout)
+        {
+            if (millisecondsTimeout < -1)
+                throw new ArgumentOutOfRangeException("millisecondsTimeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
+
+            return WaitWithTimeout(millisecondsTimeout);
+        }
+
+        /// <summary>
+        /// Blocks the current thread until it can enter the <see cref="SemaphoreLight"/>, using a <see cref="TimeSpan"/>
+        /// to specify the timeout.
+        /// </summary>
+        /// <param name="timeout">A <see cref="TimeSpan"/> that represents the number of milliseconds to wait, or a <see cref="TimeSpan"/> that represents -1 milliseconds to wait indefinitely.</param>
+        /// <returns>
+        /// <c>true</c> if the current thread successfully entered the <see cref="SemaphoreLight"/>; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Wait(TimeSpan timeout)
+        {
+            var timeoutInMilliseconds = timeout.TotalMilliseconds;
+            if (timeoutInMilliseconds < -1d || timeoutInMilliseconds > int.MaxValue)
+                throw new ArgumentOutOfRangeException("timeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
+
+            return WaitWithTimeout((int) timeoutInMilliseconds);
+        }
+
+        private bool WaitWithTimeout(int timeoutInMilliseconds)
+        {
+            lock (_lock)
+            {
+                if (timeoutInMilliseconds == Session.Infinite)
+                {
+                    while (_currentCount < 1)
+                        Monitor.Wait(_lock);
+                }
+                else
+                {
+                    if (_currentCount < 1)
+                    {
+                        var remainingTimeInMilliseconds = timeoutInMilliseconds;
+                        var startTicks = Environment.TickCount;
+
+                        while (_currentCount < 1)
+                        {
+                            if (!Monitor.Wait(_lock, remainingTimeInMilliseconds))
+                            {
+                                return false;
+                            }
+
+                            var elapsed = Environment.TickCount - startTicks;
+                            remainingTimeInMilliseconds -= elapsed;
+                            if (remainingTimeInMilliseconds < 0)
+                                return false;
+                        }
+                    }
+                }
+
+                _currentCount--;
+
+                Monitor.Pulse(_lock);
+
+                return true;
+            }
+        }
     }
 }

From 35233fc82200bcd64e3f5513fa14d616ca561f8c Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 4 Feb 2017 21:39:11 +0100
Subject: [PATCH 044/128] Added async methods for SSH_FXP_OPEN,
 SSH_FXP_REALPATH, SSH_FXP_STAT and SSH_FXP_LSTAT. Improve SftpFileReader to
 no longer block when the session is broken, and improve performance by using
 async methods to open file and obtain file attributes. Internally use an
 Int32 based timeout (expressed in milliseconds) to eliminate numerous
 conversions in hot paths.

---
 .../Renci.SshNet.NET35.csproj                 |  15 +-
 .../NetConfClientTest_Dispose_Connected.cs    |  10 +-
 .../NetConfClientTest_Dispose_Disconnected.cs |  10 +-
 .../NetConfClientTest_Dispose_Disposed.cs     |  10 +-
 .../NetConfClientTest_Finalize_Connected.cs   |   7 +-
 ...st_DisposeShouldUnblockReadAndReadAhead.cs | 111 ++++++++
 ...ReaderTest_LastChunkBeforeEofIsComplete.cs |  12 +
 ...eReaderTest_LastChunkBeforeEofIsPartial.cs |  12 +
 ...iousChunkIsIncompleteAndEofIsNotReached.cs |  20 ++
 ...reviousChunkIsIncompleteAndEofIsReached.cs |  11 +
 ...eReaderTest_ReadAheadBeginReadException.cs |   7 +-
 ...vokeException_DiscardsFurtherReadAheads.cs |  20 +-
 ...vokeException_PreventsFurtherReadAheads.cs |  28 +-
 ...dExceptionInWaitOnHandle_ChunkAvailable.cs | 123 +++++++++
 ...xceptionInWaitOnHandle_NoChunkAvailable.cs | 107 ++++++++
 ...est_Read_ReahAheadExceptionInBeginRead.cs} |  12 +-
 .../SftpSessionTest_Connected_RequestRead.cs  |   4 +-
 ...ftpSessionTest_Connected_RequestStatVfs.cs |   4 +-
 .../SftpClientTest_Dispose_Connected.cs       |   6 +-
 .../SftpClientTest_Dispose_Disconnected.cs    |   6 +-
 .../SftpClientTest_Dispose_Disposed.cs        |   6 +-
 .../SftpClientTest_Finalize_Connected.cs      |   6 +-
 .../Classes/SubsystemSessionStub.cs           |   3 +-
 .../SubsystemSession_Connect_Connected.cs     |   4 +-
 .../SubsystemSession_Connect_Disconnected.cs  |   4 +-
 .../SubsystemSession_Connect_Disposed.cs      |   4 +-
 .../SubsystemSession_Disconnect_Connected.cs  |   4 +-
 .../SubsystemSession_Disconnect_Disposed.cs   |   4 +-
 ...systemSession_Disconnect_NeverConnected.cs |   4 +-
 .../SubsystemSession_Dispose_Connected.cs     |   4 +-
 .../SubsystemSession_Dispose_Disconnected.cs  |   4 +-
 .../SubsystemSession_Dispose_Disposed.cs      |   4 +-
 ...SubsystemSession_Dispose_NeverConnected.cs |   4 +-
 ...Session_OnChannelDataReceived_Connected.cs |   4 +-
 ...mSession_OnChannelDataReceived_Disposed.cs |   4 +-
 ...elDataReceived_OnDataReceived_Exception.cs |   4 +-
 ...temSession_OnChannelException_Connected.cs |   4 +-
 ...stemSession_OnChannelException_Disposed.cs |   4 +-
 ...Session_OnSessionDisconnected_Connected.cs |   4 +-
 ...mSession_OnSessionDisconnected_Disposed.cs |   4 +-
 ...ession_OnSessionErrorOccurred_Connected.cs |   4 +-
 ...Session_OnSessionErrorOccurred_Disposed.cs |   4 +-
 .../SubsystemSession_SendData_Connected.cs    |   4 +-
 .../SubsystemSession_SendData_Disposed.cs     |   4 +-
 ...ubsystemSession_SendData_NeverConnected.cs |   4 +-
 .../Renci.SshNet.Tests.csproj                 |   5 +-
 src/Renci.SshNet/Common/SemaphoreLight.cs     |  95 ++++++-
 src/Renci.SshNet/IServiceFactory.NET.cs       |   7 +-
 src/Renci.SshNet/IServiceFactory.cs           |  10 +-
 src/Renci.SshNet/ISubsystemSession.cs         |  14 +-
 src/Renci.SshNet/NetConfClient.cs             |  18 +-
 src/Renci.SshNet/Netconf/NetConfSession.cs    |   4 +-
 src/Renci.SshNet/Renci.SshNet.csproj          |   4 +
 src/Renci.SshNet/ServiceFactory.NET.cs        |   7 +-
 src/Renci.SshNet/ServiceFactory.cs            |  36 ++-
 src/Renci.SshNet/Sftp/ISftpSession.cs         | 101 +++++++-
 src/Renci.SshNet/Sftp/SFtpStatAsyncResult.cs  |  12 +
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 142 +++++++---
 src/Renci.SshNet/Sftp/SftpOpenAsyncResult.cs  |  12 +
 .../Sftp/SftpOpenDirAsyncResult.cs            |  12 +
 .../Sftp/SftpRealPathAsyncResult.cs           |  12 +
 src/Renci.SshNet/Sftp/SftpSession.cs          | 243 ++++++++++++++++--
 src/Renci.SshNet/SftpClient.cs                |  91 +++----
 src/Renci.SshNet/SubsystemSession.cs          |  19 +-
 64 files changed, 1228 insertions(+), 254 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
 rename src/Renci.SshNet.Tests/Classes/Sftp/{SftpFileReaderTest_Read_ExceptionInReadAhead.cs => SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs} (92%)
 create mode 100644 src/Renci.SshNet/Sftp/SFtpStatAsyncResult.cs
 create mode 100644 src/Renci.SshNet/Sftp/SftpOpenAsyncResult.cs
 create mode 100644 src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs
 create mode 100644 src/Renci.SshNet/Sftp/SftpRealPathAsyncResult.cs

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 43d6928ba..ff5bf972a 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -36,6 +36,7 @@
     <NoWarn>
     </NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -883,12 +884,24 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenDirAsyncResult.cs">
+      <Link>Sftp\SftpOpenDirAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
@@ -931,7 +944,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
index 8a3088d3e..ad0cf531a 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.NetConf;
+using System;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -9,9 +10,10 @@ public class NetConfClientTest_Dispose_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<INetConfSession> _netConfSessionMock;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -32,7 +34,9 @@ protected void Arrange()
             _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+            _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
@@ -40,7 +44,7 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout))
+                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
                 .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -59,7 +63,7 @@ protected void Act()
         [TestMethod]
         public void CreateNetConfSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
index 615079c97..24b495d72 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.NetConf;
+using System;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -9,9 +10,10 @@ public class NetConfClientTest_Dispose_Disconnected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<INetConfSession> _netConfSessionMock;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -32,7 +34,9 @@ protected void Arrange()
             _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+            _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
@@ -40,7 +44,7 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout))
+                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
                 .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -61,7 +65,7 @@ protected void Act()
         [TestMethod]
         public void CreateNetConfSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
index 8858e614c..7439ed755 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.NetConf;
+using System;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -9,9 +10,10 @@ public class NetConfClientTest_Dispose_Disposed
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<INetConfSession> _netConfSessionMock;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -32,7 +34,9 @@ protected void Arrange()
             _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+            _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
@@ -40,7 +44,7 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout))
+                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
                 .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -60,7 +64,7 @@ protected void Act()
         [TestMethod]
         public void CreateNetConfSessionOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
index 726d9e3e0..fb17e3535 100644
--- a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Finalize_Connected.cs
@@ -10,9 +10,10 @@ public class NetConfClientTest_Finalize_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<INetConfSession> _netConfSessionMock;
         private NetConfClient _netConfClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<INetConfSession> _netConfSessionMock;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -28,7 +29,9 @@ protected void Arrange()
             _netConfSessionMock = new Mock<INetConfSession>(MockBehavior.Loose);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
+            _operationTimeout = new Random().Next(1000, 10000);
             _netConfClient = new NetConfClient(_connectionInfo, false, _serviceFactoryMock.Object);
+            _netConfClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
@@ -36,7 +39,7 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _netConfClient.OperationTimeout))
+                .Setup(p => p.CreateNetConfSession(_sessionMock.Object, _operationTimeout))
                 .Returns(_netConfSessionMock.Object);
             _netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
new file mode 100644
index 000000000..0e98cc16a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -0,0 +1,111 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private MockSequence _seq;
+        private byte[] _handle;
+        private int _fileSize;
+        private int _operationTimeout;
+        private SftpFileReader _reader;
+        private ObjectDisposedException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _fileSize = 5000;
+            _operationTimeout = random.Next();
+        }
+
+        protected override void SetupMocks()
+        {
+            _seq = new MockSequence();
+
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 1, _fileSize);
+        }
+
+        protected override void Act()
+        {
+            ThreadAbstraction.ExecuteThread(() =>
+            {
+                Thread.Sleep(500);
+                _reader.Dispose();
+            });
+
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveThrownObjectDisposedException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreEqual(typeof(SftpFileReader).FullName, _actualException.ObjectName);
+        }
+
+        [TestMethod]
+        public void ReadAfterDisposeShouldThrowObjectDisposedException()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
+        {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
index ba55e424a..f58c17d08 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
@@ -4,6 +4,7 @@
 using Renci.SshNet.Sftp;
 using System;
 using System.Diagnostics;
+using System.Threading;
 using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
@@ -16,6 +17,7 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsComplete : SftpFileReaderTes
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk3;
@@ -34,12 +36,16 @@ protected override void SetupData()
             _chunk2 = CreateByteArray(random, ChunkLength - 10);
             _chunk3 = new byte[0];
             _fileSize = _chunk1.Length + _chunk2.Length;
+            _operationTimeout = random.Next();
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -48,6 +54,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -56,6 +65,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
index d0936bffe..5bfb82e80 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
@@ -4,6 +4,7 @@
 using Renci.SshNet.Sftp;
 using System;
 using System.Diagnostics;
+using System.Threading;
 using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
@@ -16,6 +17,7 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsPartial : SftpFileReaderTest
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk3;
@@ -33,12 +35,16 @@ protected override void SetupData()
             _chunk2 = CreateByteArray(random, ChunkLength);
             _chunk3 = new byte[0];
             _fileSize = _chunk1.Length + _chunk2.Length;
+            _operationTimeout = random.Next();
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -47,6 +53,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -55,6 +64,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
index 2bd75058f..60f181a71 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
@@ -17,6 +17,7 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached : Sf
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk2CatchUp1;
@@ -61,12 +62,16 @@ protected override void SetupData()
             _chunk5BeginRead = new ManualResetEvent(false);
             _chunk6BeginRead = new ManualResetEvent(false);
             _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp1.Length + _chunk2CatchUp2.Length + _chunk3.Length + _chunk4.Length + _chunk5.Length;
+            _operationTimeout = random.Next();
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -76,6 +81,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -85,6 +93,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -94,6 +105,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk3, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 3 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -103,6 +117,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk4, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 4 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -118,6 +135,9 @@ protected override void SetupMocks()
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 7, 7))
                             .Returns(_chunk2CatchUp2);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 5 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
index e6421adda..2f69afb44 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
@@ -17,6 +17,7 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached : SftpF
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk2CatchUp;
@@ -43,12 +44,16 @@ protected override void SetupData()
             _chunk2BeginRead = new ManualResetEvent(false);
             _chunk3BeginRead = new ManualResetEvent(false);
             _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp.Length + _chunk3.Length;
+            _operationTimeout = random.Next();
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -58,6 +63,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk1, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -67,6 +75,9 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
index 82f8da7be..9707a50ba 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadBeginReadException.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
+namespace Renci.SshNet.Tests.Classes.Sftp
 {
     class SftpFileReaderTest_ReadAheadBeginReadException
     {
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
index 223847196..1712d22f6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -18,6 +18,7 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadA
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk3;
         private ManualResetEvent _readAheadChunk3Completed;
@@ -33,6 +34,7 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk3 = CreateByteArray(random, ChunkLength);
             _fileSize = 3 * ChunkLength;
+            _operationTimeout = random.Next();
 
             _readAheadChunk3Completed = new ManualResetEvent(false);
 
@@ -43,6 +45,9 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -51,6 +56,9 @@ protected override void SetupMocks()
                                asyncResult.SetAsCompleted(_chunk1, false);
                            })
                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -66,6 +74,9 @@ protected override void SetupMocks()
                                 });
                             })
                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -73,7 +84,7 @@ protected override void SetupMocks()
                                 var asyncResult = new SftpReadAsyncResult(callback, state);
                                 asyncResult.SetAsCompleted(_chunk3, false);
 
-                                // signal that we've com^meted the read-ahead for chunk3
+                                // signal that we've completed the read-ahead for chunk3
                                 _readAheadChunk3Completed.Set();
                             })
                             .Returns((SftpReadAsyncResult)null);
@@ -115,17 +126,16 @@ public void ReahAheadOfChunk3ShouldHaveBeenDone()
         }
 
         [TestMethod]
-        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadAhead()
         {
             try
             {
                 _reader.Read();
                 Assert.Fail();
             }
-            catch (ObjectDisposedException ex)
+            catch (SshException ex)
             {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+                Assert.AreSame(_exception, ex);
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
index cdee15ae1..294a130e9 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
@@ -18,6 +18,7 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadA
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk3;
         private SftpFileReader _reader;
@@ -34,6 +35,7 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk3 = CreateByteArray(random, ChunkLength);
             _fileSize = 3 * _chunk1.Length;
+            _operationTimeout = random.Next();
 
             _readAheadChunk2 = new ManualResetEvent(false);
             _readChunk2 = new ManualResetEvent(false);
@@ -45,6 +47,9 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -53,6 +58,9 @@ protected override void SetupMocks()
                                asyncResult.SetAsCompleted(_chunk1, false);
                            })
                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -71,18 +79,9 @@ protected override void SetupMocks()
                                 });
                             })
                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                            .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
-                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
-                            {
-                                // this chunk should never be read
-                                Thread.Sleep(20000);
-
-                                var asyncResult = new SftpReadAsyncResult(callback, state);
-                                asyncResult.SetAsCompleted(_chunk3, false);
-                            })
-                            .Returns((SftpReadAsyncResult)null);
-
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
         }
 
         protected override void Arrange()
@@ -122,17 +121,16 @@ public void ReadOfSecondChunkShouldThrowExceptionThatOccurredInReadAhead()
         }
 
         [TestMethod]
-        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadAhead()
         {
             try
             {
                 _reader.Read();
                 Assert.Fail();
             }
-            catch (ObjectDisposedException ex)
+            catch (SshException ex)
             {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+                Assert.AreSame(_exception, ex);
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
new file mode 100644
index 000000000..160821507
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
@@ -0,0 +1,123 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private MockSequence _seq;
+        private byte[] _handle;
+        private int _fileSize;
+        private int _operationTimeout;
+        private byte[] _chunk1;
+        private byte[] _chunk2;
+        private SftpFileReader _reader;
+        private SshException _exception;
+        private ManualResetEvent _exceptionSignaled;
+        private SshException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _chunk1 = CreateByteArray(random, ChunkLength);
+            _chunk2 = CreateByteArray(random, ChunkLength);
+            _fileSize = _chunk1.Length + _chunk2.Length + 1;
+            _operationTimeout = random.Next();
+
+            _exception = new SshException();
+            _exceptionSignaled = new ManualResetEvent(false);
+        }
+
+        protected override void SetupMocks()
+        {
+            _seq = new MockSequence();
+
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
+                            {
+                                var asyncResult = new SftpReadAsyncResult(callback, state);
+                                asyncResult.SetAsCompleted(_chunk1, false);
+                            })
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout))
+                           .Callback(() => _exceptionSignaled.Set())
+                           .Throws(_exception);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 2, _fileSize);
+        }
+
+        protected override void Act()
+        {
+            // wait for the exception to be signaled by the second call to WaitOnHandle
+            _exceptionSignaled.WaitOne(5000);
+            // allow a little time to allow SftpFileReader to process exception
+            Thread.Sleep(100);
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveRethrownExceptionThrownByWaitOnHandle()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_exception, _actualException);
+        }
+
+        [TestMethod]
+        public void ReadShouldRethrowExceptionThrownByWaitOnHandle()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.AreSame(_exception, ex);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
+        {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
new file mode 100644
index 000000000..cfbc42e5f
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
@@ -0,0 +1,107 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using BufferedRead = Renci.SshNet.Sftp.SftpFileReader.BufferedRead;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable : SftpFileReaderTestBase
+    {
+        private const int ChunkLength = 32 * 1024;
+
+        private MockSequence _seq;
+        private byte[] _handle;
+        private int _fileSize;
+        private int _operationTimeout;
+        private SftpFileReader _reader;
+        private SshException _exception;
+        private SshException _actualException;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _handle = CreateByteArray(random, 5);
+            _fileSize = random.Next();
+            _operationTimeout = random.Next();
+
+            _exception = new SshException();
+        }
+
+        protected override void SetupMocks()
+        {
+            _seq = new MockSequence();
+
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
+                           .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout))
+                           .Throws(_exception);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _reader = new SftpFileReader(_handle, SftpSessionMock.Object, ChunkLength, 1, _fileSize);
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveRethrownExceptionThrownByWaitOnHandle()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.AreSame(_exception, _actualException);
+        }
+
+        [TestMethod]
+        public void ReadShouldRethrowExceptionThrownByWaitOnHandle()
+        {
+            try
+            {
+                _reader.Read();
+                Assert.Fail();
+            }
+            catch (SshException ex)
+            {
+                Assert.AreSame(_exception, ex);
+            }
+        }
+
+        [TestMethod]
+        public void DisposeShouldCloseHandleAndCompleteImmediately()
+        {
+            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+
+            var stopwatch = Stopwatch.StartNew();
+            _reader.Dispose();
+            stopwatch.Stop();
+
+            Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
+
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
similarity index 92%
rename from src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
rename to src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
index b74b3ded0..691d7496e 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ExceptionInReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
@@ -10,17 +10,18 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileReaderTest_Read_ExceptionInReadAhead : SftpFileReaderTestBase
+    public class SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead : SftpFileReaderTestBase
     {
         private const int ChunkLength = 32 * 1024;
 
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private int _operationTimeout;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private SftpFileReader _reader;
-        private ManualResetEvent _readAhead;
+        private ManualResetEvent _readAheadChunk3;
         private ManualResetEvent _readChunk3;
         private SshException _exception;
         private SshException _actualException;
@@ -33,8 +34,9 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk2 = CreateByteArray(random, ChunkLength);
             _fileSize = _chunk1.Length + _chunk2.Length + 1;
+            _operationTimeout = random.Next();
 
-            _readAhead = new ManualResetEvent(false);
+            _readAheadChunk3 = new ManualResetEvent(false);
             _readChunk3 = new ManualResetEvent(false);
 
             _exception = new SshException();
@@ -64,7 +66,7 @@ protected override void SetupMocks()
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
                             {
-                                _readAhead.Set();
+                                _readAheadChunk3.Set();
                                 _readChunk3.WaitOne(TimeSpan.FromSeconds(5));
                                 // sleep a short time to make sure the client is in the blocking wait
                                 Thread.Sleep(500);
@@ -85,7 +87,7 @@ protected override void Act()
             _reader.Read();
 
             // wait until we've the SftpFileReader has starting reading ahead chunk 3
-            Assert.IsTrue(_readAhead.WaitOne(TimeSpan.FromSeconds(5)));
+            Assert.IsTrue(_readAheadChunk3.WaitOne(TimeSpan.FromSeconds(5)));
             // signal that we are about to read chunk 3
             _readChunk3.Set();
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index 386ceb61d..86fac6d0f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -17,7 +17,7 @@ public class SftpSessionTest_Connected_RequestRead
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<IChannelSession> _channelSessionMock;
         private SftpSession _sftpSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private byte[] _actual;
         private byte[] _expected;
         private Encoding _encoding;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
 
-            _operationTimeout = TimeSpan.FromMilliseconds(random.Next(100, 500));
+            _operationTimeout = random.Next(100, 500);
             _expected = new byte[random.Next(30, 50)];
             _encoding = Encoding.UTF8;
             random.NextBytes(_expected);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index 4328b5994..923d87a92 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -16,7 +16,7 @@ public class SftpSessionTest_Connected_RequestStatVfs
         private Mock<IChannelSession> _channelSessionMock;
         private Mock<IServiceFactory> _serviceFactoryMock;
         private SftpSession _sftpSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private SftpFileSytemInformation _actual;
         private Encoding _encoding;
 
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
 
-            _operationTimeout = TimeSpan.FromMilliseconds(random.Next(100, 500));
+            _operationTimeout = random.Next(100, 500);
             _encoding = Encoding.UTF8;
 
             _bAvail = (ulong) random.Next(0, int.MaxValue);
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
index 21266e216..f633a0b59 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
@@ -13,7 +13,7 @@ public class SftpClientTest_Dispose_Connected
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private Mock<ISftpSession> _sftpSessionMock;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -34,9 +34,9 @@ protected void Arrange()
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
-            _operationTimeout = TimeSpan.FromSeconds(new Random().Next(1, 10));
+            _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _sftpClient.OperationTimeout = _operationTimeout;
+            _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
index e7926a979..c29fdc169 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
@@ -13,7 +13,7 @@ public class SftpClientTest_Dispose_Disconnected
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private Mock<ISftpSession> _sftpSessionMock;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -34,9 +34,9 @@ protected void Arrange()
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
-            _operationTimeout = TimeSpan.FromSeconds(new Random().Next(1, 10));
+            _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _sftpClient.OperationTimeout = _operationTimeout;
+            _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
index 43f5d2006..1d9b8b4dc 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
@@ -13,7 +13,7 @@ public class SftpClientTest_Dispose_Disposed
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private Mock<ISftpSession> _sftpSessionMock;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -34,9 +34,9 @@ protected void Arrange()
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
-            _operationTimeout = TimeSpan.FromSeconds(new Random().Next(1, 10));
+            _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _sftpClient.OperationTimeout = _operationTimeout;
+            _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             var sequence = new MockSequence();
             _serviceFactoryMock.InSequence(sequence)
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
index 5263f6ef6..27b9b9ee2 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
@@ -14,7 +14,7 @@ public class SftpClientTest_Finalize_Connected
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
         private Mock<ISftpSession> _sftpSessionMock;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
 
         [TestInitialize]
         public void Setup()
@@ -30,9 +30,9 @@ protected void Arrange()
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
-            _operationTimeout = TimeSpan.FromSeconds(new Random().Next(1, 10));
+            _operationTimeout = new Random().Next(1000, 10000);
             _sftpClient = new SftpClient(_connectionInfo, false, _serviceFactoryMock.Object);
-            _sftpClient.OperationTimeout = _operationTimeout;
+            _sftpClient.OperationTimeout = TimeSpan.FromMilliseconds(_operationTimeout);
 
             _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
                 .Returns(_sessionMock.Object);
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
index 9fb777971..ca47f09e7 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
@@ -10,7 +10,8 @@ internal class SubsystemSessionStub : SubsystemSession
     {
         private int _onChannelOpenInvocationCount;
 
-        public SubsystemSessionStub(ISession session, string subsystemName, TimeSpan operationTimeout, Encoding encoding) : base(session, subsystemName, operationTimeout, encoding)
+        public SubsystemSessionStub(ISession session, string subsystemName, int operationTimeout, Encoding encoding)
+            : base(session, subsystemName, operationTimeout, encoding)
         {
             OnDataReceivedInvocations = new List<ChannelDataEventArgs>();
         }
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
index 1b53351e6..fa90ba560 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Connect_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -34,7 +34,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
index bfe60e301..065fed113 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
@@ -17,7 +17,7 @@ public class SubsystemSession_Connect_Disconnected
         private Mock<IChannelSession> _channelAfterDisconnectMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -34,7 +34,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
index 9dad33254..b500dd35b 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Connect_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
index 117a6b3d6..43b28985e 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Disconnect_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
index 6dff14ca5..f3e2312ac 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Disconnect_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
index ecdc46fc7..8804f6aa7 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
@@ -14,7 +14,7 @@ public class SubsystemSession_Disconnect_NeverConnected
         private Mock<ISession> _sessionMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -30,7 +30,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
index 60325ad56..dfe98c1ca 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Dispose_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
index f1047192c..2111db3b4 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Dispose_Disconnected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
index 25e0ff65a..eb2e1d46a 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_Dispose_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
index 63c22ea1f..6c83b499c 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
@@ -15,7 +15,7 @@ public class SubsystemSession_Dispose_NeverConnected
         private Mock<ISession> _sessionMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -31,7 +31,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
index a03d4be80..bdd03248b 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnChannelDataReceived_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -34,7 +34,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
index 41d879f78..ec9259261 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnChannelDataReceived_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
index e52e3e1b6..a1e014138 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
@@ -17,7 +17,7 @@ public class SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -35,7 +35,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
index 3853b7ccb..774c2e911 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
@@ -17,7 +17,7 @@ public class SubsystemSession_OnChannelException_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -35,7 +35,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
index d434802eb..50a644e6d 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnChannelException_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
index fd49ea738..49d915a4e 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnSessionDisconnected_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
index 7bcefa3c0..094424d15 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnSessionDisconnected_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
index c2d93cf43..66cd41730 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
@@ -17,7 +17,7 @@ public class SubsystemSession_OnSessionErrorOccurred_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -35,7 +35,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
index 728857e55..e3bd8bd91 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_OnSessionErrorOccurred_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
index 1d3e40906..ce2c6850b 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_SendData_Connected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -34,7 +34,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
index 70b53f58f..8935fc8ed 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_SendData_Disposed
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -33,7 +33,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
index 0de124874..8d36e19cb 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
@@ -16,7 +16,7 @@ public class SubsystemSession_SendData_NeverConnected
         private Mock<IChannelSession> _channelMock;
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
         private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
@@ -35,7 +35,7 @@ protected void Arrange()
         {
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
-            _operationTimeout = TimeSpan.FromSeconds(30);
+            _operationTimeout = 30000;
             _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 5ca58ca8a..196ed7d62 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -341,6 +341,7 @@
     <Compile Include="Classes\SftpClientTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\SftpClientTest_Finalize_Connected.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTestBase.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs" />
@@ -350,7 +351,9 @@
     <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadAheadBeginReadException.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadBackBeginReadException.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_ReadBackEndInvokeException.cs" />
-    <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ExceptionInReadAhead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs" />
+    <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs" />
diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index c5cb25d9d..1e2feccb3 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -6,9 +6,10 @@ namespace Renci.SshNet.Common
     /// <summary>
     /// Light implementation of SemaphoreSlim.
     /// </summary>
-    public class SemaphoreLight
+    public class SemaphoreLight : IDisposable
     {
         private readonly object _lock = new object();
+        private ManualResetEvent _waitHandle;
 
         private int _currentCount;
 
@@ -31,6 +32,34 @@ public SemaphoreLight(int initialCount)
         /// </summary>
         public int CurrentCount { get { return _currentCount; } }
 
+        /// <summary>
+        /// Returns a <see cref="WaitHandle"/> that can be used to wait on the semaphore.
+        /// </summary>
+        /// <value>
+        /// A <see cref="WaitHandle"/> that can be used to wait on the semaphore.
+        /// </value>
+        /// <remarks>
+        /// A successful wait on the <see cref="AvailableWaitHandle"/> does not imply a successful
+        /// wait on the <see cref="SemaphoreLight"/> itself. It should be followed by a true wait
+        /// on the semaphore.
+        /// </remarks>
+        public WaitHandle AvailableWaitHandle
+        {
+            get
+            {
+                if (_waitHandle != null)
+                    return _waitHandle;
+
+                lock (_lock)
+                {
+                    if (_waitHandle == null)
+                        _waitHandle = new ManualResetEvent(_currentCount > 0);
+                }
+
+                return _waitHandle;
+            }
+        }
+
         /// <summary>
         /// Exits the <see cref="SemaphoreLight"/> once.
         /// </summary>
@@ -44,19 +73,27 @@ public int Release()
         /// Exits the <see cref="SemaphoreLight"/> a specified number of times.
         /// </summary>
         /// <param name="releaseCount">The number of times to exit the semaphore.</param>
-        /// <returns>The previous count of the <see cref="SemaphoreLight"/>.</returns>
+        /// <returns>
+        /// The previous count of the <see cref="SemaphoreLight"/>.
+        /// </returns>
         public int Release(int releaseCount)
         {
-            var oldCount = _currentCount;
-
             lock (_lock)
             {
+                var oldCount = _currentCount;
+
                 _currentCount += releaseCount;
 
+                // signal waithandle when the original semaphore count was zero
+                if (_waitHandle != null && oldCount == 0)
+                {
+                    _waitHandle.Set();
+                }
+
                 Monitor.Pulse(_lock);
-            }
 
-            return oldCount;
+                return oldCount;
+            }
         }
 
         /// <summary>
@@ -73,6 +110,12 @@ public void Wait()
 
                 _currentCount--;
 
+                // unsignal waithandle when the semaphore count is zero
+                if (_waitHandle != null && _currentCount == 0)
+                {
+                    _waitHandle.Reset();
+                }
+
                 Monitor.Pulse(_lock);
             }
         }
@@ -143,10 +186,50 @@ private bool WaitWithTimeout(int timeoutInMilliseconds)
 
                 _currentCount--;
 
+                // unsignal waithandle when the semaphore count is zero
+                if (_waitHandle != null && _currentCount == 0)
+                {
+                    _waitHandle.Reset();
+                }
+
                 Monitor.Pulse(_lock);
 
                 return true;
             }
         }
+
+        /// <summary>
+        /// Finalizes the current <see cref="SemaphoreLight"/>.
+        /// </summary>
+        ~SemaphoreLight()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                var waitHandle = _waitHandle;
+                if (waitHandle != null)
+                {
+                    waitHandle.Dispose();
+                    _waitHandle = null;
+                }
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/IServiceFactory.NET.cs b/src/Renci.SshNet/IServiceFactory.NET.cs
index 2eb9ab179..0a86e08eb 100644
--- a/src/Renci.SshNet/IServiceFactory.NET.cs
+++ b/src/Renci.SshNet/IServiceFactory.NET.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.NetConf;
+using Renci.SshNet.NetConf;
 
 namespace Renci.SshNet
 {
@@ -10,10 +9,10 @@ internal partial interface IServiceFactory
         /// and with the specified operation timeout.
         /// </summary>
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <returns>
         /// An <see cref="INetConfSession"/>.
         /// </returns>
-        INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout);
+        INetConfSession CreateNetConfSession(ISession session, int operationTimeout);
     }
 }
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 84d4e7d0e..7a2c35c07 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -29,12 +29,12 @@ internal partial interface IServiceFactory
         /// the specified operation timeout and encoding.
         /// </summary>
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="ISftpSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <param name="encoding">The encoding.</param>
         /// <returns>
         /// An <see cref="ISftpSession"/>.
         /// </returns>
-        ISftpSession CreateSftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding);
+        ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding);
 
         /// <summary>
         /// Create a new <see cref="PipeStream"/>.
@@ -58,10 +58,6 @@ internal partial interface IServiceFactory
         /// <exception cref="SshConnectionException">No key exchange algorithm is supported by both client and server.</exception>
         IKeyExchange CreateKeyExchange(IDictionary<string, Type> clientAlgorithms, string[] serverAlgorithms);
 
-        ISftpFileReader CreateSftpFileReader(byte[] handle,
-                                             ISftpSession sftpSession,
-                                             uint chunkSize,
-                                             int maxPendingReads,
-                                             long? fileSize);
+        ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize);
     }
 }
diff --git a/src/Renci.SshNet/ISubsystemSession.cs b/src/Renci.SshNet/ISubsystemSession.cs
index 6312bcb55..d31ca70a3 100644
--- a/src/Renci.SshNet/ISubsystemSession.cs
+++ b/src/Renci.SshNet/ISubsystemSession.cs
@@ -9,6 +9,14 @@ namespace Renci.SshNet
     /// </summary>
     internal interface ISubsystemSession : IDisposable
     {
+        /// <summary>
+        /// Gets or set the number of seconds to wait for an operation to complete.
+        /// </summary>
+        /// <value>
+        /// The number of seconds to wait for an operation to complete, or -1 to wait indefinitely.
+        /// </value>
+        int OperationTimeout { get; }
+
         /// <summary>
         /// Gets a value indicating whether this session is open.
         /// </summary>
@@ -33,10 +41,10 @@ internal interface ISubsystemSession : IDisposable
         /// Waits a specified time for a given <see cref="WaitHandle"/> to get signaled.
         /// </summary>
         /// <param name="waitHandle">The handle to wait for.</param>
-        /// <param name="operationTimeout">The time to wait for <paramref name="waitHandle"/> to get signaled.</param>
+        /// <param name="millisecondsTimeout">The number of millieseconds wait for <paramref name="waitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
         /// <exception cref="SshException">The connection was closed by the server.</exception>
         /// <exception cref="SshException">The channel was closed.</exception>
-        /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified <paramref name="operationTimeout"/>.</exception>
-        void WaitOnHandle(WaitHandle waitHandle, TimeSpan operationTimeout);
+        /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified timeout.</exception>
+        void WaitOnHandle(WaitHandle waitHandle, int millisecondsTimeout);
     }
 }
diff --git a/src/Renci.SshNet/NetConfClient.cs b/src/Renci.SshNet/NetConfClient.cs
index 54ae1a42c..6c108145d 100644
--- a/src/Renci.SshNet/NetConfClient.cs
+++ b/src/Renci.SshNet/NetConfClient.cs
@@ -13,6 +13,8 @@ namespace Renci.SshNet
     /// </summary>
     public class NetConfClient : BaseClient
     {
+        private int _operationTimeout;
+
         /// <summary>
         /// Holds <see cref="INetConfSession"/> instance that used to communicate to the server
         /// </summary>
@@ -25,7 +27,17 @@ public class NetConfClient : BaseClient
         /// The timeout to wait until an operation completes. The default value is negative
         /// one (-1) milliseconds, which indicates an infinite time-out period.
         /// </value>
-        public TimeSpan OperationTimeout { get; set; }
+        public TimeSpan OperationTimeout {
+            get { return TimeSpan.FromMilliseconds(_operationTimeout); }
+            set
+            {
+                var timeoutInMilliseconds = value.TotalMilliseconds;
+                if (timeoutInMilliseconds < -1d || timeoutInMilliseconds > int.MaxValue)
+                    throw new ArgumentOutOfRangeException("timeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
+
+                _operationTimeout = (int) timeoutInMilliseconds;
+            }
+        }
 
         #region Constructors
 
@@ -127,7 +139,7 @@ private NetConfClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo)
         internal NetConfClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, IServiceFactory serviceFactory)
             : base(connectionInfo, ownsConnectionInfo, serviceFactory)
         {
-            OperationTimeout = SshNet.Session.InfiniteTimeSpan;
+            _operationTimeout = SshNet.Session.Infinite;
             AutomaticMessageIdHandling = true;
         }
 
@@ -207,7 +219,7 @@ protected override void OnConnected()
         {
             base.OnConnected();
 
-            _netConfSession = ServiceFactory.CreateNetConfSession(Session, OperationTimeout);
+            _netConfSession = ServiceFactory.CreateNetConfSession(Session, _operationTimeout);
             _netConfSession.Connect();
         }
 
diff --git a/src/Renci.SshNet/Netconf/NetConfSession.cs b/src/Renci.SshNet/Netconf/NetConfSession.cs
index a8d81f31f..d2c7b35df 100644
--- a/src/Renci.SshNet/Netconf/NetConfSession.cs
+++ b/src/Renci.SshNet/Netconf/NetConfSession.cs
@@ -33,8 +33,8 @@ internal class NetConfSession : SubsystemSession, INetConfSession
         /// Initializes a new instance of the <see cref="NetConfSession"/> class.
         /// </summary>
         /// <param name="session">The session.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
-        public NetConfSession(ISession session, TimeSpan operationTimeout)
+        /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
+        public NetConfSession(ISession session, int operationTimeout)
             : base(session, "netconf", operationTimeout, Encoding.UTF8)
         {
             ClientCapabilities = new XmlDocument();
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index bea84e6e8..8861d8dc2 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -428,10 +428,14 @@
     <Compile Include="Sftp\SftpMessageTypes.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Sftp\SftpOpenAsyncResult.cs" />
+    <Compile Include="Sftp\SftpOpenDirAsyncResult.cs" />
     <Compile Include="Sftp\SftpReadAsyncResult.cs" />
+    <Compile Include="Sftp\SftpRealPathAsyncResult.cs" />
     <Compile Include="Sftp\SftpSession.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Sftp\SFtpStatAsyncResult.cs" />
     <Compile Include="Sftp\SftpSynchronizeDirectoriesAsyncResult.cs" />
     <Compile Include="Sftp\SftpUploadAsyncResult.cs" />
     <Compile Include="Sftp\StatusCodes.cs">
diff --git a/src/Renci.SshNet/ServiceFactory.NET.cs b/src/Renci.SshNet/ServiceFactory.NET.cs
index ad6f0fad9..881d71ccf 100644
--- a/src/Renci.SshNet/ServiceFactory.NET.cs
+++ b/src/Renci.SshNet/ServiceFactory.NET.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.NetConf;
+using Renci.SshNet.NetConf;
 
 namespace Renci.SshNet
 {
@@ -10,11 +9,11 @@ internal partial class ServiceFactory
         /// and with the specified operation timeout.
         /// </summary>
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <returns>
         /// An <see cref="INetConfSession"/>.
         /// </returns>
-        public INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout)
+        public INetConfSession CreateNetConfSession(ISession session, int operationTimeout)
         {
             return new NetConfSession(session, operationTimeout);
         }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index fc496586f..8fde6b639 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -6,6 +6,7 @@
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Security;
 using Renci.SshNet.Sftp;
+using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet
 {
@@ -43,12 +44,12 @@ public ISession CreateSession(ConnectionInfo connectionInfo)
         /// the specified operation timeout and encoding.
         /// </summary>
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="ISftpSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <param name="encoding">The encoding.</param>
         /// <returns>
         /// An <see cref="ISftpSession"/>.
         /// </returns>
-        public ISftpSession CreateSftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding)
+        public ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding)
         {
             return new SftpSession(session, operationTimeout, encoding, this);
         }
@@ -97,9 +98,36 @@ from s in serverAlgorithms
             return keyExchangeAlgorithmType.CreateInstance<IKeyExchange>();
         }
 
-        public ISftpFileReader CreateSftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
+        public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize)
         {
-            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
+            const int DefaultMaxPendingReads = 3;
+
+            var openAsyncResult = sftpSession.BeginOpen(fileName, Flags.Read, null, null);
+            var statAsyncResult = sftpSession.BeginLStat(fileName, null, null);
+
+            long? fileSize;
+            int maxPendingReads;
+
+            var chunkSize = sftpSession.CalculateOptimalReadLength(bufferSize);
+            var handle = sftpSession.EndOpen(openAsyncResult);
+
+            // fallback to a default maximum of pending reads when remote server does not allow us to obtain
+            // the attributes of the file
+            try
+            {
+                var fileAttributes = sftpSession.EndLStat(statAsyncResult);
+                fileSize = fileAttributes.Size;
+                maxPendingReads = Math.Min(20, (int) Math.Ceiling((double) fileAttributes.Size / chunkSize) + 1);
+            }
+            catch (SshException ex)
+            {
+                fileSize = null;
+                maxPendingReads = DefaultMaxPendingReads;
+
+                DiagnosticAbstraction.Log(string.Format("Failed to obtain size of file. Allowing maximum {0} pending reads: {1}", maxPendingReads, ex));
+            }
+
+            return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 67782e30b..e7638abf7 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -48,6 +48,37 @@ internal interface ISftpSession : ISubsystemSession
         /// </returns>
         SftpFileAttributes RequestFStat(byte[] handle, bool nullOnError);
 
+        /// <summary>
+        /// Performs SSH_FXP_STAT request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="nullOnError">if set to <c>true</c> returns null instead of throwing an exception.</param>
+        /// <returns>
+        /// File attributes
+        /// </returns>
+        SftpFileAttributes RequestStat(string path, bool nullOnError = false);
+
+        /// <summary>
+        /// Performs SSH_FXP_STAT request
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginOpen(string, Flags, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpOpenAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SFtpStatAsyncResult BeginStat(string path, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SFtpStatAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The file attributes.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        SftpFileAttributes EndStat(SFtpStatAsyncResult asyncResult);
+
         /// <summary>
         /// Performs SSH_FXP_LSTAT request.
         /// </summary>
@@ -57,6 +88,27 @@ internal interface ISftpSession : ISubsystemSession
         /// </returns>
         SftpFileAttributes RequestLStat(string path);
 
+        /// <summary>
+        /// Performs SSH_FXP_LSTAT request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginLStat(string, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SFtpStatAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SFtpStatAsyncResult BeginLStat(string path, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous SSH_FXP_LSTAT request.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SFtpStatAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The file attributes.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        SftpFileAttributes EndLStat(SFtpStatAsyncResult asyncResult);
+
         /// <summary>
         /// Performs SSH_FXP_MKDIR request.
         /// </summary>
@@ -72,6 +124,32 @@ internal interface ISftpSession : ISubsystemSession
         /// <returns>File handle.</returns>
         byte[] RequestOpen(string path, Flags flags, bool nullOnError = false);
 
+        /// <summary>
+        /// Performs SSH_FXP_OPEN request
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="flags">The flags.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginOpen(string, Flags, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpOpenAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SftpOpenAsyncResult BeginOpen(string path, Flags flags, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpOpenAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// A <see cref="byte"/> array representing a file handle.
+        /// </returns>
+        /// <remarks>
+        /// If all available data has been read, the <see cref="EndOpen(SftpOpenAsyncResult)"/> method completes
+        /// immediately and returns zero bytes.
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        byte[] EndOpen(SftpOpenAsyncResult asyncResult);
+
         /// <summary>
         /// Performs SSH_FXP_OPENDIR request
         /// </summary>
@@ -130,6 +208,27 @@ internal interface ISftpSession : ISubsystemSession
         /// <returns></returns>
         KeyValuePair<string, SftpFileAttributes>[] RequestReadDir(byte[] handle);
 
+        /// <summary>
+        /// Performs SSH_FXP_REALPATH request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginRealPath(string, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpRealPathAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SftpRealPathAsyncResult BeginRealPath(string path, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous SSH_FXP_REALPATH request.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpRealPathAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The absolute path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        string EndRealPath(SftpRealPathAsyncResult asyncResult);
+
         /// <summary>
         /// Performs SSH_FXP_REMOVE request.
         /// </summary>
@@ -224,6 +323,6 @@ void RequestWrite(byte[] handle,
         /// </remarks>
         uint CalculateOptimalWriteLength(uint bufferSize, byte[] handle);
 
-        ISftpFileReader CreateFileReader(string fileName, uint bufferSize);
+        ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize);
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SFtpStatAsyncResult.cs b/src/Renci.SshNet/Sftp/SFtpStatAsyncResult.cs
new file mode 100644
index 000000000..d3776ce21
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SFtpStatAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SFtpStatAsyncResult : AsyncResult<SftpFileAttributes>
+    {
+        public SFtpStatAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 559197b19..6b434233e 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -8,6 +8,8 @@ namespace Renci.SshNet.Sftp
 {
     internal class SftpFileReader : ISftpFileReader
     {
+        private const int ReadAheadWaitTimeoutInMilliseconds = 1000;
+
         private readonly byte[] _handle;
         private readonly ISftpSession _sftpSession;
         private readonly uint _chunkSize;
@@ -51,8 +53,8 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, i
         {
             _handle = handle;
             _sftpSession = sftpSession;
-            _fileSize = fileSize;
             _chunkSize = chunkSize;
+            _fileSize = fileSize;
             _semaphore = new SemaphoreLight(maxPendingReads);
             _queue = new Dictionary<int, BufferedRead>(maxPendingReads);
             _readLock = new object();
@@ -63,17 +65,17 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, i
 
         public byte[] Read()
         {
-            if (_exception != null || _disposed)
+            if (_disposed)
                 throw new ObjectDisposedException(GetType().FullName);
+            if (_exception != null)
+                throw _exception;
             if (_isEndOfFileRead)
                 throw new SshException("Attempting to read beyond the end of the file.");
 
+            BufferedRead nextChunk;
+
             lock (_readLock)
             {
-                BufferedRead nextChunk;
-
-                // TODO: break when we've reached file size and still haven't received an EOF ?
-
                 // wait until either the next chunk is avalable or an exception has occurred
                 while (!_queue.TryGetValue(_nextChunkIndex, out nextChunk) && _exception == null)
                 {
@@ -97,7 +99,7 @@ public byte[] Read()
                         // remove processed chunk
                         _queue.Remove(_nextChunkIndex);
                         // update offset
-                        _offset += (ulong)data.Length;
+                        _offset += (ulong) data.Length;
                         // move to next chunk
                         _nextChunkIndex++;
                     }
@@ -118,22 +120,30 @@ public byte[] Read()
                     // signal EOF to caller
                     return nextChunk.Data;
                 }
+            }
+
+
+            // when the server returned less bytes than requested (for the previous chunk)
+            // we'll synchronously request the remaining data
+            //
+            // due to the optimization above, we'll only get here in one of the following cases:
+            // - an EOF situation for files for which we were unable to obtain the file size
+            // - fewer bytes that requested were returned
+            // 
+            // according to the SSH specification, this last case should never happen for normal
+            // disk files (but can happen for device files).
+            //
+            // Important:
+            // to avoid a deadlock, this read must be done outside of the read lock
 
-                // when the server returned less bytes than requested (for the previous chunk)
-                // we'll synchronously request the remaining data
-                //
-                // due to the optimization above, we'll only get here in one of the following cases:
-                // - an EOF situation for files for which we were unable to obtain the file size
-                // - fewer bytes that requested were returned
-                // 
-                // according to the SSH specification, this last case should never happen for normal
-                // disk files (but can happen for device files).
-
-                var bytesToCatchUp = nextChunk.Offset - _offset;
-
-                // TODO: break loop and interrupt blocking wait in case of exception
-                var read = _sftpSession.RequestRead(_handle, _offset, (uint) bytesToCatchUp);
-                if (read.Length == 0)
+            var bytesToCatchUp = nextChunk.Offset - _offset;
+
+            // TODO: break loop and interrupt blocking wait in case of exception
+
+            var read = _sftpSession.RequestRead(_handle, _offset, (uint) bytesToCatchUp);
+            if (read.Length == 0)
+            {
+                lock (_readLock)
                 {
                     // a zero-length (EOF) response is only valid for the read-back when EOF has
                     // been signaled for the next read-ahead chunk
@@ -149,16 +159,20 @@ public byte[] Read()
 
                     // move reader to error state
                     _exception = new SshException("Unexpectedly reached end of file.");
-                    // unblock wait in read-ahead
-                    _semaphore.Release();
+                    // ensure we've not yet disposed the current instance
+                    if (_semaphore != null)
+                    {
+                        // unblock wait in read-ahead
+                        _semaphore.Release();
+                    }
                     // notify caller of error
                     throw _exception;
                 }
+            }
 
-                _offset += (uint) read.Length;
+            _offset += (uint) read.Length;
 
-                return read;
-            }
+            return read;
         }
 
         public void Dispose()
@@ -166,38 +180,88 @@ public void Dispose()
             Dispose(true);
         }
 
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        /// <remarks>
+        /// Note that we will break the read-ahead loop, but will not interrupt the blocking wait
+        /// in that loop.
+        /// </remarks>
         protected void Dispose(bool disposing)
         {
+            if (_disposed)
+                return;
+
             if (disposing)
             {
+                // use this to break the read-ahead loop
+                _exception = new ObjectDisposedException(GetType().FullName);
+
                 var readAheadCompleted = _readAheadCompleted;
                 if (readAheadCompleted != null)
                 {
-                    if (!readAheadCompleted.WaitOne(TimeSpan.FromSeconds(1)))
-                    {
-                        DiagnosticAbstraction.Log("Read-ahead thread did not complete within time-out.");
-                    }
+                    readAheadCompleted.WaitOne();
                     readAheadCompleted.Dispose();
                     _readAheadCompleted = null;
                 }
 
-                _sftpSession.RequestClose(_handle);
+                // dispose semaphore in read lock to ensure we don't run into an ObjectDisposedException
+                // in Read()
+                lock (_readLock)
+                {
+                    if (_semaphore != null)
+                    {
+                        _semaphore.Dispose();
+                        _semaphore = null;
+                    }
+                }
 
-                _disposed = true;
+                _sftpSession.RequestClose(_handle);
             }
+
+            _disposed = true;
         }
 
         private void StartReadAhead()
         {
             ThreadAbstraction.ExecuteThread(() =>
             {
-                // TODO: take dispose into account
-                while (_exception == null)
+                while (!_endOfFileReceived && _exception == null)
                 {
-                    // TODO implement cancellation!?
-                    // TODO implement IDisposable to cancel the Wait in case the client never completes reading to EOF
-                    // TODO check if the BCL Semaphore unblocks wait on dispose (and mimick same behavior in our SemaphoreLight ?)
-                    _semaphore.Wait();
+                    // wait on either a release on the semaphore, or signaling of a broken session/connection
+                    try
+                    {
+                        _sftpSession.WaitOnHandle(_semaphore.AvailableWaitHandle, _sftpSession.OperationTimeout);
+                    }
+                    catch (Exception ex)
+                    {
+                        _exception = ex;
+
+                        // unblock the Read()
+                        lock (_readLock)
+                        {
+                            Monitor.Pulse(_readLock);
+                        }
+
+                        // break the read-ahead loop
+                        break;
+                    }
+
+                    // attempt to obtain the semaphore; this may time out when all semaphores are
+                    // in use due to pending read-aheads
+                    //
+                    // in general this only happens when the session is broken
+                    if (!_semaphore.Wait(ReadAheadWaitTimeoutInMilliseconds))
+                    {
+                        // unblock the Read()
+                        lock (_readLock)
+                        {
+                            Monitor.Pulse(_readLock);
+                        }
+                        // re-evaluate whether an exception occurred, and - if not - wait again
+                        continue;
+                    }
 
                     // don't bother reading any more chunks if we received EOF, or an exception has occurred
                     // while processing a chunk
diff --git a/src/Renci.SshNet/Sftp/SftpOpenAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpOpenAsyncResult.cs
new file mode 100644
index 000000000..b19de7e79
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpOpenAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpOpenAsyncResult : AsyncResult<byte[]>
+    {
+        public SftpOpenAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs
new file mode 100644
index 000000000..c3e9bcbcb
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpOpenDirAsyncResult : AsyncResult<byte[]>
+    {
+        public SftpOpenDirAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpRealPathAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpRealPathAsyncResult.cs
new file mode 100644
index 000000000..e1f1fbf95
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpRealPathAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpRealPathAsyncResult : AsyncResult<string>
+    {
+        public SftpRealPathAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index a6ecaa301..1613bb024 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -50,7 +50,7 @@ public uint NextRequestId
             }
         }
 
-        public SftpSession(ISession session, TimeSpan operationTimeout, Encoding encoding, IServiceFactory serviceFactory)
+        public SftpSession(ISession session, int operationTimeout, Encoding encoding, IServiceFactory serviceFactory)
             : base(session, "sftp", operationTimeout, encoding)
         {
             _serviceFactory = serviceFactory;
@@ -130,28 +130,9 @@ public string GetCanonicalPath(string path)
             return string.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", canonizedPath, slash, pathParts[pathParts.Length - 1]);
         }
 
-        public ISftpFileReader CreateFileReader(string fileName, uint bufferSize)
+        public ISftpFileReader CreateFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, int maxPendingReads, long? fileSize)
         {
-            var handle = RequestOpen(fileName, Flags.Read);
-
-            long? fileSize;
-            int maxPendingReads;
-
-            var chunkSize = CalculateOptimalReadLength(bufferSize);
-
-            var fileAttributes = RequestFStat(handle, true);
-            if (fileAttributes == null)
-            {
-                fileSize = null;
-                maxPendingReads = 5;
-            }
-            else
-            {
-                fileSize = fileAttributes.Size;
-                maxPendingReads = Math.Min(10, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
-            }
-
-            return _serviceFactory.CreateSftpFileReader(handle, this, chunkSize, maxPendingReads, fileSize);
+            return new SftpFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
 
         internal string GetFullRemotePath(string path)
@@ -396,6 +377,62 @@ public byte[] RequestOpen(string path, Flags flags, bool nullOnError = false)
             return handle;
         }
 
+        /// <summary>
+        /// Performs SSH_FXP_OPEN request
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="flags">The flags.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginOpen(string, Flags, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpOpenAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SftpOpenAsyncResult BeginOpen(string path, Flags flags, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SftpOpenAsyncResult(callback, state);
+
+            var request = new SftpOpenRequest(ProtocolVersion, NextRequestId, path, Encoding, flags,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(response.Handle, false);
+                },
+                response =>
+                {
+                    asyncResult.SetAsCompleted(GetSftpException(response), false);
+                });
+
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpOpenAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// A <see cref="byte"/> array representing a file handle.
+        /// </returns>
+        /// <remarks>
+        /// If all available data has been read, the <see cref="EndOpen(SftpOpenAsyncResult)"/> method completes
+        /// immediately and returns zero bytes.
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public byte[] EndOpen(SftpOpenAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndOpen has already been called.");
+
+            using (var waitHandle = asyncResult.AsyncWaitHandle)
+            {
+                WaitOnHandle(waitHandle, OperationTimeout);
+                return asyncResult.EndInvoke();
+            }
+        }
+
         /// <summary>
         /// Performs SSH_FXP_CLOSE request.
         /// </summary>
@@ -480,7 +517,11 @@ public byte[] EndRead(SftpReadAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndRead has already been called.");
 
-            return asyncResult.EndInvoke();
+            using (var waitHandle = asyncResult.AsyncWaitHandle)
+            {
+                WaitOnHandle(waitHandle, OperationTimeout);
+                return asyncResult.EndInvoke();
+            }
         }
 
         /// <summary>
@@ -613,6 +654,56 @@ public SftpFileAttributes RequestLStat(string path)
             return attributes;
         }
 
+        /// <summary>
+        /// Performs SSH_FXP_LSTAT request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginLStat(string, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SFtpStatAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SFtpStatAsyncResult BeginLStat(string path, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SFtpStatAsyncResult(callback, state);
+
+            var request = new SftpLStatRequest(ProtocolVersion, NextRequestId, path, Encoding,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(response.Attributes, false);
+                },
+                response =>
+                {
+                    asyncResult.SetAsCompleted(GetSftpException(response), false);
+                });
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous SSH_FXP_LSTAT request.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SFtpStatAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The file attributes.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public SftpFileAttributes EndLStat(SFtpStatAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndLStat has already been called.");
+
+            using (var waitHandle = asyncResult.AsyncWaitHandle)
+            {
+                WaitOnHandle(waitHandle, OperationTimeout);
+                return asyncResult.EndInvoke();
+            }
+        }
+
         /// <summary>
         /// Performs SSH_FXP_FSTAT request.
         /// </summary>
@@ -880,7 +971,9 @@ public void RequestRmDir(string path)
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="nullOnError">if set to <c>true</c> returns null instead of throwing an exception.</param>
-        /// <returns></returns>
+        /// <returns>
+        /// The absolute path.
+        /// </returns>
         internal KeyValuePair<string, SftpFileAttributes>[] RequestRealPath(string path, bool nullOnError = false)
         {
             SshException exception = null;
@@ -914,6 +1007,56 @@ internal KeyValuePair<string, SftpFileAttributes>[] RequestRealPath(string path,
             return result;
         }
 
+        /// <summary>
+        /// Performs SSH_FXP_REALPATH request.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginRealPath(string, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpRealPathAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SftpRealPathAsyncResult BeginRealPath(string path, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SftpRealPathAsyncResult(callback, state);
+
+            var request = new SftpRealPathRequest(ProtocolVersion, NextRequestId, path, Encoding,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(response.Files[0].Key, false);
+                },
+                response =>
+                {
+                    asyncResult.SetAsCompleted(GetSftpException(response), false);
+                });
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous SSH_FXP_REALPATH request.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpRealPathAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The absolute path.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public string EndRealPath(SftpRealPathAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndRealPath has already been called.");
+
+            using (var waitHandle = asyncResult.AsyncWaitHandle)
+            {
+                WaitOnHandle(waitHandle, OperationTimeout);
+                return asyncResult.EndInvoke();
+            }
+        }
+
         /// <summary>
         /// Performs SSH_FXP_STAT request.
         /// </summary>
@@ -922,7 +1065,7 @@ internal KeyValuePair<string, SftpFileAttributes>[] RequestRealPath(string path,
         /// <returns>
         /// File attributes
         /// </returns>
-        internal SftpFileAttributes RequestStat(string path, bool nullOnError = false)
+        public SftpFileAttributes RequestStat(string path, bool nullOnError = false)
         {
             SshException exception = null;
 
@@ -955,6 +1098,56 @@ internal SftpFileAttributes RequestStat(string path, bool nullOnError = false)
             return attributes;
         }
 
+        /// <summary>
+        /// Performs SSH_FXP_STAT request
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginStat(string, AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SFtpStatAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SFtpStatAsyncResult BeginStat(string path, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SFtpStatAsyncResult(callback, state);
+
+            var request = new SftpStatRequest(ProtocolVersion, NextRequestId, path, Encoding,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(response.Attributes, false);
+                },
+                response =>
+                {
+                    asyncResult.SetAsCompleted(GetSftpException(response), false);
+                });
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous read.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SFtpStatAsyncResult"/> that represents an asynchronous call.</param>
+        /// <returns>
+        /// The file attributes.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public SftpFileAttributes EndStat(SFtpStatAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndStat has already been called.");
+
+            using (var waitHandle = asyncResult.AsyncWaitHandle)
+            {
+                WaitOnHandle(waitHandle, OperationTimeout);
+                return asyncResult.EndInvoke();
+            }
+        }
+
         /// <summary>
         /// Performs SSH_FXP_RENAME request.
         /// </summary>
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 0cbd68a77..59d222bb9 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1,15 +1,16 @@
 using System;
-using System.Linq;
+
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using Renci.SshNet.Sftp;
-using System.Text;
-using Renci.SshNet.Common;
 using System.Globalization;
-using System.Threading;
-using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Net;
+using System.Text;
+using System.Threading;
 using Renci.SshNet.Abstractions;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet
 {
@@ -27,7 +28,7 @@ public class SftpClient : BaseClient
         /// <summary>
         /// Holds the operation timeout.
         /// </summary>
-        private TimeSpan _operationTimeout;
+        private int _operationTimeout;
 
         /// <summary>
         /// Holds the size of the buffer.
@@ -47,12 +48,18 @@ public TimeSpan OperationTimeout
             get
             {
                 CheckDisposed();
-                return _operationTimeout;
+
+                return TimeSpan.FromMilliseconds(_operationTimeout);
             }
             set
             {
                 CheckDisposed();
-                _operationTimeout = value;
+
+                var timeoutInMilliseconds = value.TotalMilliseconds;
+                if (timeoutInMilliseconds < -1d || timeoutInMilliseconds > int.MaxValue)
+                    throw new ArgumentOutOfRangeException("timeout", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.");
+
+                _operationTimeout = (int) timeoutInMilliseconds;
             }
         }
 
@@ -230,7 +237,7 @@ private SftpClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo)
         internal SftpClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, IServiceFactory serviceFactory)
             : base(connectionInfo, ownsConnectionInfo, serviceFactory)
         {
-            OperationTimeout = SshNet.Session.InfiniteTimeSpan;
+            _operationTimeout = SshNet.Session.Infinite;
             BufferSize = 1024 * 32;
         }
 
@@ -244,7 +251,7 @@ internal SftpClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, ISer
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to change directory denied by remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void ChangeDirectory(string path)
         {
@@ -268,7 +275,7 @@ public void ChangeDirectory(string path)
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to change permission on the path(s) was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void ChangePermissions(string path, short mode)
         {
@@ -283,7 +290,7 @@ public void ChangePermissions(string path, short mode)
         /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to create the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void CreateDirectory(string path)
         {
@@ -308,7 +315,7 @@ public void CreateDirectory(string path)
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to delete the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void DeleteDirectory(string path)
         {
@@ -333,7 +340,7 @@ public void DeleteDirectory(string path)
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to delete the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void DeleteFile(string path)
         {
@@ -358,7 +365,7 @@ public void DeleteFile(string path)
         /// <exception cref="ArgumentNullException"><paramref name="oldPath"/> is <b>null</b>. <para>-or-</para> or <paramref name="newPath"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to rename the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void RenameFile(string oldPath, string newPath)
         {
@@ -374,7 +381,7 @@ public void RenameFile(string oldPath, string newPath)
         /// <exception cref="ArgumentNullException"><paramref name="oldPath" /> is <b>null</b>. <para>-or-</para> or <paramref name="newPath" /> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to rename the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void RenameFile(string oldPath, string newPath, bool isPosix)
         {
@@ -411,7 +418,7 @@ public void RenameFile(string oldPath, string newPath, bool isPosix)
         /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="linkPath"/> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to create the symbolic link was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void SymbolicLink(string path, string linkPath)
         {
@@ -444,7 +451,7 @@ public void SymbolicLink(string path, string linkPath)
         /// <exception cref="ArgumentNullException"><paramref name="path" /> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public IEnumerable<SftpFile> ListDirectory(string path, Action<int> listCallback = null)
         {
@@ -552,7 +559,7 @@ public SftpFile Get(string path)
         /// <exception cref="ArgumentException"><paramref name="path"/> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message"/> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message"/> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public bool Exists(string path)
         {
@@ -566,9 +573,9 @@ public bool Exists(string path)
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            // using SSH_FXP_REALPATH is not an alternative the SFTP specification has not always
-            // been clear on how the server should respond when the specified path is not present
-            // on the server:
+            // using SSH_FXP_REALPATH is not an alternative as the SFTP specification has not always
+            // been clear on how the server should respond when the specified path is not present on
+            // the server:
             // 
             // SSH 1 to 4:
             // No mention of how the server should respond if the path is not present on the server.
@@ -605,7 +612,7 @@ public bool Exists(string path)
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>/// 
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
@@ -629,7 +636,7 @@ public void DownloadFile(string path, Stream output, Action<ulong> downloadCallb
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
@@ -652,7 +659,7 @@ public IAsyncResult BeginDownloadFile(string path, Stream output)
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// Method calls made by this method to <paramref name="output" />, may under certain conditions result in exceptions thrown by the stream.
@@ -724,7 +731,7 @@ public IAsyncResult BeginDownloadFile(string path, Stream output, AsyncCallback
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to perform the operation was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
         /// <exception cref="SftpPathNotFoundException">The path was not found on the remote host.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         public void EndDownloadFile(IAsyncResult asyncResult)
         {
             var ar = asyncResult as SftpDownloadAsyncResult;
@@ -746,7 +753,7 @@ public void EndDownloadFile(IAsyncResult asyncResult)
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
@@ -767,7 +774,7 @@ public void UploadFile(Stream input, string path, Action<ulong> uploadCallback =
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// Method calls made by this method to <paramref name="input" />, may under certain conditions result in exceptions thrown by the stream.
@@ -798,7 +805,7 @@ public void UploadFile(Stream input, string path, bool canOverride, Action<ulong
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -826,7 +833,7 @@ public IAsyncResult BeginUploadFile(Stream input, string path)
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -856,7 +863,7 @@ public IAsyncResult BeginUploadFile(Stream input, string path, AsyncCallback asy
         /// <exception cref="ArgumentException"><paramref name="path" /> is <b>null</b> or contains only whitespace characters.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to list the contents of the directory was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -949,7 +956,7 @@ public IAsyncResult BeginUploadFile(Stream input, string path, bool canOverride,
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPathNotFoundException">The directory of the file was not found on the remote host.</exception>
         /// <exception cref="SftpPermissionDeniedException">Permission to upload the file was denied by the remote host. <para>-or-</para> A SSH command was denied by the server.</exception>
-        /// <exception cref="SshException">A SSH error where <see cref="P:System.Exception.Message" /> is the message from the remote host.</exception>
+        /// <exception cref="SshException">A SSH error where <see cref="Exception.Message" /> is the message from the remote host.</exception>
         public void EndUploadFile(IAsyncResult asyncResult)
         {
             var ar = asyncResult as SftpUploadAsyncResult;
@@ -1498,7 +1505,7 @@ public IEnumerable<string> ReadLines(string path, Encoding encoding)
         /// Sets the date and time the specified file was last accessed.
         /// </summary>
         /// <param name="path">The file for which to set the access date and time information.</param>
-        /// <param name="lastAccessTime">A <see cref="System.DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
+        /// <param name="lastAccessTime">A <see cref="DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in local time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastAccessTime(string path, DateTime lastAccessTime)
         {
@@ -1509,7 +1516,7 @@ public void SetLastAccessTime(string path, DateTime lastAccessTime)
         /// Sets the date and time, in coordinated universal time (UTC), that the specified file was last accessed.
         /// </summary>
         /// <param name="path">The file for which to set the access date and time information.</param>
-        /// <param name="lastAccessTimeUtc">A <see cref="System.DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in UTC time.</param>
+        /// <param name="lastAccessTimeUtc">A <see cref="DateTime"/> containing the value to set for the last access date and time of path. This value is expressed in UTC time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastAccessTimeUtc(string path, DateTime lastAccessTimeUtc)
         {
@@ -1520,7 +1527,7 @@ public void SetLastAccessTimeUtc(string path, DateTime lastAccessTimeUtc)
         /// Sets the date and time that the specified file was last written to.
         /// </summary>
         /// <param name="path">The file for which to set the date and time information.</param>
-        /// <param name="lastWriteTime">A System.DateTime containing the value to set for the last write date and time of path. This value is expressed in local time.</param>
+        /// <param name="lastWriteTime">A <see cref="DateTime"/> containing the value to set for the last write date and time of path. This value is expressed in local time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastWriteTime(string path, DateTime lastWriteTime)
         {
@@ -1531,7 +1538,7 @@ public void SetLastWriteTime(string path, DateTime lastWriteTime)
         /// Sets the date and time, in coordinated universal time (UTC), that the specified file was last written to.
         /// </summary>
         /// <param name="path">The file for which to set the date and time information.</param>
-        /// <param name="lastWriteTimeUtc">A System.DateTime containing the value to set for the last write date and time of path. This value is expressed in UTC time.</param>
+        /// <param name="lastWriteTimeUtc">A <see cref="DateTime"/> containing the value to set for the last write date and time of path. This value is expressed in UTC time.</param>
         [Obsolete("Note: This method currently throws NotImplementedException because it has not yet been implemented.")]
         public void SetLastWriteTimeUtc(string path, DateTime lastWriteTimeUtc)
         {
@@ -1995,14 +2002,12 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
 
             var fullPath = _sftpSession.GetCanonicalPath(path);
 
-            using (var fileReader = _sftpSession.CreateFileReader(fullPath, _bufferSize))
+            using (var fileReader = ServiceFactory.CreateSftpFileReader(fullPath, _sftpSession, _bufferSize))
             {
                 var totalBytesRead = 0UL;
 
                 while (true)
                 {
-                    // TODO: cancel read ahead when download is canceled by user
-
                     //  Cancel download
                     if (asyncResult != null && asyncResult.IsDownloadCanceled)
                         break;
@@ -2013,7 +2018,7 @@ private void InternalDownloadFile(string path, Stream output, SftpDownloadAsyncR
 
                     output.Write(data, 0, data.Length);
 
-                    totalBytesRead += (ulong)data.Length;
+                    totalBytesRead += (ulong) data.Length;
 
                     if (downloadCallback != null)
                     {
@@ -2096,7 +2101,7 @@ private void InternalUploadFile(Stream input, string path, Flags flags, SftpUplo
                 else if (expectedResponses > 0)
                 {
                     //  Wait for expectedResponses to change
-                    _sftpSession.WaitOnHandle(responseReceivedWaitHandle, OperationTimeout);
+                    _sftpSession.WaitOnHandle(responseReceivedWaitHandle, _operationTimeout);
                 }
             } while (expectedResponses > 0 || bytesRead > 0);
 
@@ -2110,7 +2115,7 @@ protected override void OnConnected()
         {
             base.OnConnected();
 
-            _sftpSession = ServiceFactory.CreateSftpSession(Session, OperationTimeout, ConnectionInfo.Encoding);
+            _sftpSession = ServiceFactory.CreateSftpSession(Session, _operationTimeout, ConnectionInfo.Encoding);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet/SubsystemSession.cs b/src/Renci.SshNet/SubsystemSession.cs
index 5cb0e8a05..f950e2ee7 100644
--- a/src/Renci.SshNet/SubsystemSession.cs
+++ b/src/Renci.SshNet/SubsystemSession.cs
@@ -22,9 +22,12 @@ internal abstract class SubsystemSession : ISubsystemSession
         private EventWaitHandle _channelClosedWaitHandle = new ManualResetEvent(false);
 
         /// <summary>
-        /// Specifies a timeout to wait for operation to complete
+        /// Gets or set the number of seconds to wait for an operation to complete.
         /// </summary>
-        protected TimeSpan OperationTimeout { get; private set; }
+        /// <value>
+        /// The number of seconds to wait for an operation to complete, or -1 to wait indefinitely.
+        /// </value>
+        public int OperationTimeout { get; private set; }
 
         /// <summary>
         /// Occurs when an error occurred.
@@ -73,10 +76,10 @@ public bool IsOpen
         /// </summary>
         /// <param name="session">The session.</param>
         /// <param name="subsystemName">Name of the subsystem.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <param name="operationTimeout">The number of milliseconds to wait for a given operation to complete, or -1 to wait indefinitely.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <exception cref="ArgumentNullException"><paramref name="session" /> or <paramref name="subsystemName" /> or <paramref name="encoding"/> is <c>null</c>.</exception>
-        protected SubsystemSession(ISession session, string subsystemName, TimeSpan operationTimeout, Encoding encoding)
+        protected SubsystemSession(ISession session, string subsystemName, int operationTimeout, Encoding encoding)
         {
             if (session == null)
                 throw new ArgumentNullException("session");
@@ -208,11 +211,11 @@ private void Channel_Closed(object sender, ChannelEventArgs e)
         /// Waits a specified time for a given <see cref="WaitHandle"/> to get signaled.
         /// </summary>
         /// <param name="waitHandle">The handle to wait for.</param>
-        /// <param name="operationTimeout">The time to wait for <paramref name="waitHandle"/> to get signaled.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for <paramref name="waitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
         /// <exception cref="SshException">The connection was closed by the server.</exception>
         /// <exception cref="SshException">The channel was closed.</exception>
-        /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified <paramref name="operationTimeout"/>.</exception>
-        public void WaitOnHandle(WaitHandle waitHandle, TimeSpan operationTimeout)
+        /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified timeout.</exception>
+        public void WaitOnHandle(WaitHandle waitHandle, int millisecondsTimeout)
         {
             var waitHandles = new[]
                 {
@@ -222,7 +225,7 @@ public void WaitOnHandle(WaitHandle waitHandle, TimeSpan operationTimeout)
                     waitHandle
                 };
 
-            switch (WaitHandle.WaitAny(waitHandles, operationTimeout))
+            switch (WaitHandle.WaitAny(waitHandles, millisecondsTimeout))
             {
                 case 0:
                     throw _exception;

From f726b706dfadd598d8534d05869b5292913b91b2 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 19:31:52 +0100
Subject: [PATCH 045/128] Make RaiseExceptionEvent private.

---
 src/Renci.SshNet/Channels/Channel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Channels/Channel.cs b/src/Renci.SshNet/Channels/Channel.cs
index c13c832f3..8ced6516b 100644
--- a/src/Renci.SshNet/Channels/Channel.cs
+++ b/src/Renci.SshNet/Channels/Channel.cs
@@ -439,10 +439,10 @@ protected virtual void OnFailure()
         #endregion // Channel virtual methods
 
         /// <summary>
-        /// Raises <see cref="Channel.Exception"/> event.
+        /// Raises <see cref="Exception"/> event.
         /// </summary>
         /// <param name="exception">The exception.</param>
-        protected void RaiseExceptionEvent(Exception exception)
+        private void RaiseExceptionEvent(Exception exception)
         {
             var handlers = Exception;
             if (handlers != null)

From 768d1c9a68a9ef0fd288db3b14fa1885f9f8a74f Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 19:34:06 +0100
Subject: [PATCH 046/128] Add async Begin/End Close methods. Avoid waiting for
 async method to complete when its already completed.

---
 src/Renci.SshNet/Renci.SshNet.csproj          |  1 +
 src/Renci.SshNet/Sftp/ISftpSession.cs         | 18 +++++
 src/Renci.SshNet/Sftp/SftpCloseAsyncResult.cs | 12 ++++
 src/Renci.SshNet/Sftp/SftpSession.cs          | 69 ++++++++++++++++++-
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/Renci.SshNet/Sftp/SftpCloseAsyncResult.cs

diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 8861d8dc2..6e4e39f53 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -415,6 +415,7 @@
     <Compile Include="Sftp\Responses\SftpResponse.cs" />
     <Compile Include="Sftp\Responses\SftpStatusResponse.cs" />
     <Compile Include="Sftp\Responses\SftpVersionResponse.cs" />
+    <Compile Include="Sftp\SftpCloseAsyncResult.cs" />
     <Compile Include="Sftp\SftpDownloadAsyncResult.cs" />
     <Compile Include="Sftp\SftpFile.cs" />
     <Compile Include="Sftp\SftpFileAttributes.cs" />
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index e7638abf7..3d3993bbd 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -301,6 +301,24 @@ void RequestWrite(byte[] handle,
         /// <param name="handle">The handle.</param>
         void RequestClose(byte[] handle);
 
+        /// <summary>
+        /// Performs SSH_FXP_CLOSE request.
+        /// </summary>
+        /// <param name="handle">The handle.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginClose(byte[], AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpCloseAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        SftpCloseAsyncResult BeginClose(byte[] handle, AsyncCallback callback, object state);
+
+        /// <summary>
+        /// Handles the end of an asynchronous close.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpCloseAsyncResult"/> that represents an asynchronous call.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        void EndClose(SftpCloseAsyncResult asyncResult);
+
         /// <summary>
         /// Calculates the optimal size of the buffer to read data from the channel.
         /// </summary>
diff --git a/src/Renci.SshNet/Sftp/SftpCloseAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpCloseAsyncResult.cs
new file mode 100644
index 000000000..6349371f0
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpCloseAsyncResult.cs
@@ -0,0 +1,12 @@
+using Renci.SshNet.Common;
+using System;
+
+namespace Renci.SshNet.Sftp
+{
+    internal class SftpCloseAsyncResult : AsyncResult
+    {
+        public SftpCloseAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
+        {
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index 1613bb024..d26cd33f6 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -407,7 +407,7 @@ public SftpOpenAsyncResult BeginOpen(string path, Flags flags, AsyncCallback cal
         }
 
         /// <summary>
-        /// Handles the end of an asynchronous read.
+        /// Handles the end of an asynchronous open.
         /// </summary>
         /// <param name="asyncResult">An <see cref="SftpOpenAsyncResult"/> that represents an asynchronous call.</param>
         /// <returns>
@@ -426,6 +426,9 @@ public byte[] EndOpen(SftpOpenAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndOpen has already been called.");
 
+            if (asyncResult.IsCompleted)
+                return asyncResult.EndInvoke();
+
             using (var waitHandle = asyncResult.AsyncWaitHandle)
             {
                 WaitOnHandle(waitHandle, OperationTimeout);
@@ -461,6 +464,56 @@ public void RequestClose(byte[] handle)
             }
         }
 
+        /// <summary>
+        /// Performs SSH_FXP_CLOSE request.
+        /// </summary>
+        /// <param name="handle">The handle.</param>
+        /// <param name="callback">The <see cref="AsyncCallback"/> delegate that is executed when <see cref="BeginClose(byte[], AsyncCallback, object)"/> completes.</param>
+        /// <param name="state">An object that contains any additional user-defined data.</param>
+        /// <returns>
+        /// A <see cref="SftpCloseAsyncResult"/> that represents the asynchronous call.
+        /// </returns>
+        public SftpCloseAsyncResult BeginClose(byte[] handle, AsyncCallback callback, object state)
+        {
+            var asyncResult = new SftpCloseAsyncResult(callback, state);
+
+            var request = new SftpCloseRequest(ProtocolVersion, NextRequestId, handle,
+                response =>
+                {
+                    asyncResult.SetAsCompleted(GetSftpException(response), false);
+                });
+            SendRequest(request);
+
+            return asyncResult;
+        }
+
+        /// <summary>
+        /// Handles the end of an asynchronous close.
+        /// </summary>
+        /// <param name="asyncResult">An <see cref="SftpCloseAsyncResult"/> that represents an asynchronous call.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="asyncResult"/> is <c>null</c>.</exception>
+        public void EndClose(SftpCloseAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+                throw new ArgumentNullException("asyncResult");
+
+            if (asyncResult.EndInvokeCalled)
+                throw new InvalidOperationException("EndClose has already been called.");
+
+            if (asyncResult.IsCompleted)
+            {
+                asyncResult.EndInvoke();
+            }
+            else
+            {
+                using (var waitHandle = asyncResult.AsyncWaitHandle)
+                {
+                    WaitOnHandle(waitHandle, OperationTimeout);
+                    asyncResult.EndInvoke();
+                }
+            }
+        }
+
         /// <summary>
         /// Begins an asynchronous read using a SSH_FXP_READ request.
         /// </summary>
@@ -517,6 +570,9 @@ public byte[] EndRead(SftpReadAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndRead has already been called.");
 
+            if (asyncResult.IsCompleted)
+                return asyncResult.EndInvoke();
+
             using (var waitHandle = asyncResult.AsyncWaitHandle)
             {
                 WaitOnHandle(waitHandle, OperationTimeout);
@@ -697,6 +753,9 @@ public SftpFileAttributes EndLStat(SFtpStatAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndLStat has already been called.");
 
+            if (asyncResult.IsCompleted)
+                return asyncResult.EndInvoke();
+
             using (var waitHandle = asyncResult.AsyncWaitHandle)
             {
                 WaitOnHandle(waitHandle, OperationTimeout);
@@ -1050,6 +1109,9 @@ public string EndRealPath(SftpRealPathAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndRealPath has already been called.");
 
+            if (asyncResult.IsCompleted)
+                return asyncResult.EndInvoke();
+
             using (var waitHandle = asyncResult.AsyncWaitHandle)
             {
                 WaitOnHandle(waitHandle, OperationTimeout);
@@ -1126,7 +1188,7 @@ public SFtpStatAsyncResult BeginStat(string path, AsyncCallback callback, object
         }
 
         /// <summary>
-        /// Handles the end of an asynchronous read.
+        /// Handles the end of an asynchronous stat.
         /// </summary>
         /// <param name="asyncResult">An <see cref="SFtpStatAsyncResult"/> that represents an asynchronous call.</param>
         /// <returns>
@@ -1141,6 +1203,9 @@ public SftpFileAttributes EndStat(SFtpStatAsyncResult asyncResult)
             if (asyncResult.EndInvokeCalled)
                 throw new InvalidOperationException("EndStat has already been called.");
 
+            if (asyncResult.IsCompleted)
+                return asyncResult.EndInvoke();
+
             using (var waitHandle = asyncResult.AsyncWaitHandle)
             {
                 WaitOnHandle(waitHandle, OperationTimeout);

From c1080c16e6890ee93f157d09534a86eb1fddb2c1 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 19:50:19 +0100
Subject: [PATCH 047/128] Remove empty line.

---
 src/Renci.SshNet/Common/AsyncResult.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Renci.SshNet/Common/AsyncResult.cs b/src/Renci.SshNet/Common/AsyncResult.cs
index 700285972..d045c90c7 100644
--- a/src/Renci.SshNet/Common/AsyncResult.cs
+++ b/src/Renci.SshNet/Common/AsyncResult.cs
@@ -86,7 +86,6 @@ internal void EndInvoke()
                 AsyncWaitHandle.WaitOne();
                 _asyncWaitHandle = null;  // Allow early GC
                 AsyncWaitHandle.Dispose();
-
             }
 
             EndInvokeCalled = true;

From c43ff688f2da7962910586fea1dfbc3fe4ca83a3 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 19:52:37 +0100
Subject: [PATCH 048/128] Update comment.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 1e2feccb3..50113eeef 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -110,7 +110,7 @@ public void Wait()
 
                 _currentCount--;
 
-                // unsignal waithandle when the semaphore count is zero
+                // unsignal waithandle when the semaphore count reaches zero
                 if (_waitHandle != null && _currentCount == 0)
                 {
                     _waitHandle.Reset();

From b6d365c0de370efbade87d0e8d1f3ad153b10e90 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 20:14:23 +0100
Subject: [PATCH 049/128] Micro

---
 src/Renci.SshNet/ClientAuthentication.cs | 12 +++++-----
 src/Renci.SshNet/Common/Extensions.cs    |  9 ++++++--
 src/Renci.SshNet/SshMessageFactory.cs    | 28 +++++++++++++++++++-----
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/Renci.SshNet/ClientAuthentication.cs b/src/Renci.SshNet/ClientAuthentication.cs
index b626bce05..74103baf2 100644
--- a/src/Renci.SshNet/ClientAuthentication.cs
+++ b/src/Renci.SshNet/ClientAuthentication.cs
@@ -30,7 +30,7 @@ public void Authenticate(IConnectionInfoInternal connectionInfo, ISession sessio
                 var authenticated = noneAuthenticationMethod.Authenticate(session);
                 if (authenticated != AuthenticationResult.Success)
                 {
-                    if (!TryAuthenticate(session, new AuthenticationState(connectionInfo.AuthenticationMethods), noneAuthenticationMethod.AllowedAuthentications.ToList(), ref authenticationException))
+                    if (!TryAuthenticate(session, new AuthenticationState(connectionInfo.AuthenticationMethods), noneAuthenticationMethod.AllowedAuthentications, ref authenticationException))
                     {
                         throw authenticationException;
                     }
@@ -60,8 +60,8 @@ private static bool TryAuthenticate(ISession session,
             // we want to try authentication methods in the order in which they were
             // passed in the ctor, not the order in which the SSH server returns
             // the allowed authentication methods
-            var matchingAuthenticationMethods = authenticationState.SupportedAuthenticationMethods.Where(a => allowedAuthenticationMethods.Contains(a.Name)).ToList();
-            if (matchingAuthenticationMethods.Count == 0)
+            var matchingAuthenticationMethods = authenticationState.SupportedAuthenticationMethods.Where(a => allowedAuthenticationMethods.Contains(a.Name)).ToArray();
+            if (matchingAuthenticationMethods.Length == 0)
             {
                 authenticationException = new SshAuthenticationException(string.Format("No suitable authentication method found to complete authentication ({0}).", string.Join(",", allowedAuthenticationMethods.ToArray())));
                 return false;
@@ -108,12 +108,14 @@ private static bool TryAuthenticate(ISession session,
             return false;
         }
 
-        private static IEnumerable<IAuthenticationMethod> GetOrderedAuthenticationMethods(AuthenticationState authenticationState, IEnumerable<IAuthenticationMethod> matchingAuthenticationMethods)
+        private static IEnumerable<IAuthenticationMethod> GetOrderedAuthenticationMethods(AuthenticationState authenticationState, IAuthenticationMethod[] matchingAuthenticationMethods)
         {
             var skippedAuthenticationMethods = new List<IAuthenticationMethod>();
 
-            foreach (var authenticationMethod in matchingAuthenticationMethods)
+            for (var i = 0; i < matchingAuthenticationMethods.Length; i++)
             {
+                var authenticationMethod = matchingAuthenticationMethods[i];
+
                 if (authenticationState.ExecutedAuthenticationMethods.Contains(authenticationMethod))
                 {
                     skippedAuthenticationMethods.Add(authenticationMethod);
diff --git a/src/Renci.SshNet/Common/Extensions.cs b/src/Renci.SshNet/Common/Extensions.cs
index c97c3f9ff..690c5cb62 100644
--- a/src/Renci.SshNet/Common/Extensions.cs
+++ b/src/Renci.SshNet/Common/Extensions.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
@@ -28,7 +27,13 @@ public static bool IsNullOrWhiteSpace(this string value)
         {
             if (string.IsNullOrEmpty(value)) return true;
 
-            return value.All(char.IsWhiteSpace);
+            for (var i = 0; i < value.Length; i++)
+            {
+                if (!char.IsWhiteSpace(value[i]))
+                    return false;
+            }
+
+            return true;
         }
 
         internal static byte[] ToArray(this ServiceName serviceName)
diff --git a/src/Renci.SshNet/SshMessageFactory.cs b/src/Renci.SshNet/SshMessageFactory.cs
index f92c9d929..9041ea345 100644
--- a/src/Renci.SshNet/SshMessageFactory.cs
+++ b/src/Renci.SshNet/SshMessageFactory.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages;
 using Renci.SshNet.Messages.Authentication;
@@ -66,8 +65,11 @@ static SshMessageFactory()
             };
 
             MessagesByName = new Dictionary<string, MessageMetadata>(AllMessages.Length);
-            foreach (var messageMetadata in AllMessages)
+            for (var i = 0; i < AllMessages.Length; i++)
+            {
+                var messageMetadata = AllMessages[i];
                 MessagesByName.Add(messageMetadata.Name, messageMetadata);
+            }
         }
 
         public SshMessageFactory()
@@ -95,7 +97,19 @@ public Message Create(byte messageNumber)
             var enabledMessageMetadata = _enabledMessagesByNumber[messageNumber];
             if (enabledMessageMetadata == null)
             {
-                var definedMessageMetadata = AllMessages.FirstOrDefault(p => p.Number == messageNumber);
+                MessageMetadata definedMessageMetadata = null;
+
+                // find first message with specified number
+                for (var i = 0; i < AllMessages.Length; i++)
+                {
+                    var messageMetadata = AllMessages[i];
+                    if (messageMetadata.Number == messageNumber)
+                    {
+                        definedMessageMetadata = messageMetadata;
+                        break;
+                    }
+                }
+
                 if (definedMessageMetadata == null)
                 {
                     throw CreateMessageTypeNotSupportedException(messageNumber);
@@ -109,8 +123,10 @@ public Message Create(byte messageNumber)
 
         public void DisableNonKeyExchangeMessages()
         {
-            foreach (var messageMetadata in AllMessages)
+            for (var i = 0; i < AllMessages.Length; i++)
             {
+                var messageMetadata = AllMessages[i];
+
                 var messageNumber = messageMetadata.Number;
                 if ((messageNumber > 2 && messageNumber < 20) || messageNumber > 30)
                 {
@@ -121,8 +137,10 @@ public void DisableNonKeyExchangeMessages()
 
         public void EnableActivatedMessages()
         {
-            foreach (var messageMetadata in AllMessages)
+            for (var i = 0; i < AllMessages.Length; i++)
             {
+                var messageMetadata = AllMessages[i];
+
                 if (!_activatedMessagesById[messageMetadata.Id])
                     continue;
 

From 703e24b629dd6adf749d8665fc995614f33a646c Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Feb 2017 22:09:09 +0100
Subject: [PATCH 050/128] Allow Dispose to interrupt blocking wait. Avoid
 ObjectDisposedException in Read().

---
 .../Classes/Sftp/SftpFileReaderTestBase.cs    |  11 +
 ...st_DisposeShouldUnblockReadAndReadAhead.cs |  36 +++-
 ...ReaderTest_LastChunkBeforeEofIsComplete.cs |  29 ++-
 ...eReaderTest_LastChunkBeforeEofIsPartial.cs |  29 ++-
 ...iousChunkIsIncompleteAndEofIsNotReached.cs |  47 ++++-
 ...reviousChunkIsIncompleteAndEofIsReached.cs |  29 ++-
 ...vokeException_DiscardsFurtherReadAheads.cs |  29 ++-
 ...vokeException_PreventsFurtherReadAheads.cs |  29 ++-
 ...dExceptionInWaitOnHandle_ChunkAvailable.cs |  31 ++-
 ...xceptionInWaitOnHandle_NoChunkAvailable.cs |  25 ++-
 ...Test_Read_ReahAheadExceptionInBeginRead.cs |  39 +++-
 src/Renci.SshNet/ISubsystemSession.cs         |  84 ++++++++
 src/Renci.SshNet/ServiceFactory.cs            |   5 +-
 src/Renci.SshNet/Sftp/SftpFileReader.cs       | 154 ++++++++------
 src/Renci.SshNet/SubsystemSession.cs          | 193 +++++++++++++++++-
 15 files changed, 637 insertions(+), 133 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
index e3e0c62d4..fe73f9a6d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTestBase.cs
@@ -1,7 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Renci.SshNet.Common;
 using Renci.SshNet.Sftp;
 using System;
+using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
@@ -45,5 +47,14 @@ protected static byte[] CreateByteArray(Random random, int length)
             random.NextBytes(chunk);
             return chunk;
         }
+
+        protected static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout)
+        {
+            var result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+
+            if (result == WaitHandle.WaitTimeout)
+                throw new SshOperationTimeoutException();
+            return result;
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
index 0e98cc16a..0c3d7d237 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead : SftpFileR
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private SftpFileReader _reader;
         private ObjectDisposedException _actualException;
 
@@ -27,23 +29,36 @@ protected override void SetupData()
 
             _handle = CreateByteArray(random, 5);
             _fileSize = 5000;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
         }
 
         protected override void Arrange()
@@ -94,18 +109,23 @@ public void ReadAfterDisposeShouldThrowObjectDisposedException()
             }
         }
 
-        [TestMethod]
-        public void DisposeShouldCloseHandleAndCompleteImmediately()
+        public void HandleShouldHaveBeenClosed()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
+        }
 
+        [TestMethod]
+        public void DisposeShouldCompleteImmediatelyAndNotAttemptToCloseHandleAgain()
+        {
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
             stopwatch.Stop();
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
index f58c17d08..213c140e7 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsComplete : SftpFileReaderTes
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk3;
@@ -36,16 +38,27 @@ protected override void SetupData()
             _chunk2 = CreateByteArray(random, ChunkLength - 10);
             _chunk3 = new byte[0];
             _fileSize = _chunk1.Length + _chunk2.Length;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -56,7 +69,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -67,7 +81,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -131,7 +146,8 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -139,7 +155,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
index 5bfb82e80..7df9e76e2 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_LastChunkBeforeEofIsPartial : SftpFileReaderTest
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk3;
@@ -35,16 +37,27 @@ protected override void SetupData()
             _chunk2 = CreateByteArray(random, ChunkLength);
             _chunk3 = new byte[0];
             _fileSize = _chunk1.Length + _chunk2.Length;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -55,7 +68,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -66,7 +80,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -130,7 +145,8 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -138,7 +154,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
index 60f181a71..c0253b599 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached : Sf
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk2CatchUp1;
@@ -34,6 +36,7 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached : Sf
         private ManualResetEvent _chunk3BeginRead;
         private ManualResetEvent _chunk4BeginRead;
         private ManualResetEvent _chunk5BeginRead;
+        private ManualResetEvent _waitBeforeChunk6;
         private ManualResetEvent _chunk6BeginRead;
         private byte[] _actualChunk4;
         private byte[] _actualChunk2CatchUp1;
@@ -60,18 +63,30 @@ protected override void SetupData()
             _chunk3BeginRead = new ManualResetEvent(false);
             _chunk4BeginRead = new ManualResetEvent(false);
             _chunk5BeginRead = new ManualResetEvent(false);
+            _waitBeforeChunk6 = new ManualResetEvent(false);
             _chunk6BeginRead = new ManualResetEvent(false);
             _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp1.Length + _chunk2CatchUp2.Length + _chunk3.Length + _chunk4.Length + _chunk5.Length;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -83,7 +98,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -95,7 +111,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -107,7 +124,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 3 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -119,7 +137,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 4 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -129,15 +148,17 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk5, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Callback(() => _waitBeforeChunk6.Set())
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 17, 17))
                             .Returns(_chunk2CatchUp1);
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.RequestRead(_handle, 2 * ChunkLength - 7, 7))
                             .Returns(_chunk2CatchUp2);
-            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
-            SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 5 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -170,6 +191,8 @@ protected override void Act()
             _actualChunk2 = _reader.Read();
             // consuming chunk2 allows chunk5 to be read-ahead
             Assert.IsTrue(_chunk5BeginRead.WaitOne(200));
+            // pauze until the read-ahead has started waiting a semaphore to become available
+            Assert.IsTrue(_waitBeforeChunk6.WaitOne(200));
             // consume remaining parts of chunk 2
             _actualChunk2CatchUp1 = _reader.Read();
             _actualChunk2CatchUp2 = _reader.Read();
@@ -261,7 +284,8 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -269,7 +293,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
index 2f69afb44..f4be16763 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached : SftpF
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private byte[] _chunk2CatchUp;
@@ -44,16 +46,27 @@ protected override void SetupData()
             _chunk2BeginRead = new ManualResetEvent(false);
             _chunk3BeginRead = new ManualResetEvent(false);
             _fileSize = _chunk1.Length + _chunk2.Length + _chunk2CatchUp.Length + _chunk3.Length;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
         }
 
         protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -65,7 +78,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -77,7 +91,8 @@ protected override void SetupMocks()
                             .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -159,7 +174,8 @@ public void ReadAfterEndOfFileShouldThrowSshException()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -167,7 +183,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
index 1712d22f6..1d7708ae8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -18,7 +18,9 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadA
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk3;
         private ManualResetEvent _readAheadChunk3Completed;
@@ -34,7 +36,9 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk3 = CreateByteArray(random, ChunkLength);
             _fileSize = 3 * ChunkLength;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
             _readAheadChunk3Completed = new ManualResetEvent(false);
 
@@ -45,9 +49,18 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -58,7 +71,8 @@ protected override void SetupMocks()
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -76,7 +90,8 @@ protected override void SetupMocks()
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -142,7 +157,8 @@ public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadA
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -150,7 +166,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
index 294a130e9..b4f6929b6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs
@@ -18,7 +18,9 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadA
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk3;
         private SftpFileReader _reader;
@@ -35,7 +37,9 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk3 = CreateByteArray(random, ChunkLength);
             _fileSize = 3 * _chunk1.Length;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
             _readAheadChunk2 = new ManualResetEvent(false);
             _readChunk2 = new ManualResetEvent(false);
@@ -47,9 +51,18 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -60,7 +73,8 @@ protected override void SetupMocks()
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -81,7 +95,8 @@ protected override void SetupMocks()
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
         }
 
         protected override void Arrange()
@@ -137,7 +152,8 @@ public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadA
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -145,7 +161,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
index 160821507..4707f5a80 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvail
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private SftpFileReader _reader;
@@ -33,7 +35,9 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk2 = CreateByteArray(random, ChunkLength);
             _fileSize = _chunk1.Length + _chunk2.Length + 1;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
             _exception = new SshException();
             _exceptionSignaled = new ManualResetEvent(false);
@@ -43,9 +47,18 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                               {
+                                   _waitHandleArray[0] = disposingWaitHandle;
+                                   _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                                   return _waitHandleArray;
+                               });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -56,7 +69,7 @@ protected override void SetupMocks()
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout))
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
                            .Callback(() => _exceptionSignaled.Set())
                            .Throws(_exception);
         }
@@ -70,7 +83,7 @@ protected override void Arrange()
 
         protected override void Act()
         {
-            // wait for the exception to be signaled by the second call to WaitOnHandle
+            // wait for the exception to be signaled by the second call to WaitAny
             _exceptionSignaled.WaitOne(5000);
             // allow a little time to allow SftpFileReader to process exception
             Thread.Sleep(100);
@@ -86,14 +99,14 @@ protected override void Act()
         }
 
         [TestMethod]
-        public void ReadShouldHaveRethrownExceptionThrownByWaitOnHandle()
+        public void ReadShouldHaveRethrownExceptionThrownByWaitAny()
         {
             Assert.IsNotNull(_actualException);
             Assert.AreSame(_exception, _actualException);
         }
 
         [TestMethod]
-        public void ReadShouldRethrowExceptionThrownByWaitOnHandle()
+        public void ReadShouldRethrowExceptionThrownByWaitAny()
         {
             try
             {
@@ -109,7 +122,8 @@ public void ReadShouldRethrowExceptionThrownByWaitOnHandle()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -117,7 +131,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
index cfbc42e5f..90ad50d9c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAva
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private SftpFileReader _reader;
         private SshException _exception;
         private SshException _actualException;
@@ -28,7 +30,9 @@ protected override void SetupData()
 
             _handle = CreateByteArray(random, 5);
             _fileSize = random.Next();
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
             _exception = new SshException();
         }
@@ -37,15 +41,24 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout));
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Returns((SftpReadAsyncResult)null);
             SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
             SftpSessionMock.InSequence(_seq)
-                           .Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>(), _operationTimeout))
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
                            .Throws(_exception);
         }
 
@@ -93,7 +106,8 @@ public void ReadShouldRethrowExceptionThrownByWaitOnHandle()
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -101,7 +115,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
index 691d7496e..98d773693 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs
@@ -17,7 +17,9 @@ public class SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead : SftpFileRea
         private MockSequence _seq;
         private byte[] _handle;
         private int _fileSize;
+        private WaitHandle[] _waitHandleArray;
         private int _operationTimeout;
+        private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk2;
         private SftpFileReader _reader;
@@ -34,7 +36,9 @@ protected override void SetupData()
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk2 = CreateByteArray(random, ChunkLength);
             _fileSize = _chunk1.Length + _chunk2.Length + 1;
-            _operationTimeout = random.Next();
+            _waitHandleArray = new WaitHandle[2];
+            _operationTimeout = random.Next(10000, 20000);
+            _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
             _readAheadChunk3 = new ManualResetEvent(false);
             _readChunk3 = new ManualResetEvent(false);
@@ -46,6 +50,18 @@ protected override void SetupMocks()
         {
             _seq = new MockSequence();
 
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.CreateWaitHandleArray(It.IsNotNull<WaitHandle>(), It.IsNotNull<WaitHandle>()))
+                           .Returns<WaitHandle, WaitHandle>((disposingWaitHandle, semaphoreAvailableWaitHandle) =>
+                           {
+                               _waitHandleArray[0] = disposingWaitHandle;
+                               _waitHandleArray[1] = semaphoreAvailableWaitHandle;
+                               return _waitHandleArray;
+                           });
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                            .Setup(p => p.BeginRead(_handle, 0, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                            .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -54,6 +70,10 @@ protected override void SetupMocks()
                                     asyncResult.SetAsCompleted(_chunk1, false);
                                 })
                            .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -62,6 +82,10 @@ protected override void SetupMocks()
                                 asyncResult.SetAsCompleted(_chunk2, false);
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
             SftpSessionMock.InSequence(_seq)
                             .Setup(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()))
                             .Callback<byte[], ulong, uint, AsyncCallback, object>((handle, offset, length, callback, state) =>
@@ -110,24 +134,24 @@ public void ReadOfThirdChunkShouldThrowExceptionThatOccurredInReadAhead()
         }
 
         [TestMethod]
-        public void ReadAfterReadAheadExceptionShouldThrowObjectDisposedException()
+        public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadAhead()
         {
             try
             {
                 _reader.Read();
                 Assert.Fail();
             }
-            catch (ObjectDisposedException ex)
+            catch (SshException ex)
             {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(typeof(SftpFileReader).FullName, ex.ObjectName);
+                Assert.AreSame(_exception, ex);
             }
         }
 
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {
-            SftpSessionMock.InSequence(_seq).Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(_seq).Setup(p => p.BeginClose(_handle, null, null)).Returns(_closeAsyncResult);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.EndClose(_closeAsyncResult));
 
             var stopwatch = Stopwatch.StartNew();
             _reader.Dispose();
@@ -135,7 +159,8 @@ public void DisposeShouldCloseHandleAndCompleteImmediately()
 
             Assert.IsTrue(stopwatch.ElapsedMilliseconds < 200, "Dispose took too long to complete: " + stopwatch.ElapsedMilliseconds);
 
-            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);
+            SftpSessionMock.Verify(p => p.EndClose(_closeAsyncResult), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet/ISubsystemSession.cs b/src/Renci.SshNet/ISubsystemSession.cs
index d31ca70a3..48f155b65 100644
--- a/src/Renci.SshNet/ISubsystemSession.cs
+++ b/src/Renci.SshNet/ISubsystemSession.cs
@@ -46,5 +46,89 @@ internal interface ISubsystemSession : IDisposable
         /// <exception cref="SshException">The channel was closed.</exception>
         /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified timeout.</exception>
         void WaitOnHandle(WaitHandle waitHandle, int millisecondsTimeout);
+
+        /// <summary>
+        /// Blocks the current thread until the specified <see cref="WaitHandle"/> gets signaled, using a
+        /// 32-bit signed integer to specify the time interval in milliseconds.
+        /// </summary>
+        /// <param name="waitHandle">The handle to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for <paramref name="waitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// <c>true</c> if <paramref name="waitHandle"/> received a signal within the specified timeout;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <remarks>
+        /// The blocking wait is also interrupted when either the established channel is closed, the current
+        /// session is disconnected or an unexpected <see cref="Exception"/> occurred while processing a channel
+        /// or session event.
+        /// </remarks>
+        bool WaitOne(WaitHandle waitHandle, int millisecondsTimeout);
+
+        /// <summary>
+        /// Blocks the current thread until the specified <see cref="WaitHandle"/> gets signaled, using a
+        /// 32-bit signed integer to specify the time interval in milliseconds.
+        /// </summary>
+        /// <param name="waitHandleA">The first handle to wait for.</param>
+        /// <param name="waitHandleB">The second handle to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for a <see cref="WaitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// <c>0</c> if <paramref name="waitHandleA"/> received a signal within the specified timeout and <c>1</c>
+        /// if <paramref name="waitHandleB"/> received a signal within the specified timeout, or <see cref="WaitHandle.WaitTimeout"/>
+        /// if no object satisfied the wait.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <remarks>
+        /// <para>
+        /// The blocking wait is also interrupted when either the established channel is closed, the current
+        /// session is disconnected or an unexpected <see cref="Exception"/> occurred while processing a channel
+        /// or session event.
+        /// </para>
+        /// <para>
+        /// When both <paramref name="waitHandleA"/> and <paramref name="waitHandleB"/> are signaled during the call,
+        /// then <c>0</c> is returned.
+        /// </para>
+        /// </remarks>
+        int WaitAny(WaitHandle waitHandleA, WaitHandle waitHandleB, int millisecondsTimeout);
+
+        /// <summary>
+        /// Waits for any of the elements in the specified array to receive a signal, using a 32-bit signed
+        /// integer to specify the time interval.
+        /// </summary>
+        /// <param name="waitHandles">A <see cref="WaitHandle"/> array - constructed using <see cref="CreateWaitHandleArray(WaitHandle[])"/> - containing the objects to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for a <see cref="WaitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// The array index of the first non-system object that satisfied the wait.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <exception cref="SshOperationTimeoutException">No object satified the wait and a time interval equivalent to <paramref name="millisecondsTimeout"/> has passed.</exception>
+        /// <remarks>
+        /// For the return value, the index of the first non-system object is considered to be zero.
+        /// </remarks>
+        int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout);
+
+        /// <summary>
+        /// Creates a <see cref="WaitHandle"/> array that is composed of system objects and the specified
+        /// elements.
+        /// </summary>
+        /// <param name="waitHandles">A <see cref="WaitHandle"/> array containing the objects to wait for.</param>
+        /// <returns>
+        /// A <see cref="WaitHandle"/> array that is composed of system objects and the specified elements.
+        /// </returns>
+        WaitHandle[] CreateWaitHandleArray(params WaitHandle[] waitHandles);
+
+        /// <summary>
+        /// Creates a <see cref="WaitHandle"/> array that is composed of system objects and the specified
+        /// elements.
+        /// </summary>
+        /// <param name="waitHandle1">The first <see cref="WaitHandle"/> to wait for.</param>
+        /// <param name="waitHandle2">The second <see cref="WaitHandle"/> to wait for.</param>
+        /// <returns>
+        /// A <see cref="WaitHandle"/> array that is composed of system objects and the specified elements.
+        /// </returns>
+        WaitHandle[] CreateWaitHandleArray(WaitHandle waitHandle1, WaitHandle waitHandle2);
     }
 }
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index 8fde6b639..47377d1c1 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -109,7 +109,6 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
             int maxPendingReads;
 
             var chunkSize = sftpSession.CalculateOptimalReadLength(bufferSize);
-            var handle = sftpSession.EndOpen(openAsyncResult);
 
             // fallback to a default maximum of pending reads when remote server does not allow us to obtain
             // the attributes of the file
@@ -117,7 +116,7 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
             {
                 var fileAttributes = sftpSession.EndLStat(statAsyncResult);
                 fileSize = fileAttributes.Size;
-                maxPendingReads = Math.Min(20, (int) Math.Ceiling((double) fileAttributes.Size / chunkSize) + 1);
+                maxPendingReads = Math.Min(10, (int) Math.Ceiling((double) fileAttributes.Size / chunkSize) + 1);
             }
             catch (SshException ex)
             {
@@ -127,6 +126,8 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
                 DiagnosticAbstraction.Log(string.Format("Failed to obtain size of file. Allowing maximum {0} pending reads: {1}", maxPendingReads, ex));
             }
 
+            var handle = sftpSession.EndOpen(openAsyncResult);
+
             return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
     }
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 6b434233e..0bf582a5d 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -2,6 +2,7 @@
 using Renci.SshNet.Common;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 
 namespace Renci.SshNet.Sftp
@@ -18,12 +19,14 @@ internal class SftpFileReader : ISftpFileReader
         /// <summary>
         /// Holds the size of the file, when available.
         /// </summary>
-        private long? _fileSize;
+        private readonly long? _fileSize;
         private readonly IDictionary<int, BufferedRead> _queue;
+        private readonly WaitHandle[] _waitHandles;
 
         private int _readAheadChunkIndex;
         private ulong _readAheadOffset;
         private ManualResetEvent _readAheadCompleted;
+        private ManualResetEvent _disposingWaitHandle;
         private int _nextChunkIndex;
 
         /// <summary>
@@ -38,7 +41,6 @@ internal class SftpFileReader : ISftpFileReader
         private readonly object _readLock;
 
         private Exception _exception;
-        private bool _disposed;
 
         /// <summary>
         /// Initializes a new <see cref="SftpFileReader"/> instance with the specified handle,
@@ -59,13 +61,15 @@ public SftpFileReader(byte[] handle, ISftpSession sftpSession, uint chunkSize, i
             _queue = new Dictionary<int, BufferedRead>(maxPendingReads);
             _readLock = new object();
             _readAheadCompleted = new ManualResetEvent(false);
+            _disposingWaitHandle = new ManualResetEvent(false);
+            _waitHandles = _sftpSession.CreateWaitHandleArray(_disposingWaitHandle, _semaphore.AvailableWaitHandle);
 
             StartReadAhead();
         }
 
         public byte[] Read()
         {
-            if (_disposed)
+            if (_disposingWaitHandle == null)
                 throw new ObjectDisposedException(GetType().FullName);
             if (_exception != null)
                 throw _exception;
@@ -85,13 +89,15 @@ public byte[] Read()
                 if (_exception != null)
                     throw _exception;
 
+                var data = nextChunk.Data;
+
                 if (nextChunk.Offset == _offset)
                 {
-                    var data = nextChunk.Data;
-
                     // have we reached EOF?
                     if (data.Length == 0)
                     {
+                        // PERF: we do not bother updating internal state when we've EOF
+
                         _isEndOfFileRead = true;
                     }
                     else
@@ -105,16 +111,17 @@ public byte[] Read()
                     }
                     // unblock wait in read-ahead
                     _semaphore.Release();
+
                     return data;
                 }
 
                 // when we received an EOF for the next chunk and the size of the file is known, then
                 // we only complete the current chunk if we haven't already read up to the file size;
                 // this way we save an extra round-trip to the server
-                if (nextChunk.Data.Length == 0 && _fileSize.HasValue && _offset == (ulong)_fileSize.Value)
+                if (data.Length == 0 && _fileSize.HasValue && _offset == (ulong) _fileSize.Value)
                 {
+                    // avoid future reads
                     _isEndOfFileRead = true;
-
                     // unblock wait in read-ahead
                     _semaphore.Release();
                     // signal EOF to caller
@@ -122,7 +129,6 @@ public byte[] Read()
                 }
             }
 
-
             // when the server returned less bytes than requested (for the previous chunk)
             // we'll synchronously request the remaining data
             //
@@ -143,6 +149,7 @@ public byte[] Read()
             var read = _sftpSession.RequestRead(_handle, _offset, (uint) bytesToCatchUp);
             if (read.Length == 0)
             {
+                // process data in read lock to avoid ObjectDisposedException while releasing semaphore
                 lock (_readLock)
                 {
                     // a zero-length (EOF) response is only valid for the read-back when EOF has
@@ -150,9 +157,12 @@ public byte[] Read()
                     if (nextChunk.Data.Length == 0)
                     {
                         _isEndOfFileRead = true;
-
-                        // unblock wait in read-ahead
-                        _semaphore.Release();
+                        // ensure we've not yet disposed the current instance
+                        if (_semaphore != null)
+                        {
+                            // unblock wait in read-ahead
+                            _semaphore.Release();
+                        }
                         // signal EOF to caller
                         return read;
                     }
@@ -175,52 +185,57 @@ public byte[] Read()
             return read;
         }
 
+        ~SftpFileReader()
+        {
+            Dispose(false);
+        }
+
         public void Dispose()
         {
             Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        /// <remarks>
-        /// Note that we will break the read-ahead loop, but will not interrupt the blocking wait
-        /// in that loop.
-        /// </remarks>
         protected void Dispose(bool disposing)
         {
-            if (_disposed)
+            if (_disposingWaitHandle == null)
                 return;
 
             if (disposing)
             {
-                // use this to break the read-ahead loop
+                // record exception to break prevent future Read()
                 _exception = new ObjectDisposedException(GetType().FullName);
 
-                var readAheadCompleted = _readAheadCompleted;
-                if (readAheadCompleted != null)
-                {
-                    readAheadCompleted.WaitOne();
-                    readAheadCompleted.Dispose();
-                    _readAheadCompleted = null;
-                }
+                // signal that we're disposing to interrupt wait in read-ahead
+                _disposingWaitHandle.Set();
 
-                // dispose semaphore in read lock to ensure we don't run into an ObjectDisposedException
-                // in Read()
+                // wait until the read-ahead thread has completed
+                _readAheadCompleted.WaitOne();
+
+                // unblock the Read()
                 lock (_readLock)
                 {
-                    if (_semaphore != null)
-                    {
-                        _semaphore.Dispose();
-                        _semaphore = null;
-                    }
+                    // dispose semaphore in read lock to ensure we don't run into an ObjectDisposedException
+                    // in Read()
+                    _semaphore.Dispose();
+                    // awake Read
+                    Monitor.Pulse(_readLock);
                 }
 
-                _sftpSession.RequestClose(_handle);
-            }
+                var closeAsyncResult = _sftpSession.BeginClose(_handle, null, null);
 
-            _disposed = true;
+                _readAheadCompleted.Dispose();
+                _disposingWaitHandle.Dispose();
+
+                _sftpSession.EndClose(closeAsyncResult);
+
+                // dereference the disposing waithandle to indicate that the current instance is disposed
+                _disposingWaitHandle = null;
+            }
         }
 
         private void StartReadAhead()
@@ -229,36 +244,26 @@ private void StartReadAhead()
             {
                 while (!_endOfFileReceived && _exception == null)
                 {
-                    // wait on either a release on the semaphore, or signaling of a broken session/connection
-                    try
-                    {
-                        _sftpSession.WaitOnHandle(_semaphore.AvailableWaitHandle, _sftpSession.OperationTimeout);
-                    }
-                    catch (Exception ex)
+                    // check if we should continue with the read-ahead loop
+                    // note that the EOF and exception check are not included
+                    // in this check as they do not require Read() to be
+                    // unblocked (or have already done this)
+                    if (!ContinueReadAhead())
                     {
-                        _exception = ex;
-
                         // unblock the Read()
                         lock (_readLock)
                         {
                             Monitor.Pulse(_readLock);
                         }
-
                         // break the read-ahead loop
                         break;
                     }
 
                     // attempt to obtain the semaphore; this may time out when all semaphores are
-                    // in use due to pending read-aheads
-                    //
-                    // in general this only happens when the session is broken
+                    // in use due to pending read-aheads (which in turn can happen when the server
+                    // is slow to respond or when the session is broken)
                     if (!_semaphore.Wait(ReadAheadWaitTimeoutInMilliseconds))
                     {
-                        // unblock the Read()
-                        lock (_readLock)
-                        {
-                            Monitor.Pulse(_readLock);
-                        }
                         // re-evaluate whether an exception occurred, and - if not - wait again
                         continue;
                     }
@@ -290,6 +295,34 @@ private void StartReadAhead()
             });
         }
 
+        /// <summary>
+        /// Returns a value indicating whether the read-ahead loop should be continued.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if the read-ahead loop should be continued; otherwise, <c>false</c>.
+        /// </returns>
+        private bool ContinueReadAhead()
+        {
+            try
+            {
+                var waitResult = _sftpSession.WaitAny(_waitHandles, _sftpSession.OperationTimeout);
+                switch (waitResult)
+                {
+                    case 0: // disposing
+                        return false;
+                    case 1: // semaphore available
+                        return true;
+                    default:
+                        throw new NotImplementedException(string.Format(CultureInfo.InvariantCulture, "WaitAny return value '{0}' is not implemented.", waitResult));
+                }
+            }
+            catch (Exception ex)
+            {
+                _exception = ex;
+                return false;
+            }
+        }
+
         private void ReadCompleted(IAsyncResult result)
         {
             var readAsyncResult = result as SftpReadAsyncResult;
@@ -312,7 +345,15 @@ private void ReadCompleted(IAsyncResult result)
             // but there may be pending reads before that read
             var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
             bufferedRead.Complete(data);
-            _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
+
+            lock (_readLock)
+            {
+                // add item to queue
+                _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
+                // signal that a chunk has been read or EOF has been reached;
+                // in both cases, Read() will eventually also unblock the "read-ahead" thread
+                Monitor.Pulse(_readLock);
+            }
 
             // check if server signaled EOF
             if (data.Length == 0)
@@ -320,13 +361,6 @@ private void ReadCompleted(IAsyncResult result)
                 // set a flag to stop read-aheads
                 _endOfFileReceived = true;
             }
-
-            // signal that a chunk has been read or EOF has been reached;
-            // in both cases, Read() will eventually also unblock the "read-ahead" thread
-            lock (_readLock)
-            {
-                Monitor.PulseAll(_readLock);
-            }
         }
 
         private void HandleFailure(Exception cause)
@@ -339,7 +373,7 @@ private void HandleFailure(Exception cause)
             // unblock Read()
             lock (_readLock)
             {
-                Monitor.PulseAll(_readLock);
+                Monitor.Pulse(_readLock);
             }
         }
 
diff --git a/src/Renci.SshNet/SubsystemSession.cs b/src/Renci.SshNet/SubsystemSession.cs
index f950e2ee7..d8a64305d 100644
--- a/src/Renci.SshNet/SubsystemSession.cs
+++ b/src/Renci.SshNet/SubsystemSession.cs
@@ -13,6 +13,12 @@ namespace Renci.SshNet
     /// </summary>
     internal abstract class SubsystemSession : ISubsystemSession
     {
+        /// <summary>
+        /// Holds the number of system wait handles that are returned as the leading entries in the array returned
+        /// in <see cref="CreateWaitHandleArray(WaitHandle[])"/>.
+        /// </summary>
+        private const int SystemWaitHandleCount = 3;
+
         private ISession _session;
         private readonly string _subsystemName;
         private IChannelSession _channel;
@@ -225,7 +231,107 @@ public void WaitOnHandle(WaitHandle waitHandle, int millisecondsTimeout)
                     waitHandle
                 };
 
-            switch (WaitHandle.WaitAny(waitHandles, millisecondsTimeout))
+            var result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+            switch (result)
+            {
+                case 0:
+                    throw _exception;
+                case 1:
+                    throw new SshException("Connection was closed by the server.");
+                case 2:
+                    throw new SshException("Channel was closed.");
+                case 3:
+                    break;
+                case WaitHandle.WaitTimeout:
+                    throw new SshOperationTimeoutException("Operation has timed out.");
+                default:
+                    throw new NotImplementedException(string.Format(CultureInfo.InvariantCulture, "WaitAny return value '{0}' is not implemented.", result));
+            }
+        }
+
+        /// <summary>
+        /// Blocks the current thread until the specified <see cref="WaitHandle"/> gets signaled, using a
+        /// 32-bit signed integer to specify the time interval in milliseconds.
+        /// </summary>
+        /// <param name="waitHandle">The handle to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for <paramref name="waitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// <c>true</c> if <paramref name="waitHandle"/> received a signal within the specified timeout;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <remarks>
+        /// The blocking wait is also interrupted when either the established channel is closed, the current
+        /// session is disconnected or an unexpected <see cref="Exception"/> occurred while processing a channel
+        /// or session event.
+        /// </remarks>
+        public bool WaitOne(WaitHandle waitHandle, int millisecondsTimeout)
+        {
+            var waitHandles = new[]
+                {
+                    _errorOccuredWaitHandle,
+                    _sessionDisconnectedWaitHandle,
+                    _channelClosedWaitHandle,
+                    waitHandle
+                };
+
+            var result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+            switch (result)
+            {
+                case 0:
+                    throw _exception;
+                case 1:
+                    throw new SshException("Connection was closed by the server.");
+                case 2:
+                    throw new SshException("Channel was closed.");
+                case 3:
+                    return true;
+                case WaitHandle.WaitTimeout:
+                    return false;
+                default:
+                    throw new NotImplementedException(string.Format(CultureInfo.InvariantCulture, "WaitAny return value '{0}' is not implemented.", result));
+            }
+        }
+
+        /// <summary>
+        /// Blocks the current thread until the specified <see cref="WaitHandle"/> gets signaled, using a
+        /// 32-bit signed integer to specify the time interval in milliseconds.
+        /// </summary>
+        /// <param name="waitHandle1">The first handle to wait for.</param>
+        /// <param name="waitHandle2">The second handle to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for a <see cref="WaitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// <c>0</c> if <paramref name="waitHandle1"/> received a signal within the specified timeout, and <c>1</c>
+        /// if <paramref name="waitHandle2"/> received a signal within the specified timeout.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <exception cref="SshOperationTimeoutException">The handle did not get signaled within the specified timeout.</exception>
+        /// <remarks>
+        /// <para>
+        /// The blocking wait is also interrupted when either the established channel is closed, the current
+        /// session is disconnected or an unexpected <see cref="Exception"/> occurred while processing a channel
+        /// or session event.
+        /// </para>
+        /// <para>
+        /// When both <paramref name="waitHandle1"/> and <paramref name="waitHandle2"/> are signaled during the call,
+        /// then <c>0</c> is returned.
+        /// </para>
+        /// </remarks>
+        public int WaitAny(WaitHandle waitHandle1, WaitHandle waitHandle2, int millisecondsTimeout)
+        {
+            var waitHandles = new[]
+                {
+                    _errorOccuredWaitHandle,
+                    _sessionDisconnectedWaitHandle,
+                    _channelClosedWaitHandle,
+                    waitHandle1,
+                    waitHandle2
+                };
+
+            var result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+            switch (result)
             {
                 case 0:
                     throw _exception;
@@ -233,11 +339,94 @@ public void WaitOnHandle(WaitHandle waitHandle, int millisecondsTimeout)
                     throw new SshException("Connection was closed by the server.");
                 case 2:
                     throw new SshException("Channel was closed.");
+                case 3:
+                    return 0;
+                case 4:
+                    return 1;
                 case WaitHandle.WaitTimeout:
-                    throw new SshOperationTimeoutException(string.Format(CultureInfo.CurrentCulture, "Operation has timed out."));
+                    throw new SshOperationTimeoutException("Operation has timed out.");
+                default:
+                    throw new NotImplementedException(string.Format(CultureInfo.InvariantCulture, "WaitAny return value '{0}' is not implemented.", result));
             }
         }
 
+        /// <summary>
+        /// Waits for any of the elements in the specified array to receive a signal, using a 32-bit signed
+        /// integer to specify the time interval.
+        /// </summary>
+        /// <param name="waitHandles">A <see cref="WaitHandle"/> array - constructed using <see cref="CreateWaitHandleArray(WaitHandle[])"/> - containing the objects to wait for.</param>
+        /// <param name="millisecondsTimeout">To number of milliseconds to wait for a <see cref="WaitHandle"/> to get signaled, or -1 to wait indefinitely.</param>
+        /// <returns>
+        /// The array index of the first non-system object that satisfied the wait.
+        /// </returns>
+        /// <exception cref="SshException">The connection was closed by the server.</exception>
+        /// <exception cref="SshException">The channel was closed.</exception>
+        /// <exception cref="SshOperationTimeoutException">No object satified the wait and a time interval equivalent to <paramref name="millisecondsTimeout"/> has passed.</exception>
+        /// <remarks>
+        /// For the return value, the index of the first non-system object is considered to be zero.
+        /// </remarks>
+        public int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout)
+        {
+            var result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+            switch (result)
+            {
+                case 0:
+                    throw _exception;
+                case 1:
+                    throw new SshException("Connection was closed by the server.");
+                case 2:
+                    throw new SshException("Channel was closed.");
+                case WaitHandle.WaitTimeout:
+                    throw new SshOperationTimeoutException("Operation has timed out.");
+                default:
+                    return result - SystemWaitHandleCount;
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="WaitHandle"/> array that is composed of system objects and the specified
+        /// elements.
+        /// </summary>
+        /// <param name="waitHandle1">The first <see cref="WaitHandle"/> to wait for.</param>
+        /// <param name="waitHandle2">The second <see cref="WaitHandle"/> to wait for.</param>
+        /// <returns>
+        /// A <see cref="WaitHandle"/> array that is composed of system objects and the specified elements.
+        /// </returns>
+        public WaitHandle[] CreateWaitHandleArray(WaitHandle waitHandle1, WaitHandle waitHandle2)
+        {
+            return new WaitHandle[]
+                {
+                    _errorOccuredWaitHandle,
+                    _sessionDisconnectedWaitHandle,
+                    _channelClosedWaitHandle,
+                    waitHandle1,
+                    waitHandle2
+                };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="WaitHandle"/> array that is composed of system objects and the specified
+        /// elements.
+        /// </summary>
+        /// <param name="waitHandles">A <see cref="WaitHandle"/> array containing the objects to wait for.</param>
+        /// <returns>
+        /// A <see cref="WaitHandle"/> array that is composed of system objects and the specified elements.
+        /// </returns>
+        public WaitHandle[] CreateWaitHandleArray(params WaitHandle[] waitHandles)
+        {
+            var array = new WaitHandle[waitHandles.Length + SystemWaitHandleCount];
+            array[0] = _errorOccuredWaitHandle;
+            array[1] = _sessionDisconnectedWaitHandle;
+            array[2] = _channelClosedWaitHandle;
+
+            for (var i = 0; i < waitHandles.Length; i++)
+            {
+                array[i + SystemWaitHandleCount] = waitHandles[i];
+            }
+
+            return array;
+        }
+
         private void Session_Disconnected(object sender, EventArgs e)
         {
             var sessionDisconnectedWaitHandle = _sessionDisconnectedWaitHandle;

From ca10625a93b83e37df3456d157d0e90c53b99421 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 6 Feb 2017 14:14:38 +0100
Subject: [PATCH 051/128] Add SftpCloseAsyncResult to .NET 3.5 project file.

---
 src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index ff5bf972a..79e432479 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -857,6 +857,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -944,7 +947,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From d57dbff9ee7236c253d4c19e5553ca16793f5357 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 6 Feb 2017 15:13:36 +0100
Subject: [PATCH 052/128] Remove unused class.

---
 src/Renci.SshNet/Renci.SshNet.csproj            |  1 -
 src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs | 12 ------------
 2 files changed, 13 deletions(-)
 delete mode 100644 src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs

diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 6e4e39f53..fdc4063d6 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -430,7 +430,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Sftp\SftpOpenAsyncResult.cs" />
-    <Compile Include="Sftp\SftpOpenDirAsyncResult.cs" />
     <Compile Include="Sftp\SftpReadAsyncResult.cs" />
     <Compile Include="Sftp\SftpRealPathAsyncResult.cs" />
     <Compile Include="Sftp\SftpSession.cs">
diff --git a/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs b/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs
deleted file mode 100644
index c3e9bcbcb..000000000
--- a/src/Renci.SshNet/Sftp/SftpOpenDirAsyncResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Renci.SshNet.Common;
-using System;
-
-namespace Renci.SshNet.Sftp
-{
-    internal class SftpOpenDirAsyncResult : AsyncResult<byte[]>
-    {
-        public SftpOpenDirAsyncResult(AsyncCallback asyncCallback, object state) : base(asyncCallback, state)
-        {
-        }
-    }
-}

From b22690d98536032f5146e8ec7ddf2175ce1f30bd Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Mon, 6 Feb 2017 15:15:27 +0100
Subject: [PATCH 053/128] Remove ServiceFactory argument from SftpSession.

---
 .../Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs     | 4 +---
 .../Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs  | 4 +---
 src/Renci.SshNet/ServiceFactory.cs                            | 2 +-
 src/Renci.SshNet/Sftp/SftpSession.cs                          | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index 86fac6d0f..7b05b5839 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -14,7 +14,6 @@ namespace Renci.SshNet.Tests.Classes.Sftp
     public class SftpSessionTest_Connected_RequestRead
     {
         private Mock<ISession> _sessionMock;
-        private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<IChannelSession> _channelSessionMock;
         private SftpSession _sftpSession;
         private int _operationTimeout;
@@ -40,7 +39,6 @@ protected void Arrange()
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
 
             var sequence = new MockSequence();
 
@@ -84,7 +82,7 @@ protected void Arrange()
                     }
                 );
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index 923d87a92..e1075a949 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -14,7 +14,6 @@ public class SftpSessionTest_Connected_RequestStatVfs
     {
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private Mock<IServiceFactory> _serviceFactoryMock;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private SftpFileSytemInformation _actual;
@@ -40,7 +39,6 @@ protected void Arrange()
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
-            _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
 
             var sequence = new MockSequence();
 
@@ -84,7 +82,7 @@ protected void Arrange()
                     }
                 );
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index 47377d1c1..b9ad0e95c 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -51,7 +51,7 @@ public ISession CreateSession(ConnectionInfo connectionInfo)
         /// </returns>
         public ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding)
         {
-            return new SftpSession(session, operationTimeout, encoding, this);
+            return new SftpSession(session, operationTimeout, encoding);
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index d26cd33f6..4f74f8843 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -17,7 +17,6 @@ internal class SftpSession : SubsystemSession, ISftpSession
         private readonly Dictionary<uint, SftpRequest> _requests = new Dictionary<uint, SftpRequest>();
         //FIXME: obtain from SftpClient!
         private readonly List<byte> _data = new List<byte>(32 * 1024);
-        private readonly IServiceFactory _serviceFactory;
         private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false);
         private IDictionary<string, string> _supportedExtensions;
 
@@ -50,10 +49,9 @@ public uint NextRequestId
             }
         }
 
-        public SftpSession(ISession session, int operationTimeout, Encoding encoding, IServiceFactory serviceFactory)
+        public SftpSession(ISession session, int operationTimeout, Encoding encoding)
             : base(session, "sftp", operationTimeout, encoding)
         {
-            _serviceFactory = serviceFactory;
         }
 
         /// <summary>

From 38aff42168c0914f1f944fa5fa90340fe1111055 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Mon, 6 Feb 2017 15:15:35 +0100
Subject: [PATCH 054/128] Sync project files.

---
 src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj   |  5 +----
 .../Renci.SshNet.Silverlight.csproj                | 14 +++++++++++++-
 .../Renci.SshNet.Silverlight5.csproj               | 14 +++++++++++++-
 src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj   | 12 ++++++++++++
 .../Renci.SshNet.WindowsPhone.csproj               | 12 ++++++++++++
 .../Renci.SshNet.WindowsPhone8.csproj              | 14 +++++++++++++-
 6 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 79e432479..73ea2655c 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -890,9 +890,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
       <Link>Sftp\SftpOpenAsyncResult.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenDirAsyncResult.cs">
-      <Link>Sftp\SftpOpenDirAsyncResult.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
@@ -947,7 +944,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index 7615d3d9b..a5faa428b 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -845,6 +845,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -872,12 +875,21 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
@@ -925,7 +937,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 55c2b61cb..bcf08a03c 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -854,6 +854,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -881,12 +884,21 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
@@ -931,7 +943,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 4ba0f2462..46b88f58b 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -924,6 +924,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
       <Link>Sftp\Responses\StatVfsResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -951,12 +954,21 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 6f14380c1..215e2561c 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -833,6 +833,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -860,12 +863,21 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 18f2d0a68..f5324d51b 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -880,6 +880,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
+      <Link>Sftp\SftpCloseAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDownloadAsyncResult.cs">
       <Link>Sftp\SftpDownloadAsyncResult.cs</Link>
     </Compile>
@@ -907,12 +910,21 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpMessageTypes.cs">
       <Link>Sftp\SftpMessageTypes.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpOpenAsyncResult.cs">
+      <Link>Sftp\SftpOpenAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpReadAsyncResult.cs">
       <Link>Sftp\SftpReadAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
+      <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SFtpStatAsyncResult.cs">
+      <Link>Sftp\SFtpStatAsyncResult.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSynchronizeDirectoriesAsyncResult.cs">
       <Link>Sftp\SftpSynchronizeDirectoriesAsyncResult.cs</Link>
     </Compile>
@@ -958,7 +970,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 89db30b88c1dfb855034aec724a9b3e06449a445 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Mon, 6 Feb 2017 15:37:41 +0100
Subject: [PATCH 055/128] Add SftpFileReader tests.

---
 .../Renci.SshNet.Tests.NET35.csproj           | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index a9ea6dbfe..193e98625 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1022,6 +1022,48 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileAttributesTest.cs">
       <Link>Classes\Sftp\SftpFileAttributesTest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTestBase.cs">
+      <Link>Classes\Sftp\SftpFileReaderTestBase.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsPartial.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsNotReached.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_PreviousChunkIsIncompleteAndEofIsReached.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_ReadAheadBeginReadException.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_ReadAheadBeginReadException.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_ReadAheadEndInvokeException_PreventsFurtherReadAheads.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_ReadBackBeginReadException.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_ReadBackBeginReadException.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_ReadBackEndInvokeException.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_ReadBackEndInvokeException.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs">
+      <Link>Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs</Link>
     </Compile>
@@ -1346,7 +1388,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From ec467689ce5b73a780d97dee8dab3d9c62a9eef9 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 6 Feb 2017 17:45:05 +0100
Subject: [PATCH 056/128] Harden and document test.

---
 ...vokeException_DiscardsFurtherReadAheads.cs | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
index 1d7708ae8..ffb07990d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads.cs
@@ -10,6 +10,21 @@
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
+    /// <summary>
+    /// Runs a reader with max. 2 pending reads.
+    /// The read-ahead of chunk1 starts followed by the read-ahead of chunk2.
+    /// The read-ahead of chunk1 completes successfully and the resulting chunk is read.
+    /// The read of this first chunk allows a third ahead-head to start.
+    /// The second read-ahead uses signals to forcefully block a failure completion until the read
+    /// ahead of the third chunk has completed and the semaphore is waiting for a slot to start
+    /// the read-ahead of chunk4.
+    /// The second read does not consume check3 as it is out of order, but instead waits for
+    /// the outcome of the read-ahead of chunk2.
+    /// 
+    /// The completion with exception of chunk2 causes the second read to throw that same exception, and
+    /// signals the semaphore that was waiting to start the read-ahead of chunk4. However, due to the fact
+    /// that chunk2 completed with an exception, the read-ahead loop is stopped.
+    /// </summary>
     [TestClass]
     public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadAheads : SftpFileReaderTestBase
     {
@@ -23,7 +38,9 @@ public class SftpFileReaderTest_ReadAheadEndInvokeException_DiscardsFurtherReadA
         private SftpCloseAsyncResult _closeAsyncResult;
         private byte[] _chunk1;
         private byte[] _chunk3;
+        private ManualResetEvent _readAheadChunk2Completed;
         private ManualResetEvent _readAheadChunk3Completed;
+        private ManualResetEvent _waitingForSemaphoreAfterCompletingChunk3;
         private SftpFileReader _reader;
         private SshException _exception;
         private SshException _actualException;
@@ -35,12 +52,14 @@ protected override void SetupData()
             _handle = CreateByteArray(random, 5);
             _chunk1 = CreateByteArray(random, ChunkLength);
             _chunk3 = CreateByteArray(random, ChunkLength);
-            _fileSize = 3 * ChunkLength;
+            _fileSize = 4 * ChunkLength;
             _waitHandleArray = new WaitHandle[2];
             _operationTimeout = random.Next(10000, 20000);
             _closeAsyncResult = new SftpCloseAsyncResult(null, null);
 
+            _readAheadChunk2Completed = new ManualResetEvent(false);
             _readAheadChunk3Completed = new ManualResetEvent(false);
+            _waitingForSemaphoreAfterCompletingChunk3 = new ManualResetEvent(false);
 
             _exception = new SshException();
         }
@@ -79,12 +98,16 @@ protected override void SetupMocks()
                             {
                                 ThreadAbstraction.ExecuteThread(() =>
                                 {
-                                    // wait until the read-ahead for chunk3 has completed
-                                    _readAheadChunk3Completed.WaitOne(TimeSpan.FromSeconds(5));
-
+                                    // wait until the read-ahead for chunk3 has completed; this should allow
+                                    // the read-ahead of chunk4 to start
+                                    _readAheadChunk3Completed.WaitOne(TimeSpan.FromSeconds(3));
+                                    // wait until the semaphore wait to start with chunk4 has started
+                                    _waitingForSemaphoreAfterCompletingChunk3.WaitOne(TimeSpan.FromSeconds(7));
                                     // complete async read of chunk2 with exception
                                     var asyncResult = new SftpReadAsyncResult(callback, state);
                                     asyncResult.SetAsCompleted(_exception, false);
+                                    // signal that read-ahead of chunk 2 has completed
+                                    _readAheadChunk2Completed.Set();
                                 });
                             })
                            .Returns((SftpReadAsyncResult)null);
@@ -98,11 +121,16 @@ protected override void SetupMocks()
                             {
                                 var asyncResult = new SftpReadAsyncResult(callback, state);
                                 asyncResult.SetAsCompleted(_chunk3, false);
-
                                 // signal that we've completed the read-ahead for chunk3
                                 _readAheadChunk3Completed.Set();
                             })
                             .Returns((SftpReadAsyncResult)null);
+            SftpSessionMock.InSequence(_seq).Setup(p => p.OperationTimeout).Returns(_operationTimeout);
+            SftpSessionMock.InSequence(_seq)
+                           .Setup(p => p.WaitAny(_waitHandleArray, _operationTimeout))
+                           .Callback(() => _waitingForSemaphoreAfterCompletingChunk3.Set())
+                           .Returns(() => WaitAny(_waitHandleArray, _operationTimeout));
+
         }
 
         protected override void Arrange()
@@ -135,7 +163,7 @@ public void ReadOfSecondChunkShouldThrowExceptionThatOccurredInReadAhead()
         }
 
         [TestMethod]
-        public void ReahAheadOfChunk3ShouldHaveBeenDone()
+        public void ReahAheadOfChunk3ShouldHaveStarted()
         {
             SftpSessionMock.Verify(p => p.BeginRead(_handle, 2 * ChunkLength, ChunkLength, It.IsNotNull<AsyncCallback>(), It.IsAny<BufferedRead>()), Times.Once);
         }
@@ -154,6 +182,12 @@ public void ReadAfterReadAheadExceptionShouldRethrowExceptionThatOccurredInReadA
             }
         }
 
+        [TestMethod]
+        public void WaitAnyOFSftpSessionShouldHaveBeenInvokedFourTimes()
+        {
+            SftpSessionMock.Verify(p => p.WaitAny(_waitHandleArray, _operationTimeout), Times.Exactly(4));
+        }
+
         [TestMethod]
         public void DisposeShouldCloseHandleAndCompleteImmediately()
         {

From 991bff1f8ecab349103fcd2dbbdd3846d3ec2863 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 11 Feb 2017 12:33:17 +0100
Subject: [PATCH 057/128] Fail fast when timeout is zero.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 50113eeef..4a65a31ca 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -166,6 +166,9 @@ private bool WaitWithTimeout(int timeoutInMilliseconds)
                 {
                     if (_currentCount < 1)
                     {
+                        if (timeoutInMilliseconds > 0)
+                            return false;
+
                         var remainingTimeInMilliseconds = timeoutInMilliseconds;
                         var startTicks = Environment.TickCount;
 

From 8e9cf8951163b0589d1135e6f7622e33a507dc31 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 11 Feb 2017 14:30:17 +0100
Subject: [PATCH 058/128] Fix exception message for fallback SOCKS5 error.
 Fixes issue #167.

---
 src/Renci.SshNet/Session.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 7721c11f2..caaa9ae85 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -2087,7 +2087,7 @@ private void ConnectSocks5()
                 case 0x08:
                     throw new ProxyException("SOCKS5: Address type not supported.");
                 default:
-                    throw new ProxyException("SOCKS4: Not valid response.");
+                    throw new ProxyException("SOCKS5: Not valid response.");
             }
 
             //  Read 0

From ed9feebf716474e4e777d492a33cec861c920fbe Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 11 Feb 2017 14:34:23 +0100
Subject: [PATCH 059/128] Update summary for ProxyException. Fixes issue #163.

---
 src/Renci.SshNet/Common/ProxyException.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Common/ProxyException.cs b/src/Renci.SshNet/Common/ProxyException.cs
index 363a196c8..efb387b45 100644
--- a/src/Renci.SshNet/Common/ProxyException.cs
+++ b/src/Renci.SshNet/Common/ProxyException.cs
@@ -6,7 +6,7 @@
 namespace Renci.SshNet.Common
 {
     /// <summary>
-    /// The exception that is thrown when SCP error occurred.
+    /// The exception that is thrown when a proxy connection cannot be established.
     /// </summary>
 #if FEATURE_BINARY_SERIALIZATION
     [Serializable]

From 44211768ba475917f3593172aa87f470f2217ebf Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 12 Feb 2017 22:07:06 +0100
Subject: [PATCH 060/128] Group all packing methods in Pack class, and add
 corresponding unit tests.

---
 .../Classes/Common/PackTest.cs                | 186 ++++++++++++
 .../Renci.SshNet.Tests.csproj                 |   1 +
 src/Renci.SshNet/Common/Pack.cs               | 266 ++++++++++++++++++
 src/Renci.SshNet/Renci.SshNet.csproj          |   1 +
 4 files changed, 454 insertions(+)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Common/PackTest.cs
 create mode 100644 src/Renci.SshNet/Common/Pack.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Common/PackTest.cs b/src/Renci.SshNet.Tests/Classes/Common/PackTest.cs
new file mode 100644
index 000000000..a5ff500f0
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Common/PackTest.cs
@@ -0,0 +1,186 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Tests.Classes.Common
+{
+    [TestClass]
+    public class PackTest
+    {
+        [TestMethod]
+        public void BigEndianToUInt16()
+        {
+            Assert.AreEqual(0, Pack.BigEndianToUInt16(new byte[] {0, 0}));
+            Assert.AreEqual(1, Pack.BigEndianToUInt16(new byte[] {0, 1}));
+            Assert.AreEqual(256, Pack.BigEndianToUInt16(new byte[] {1, 0}));
+            Assert.AreEqual(257, Pack.BigEndianToUInt16(new byte[] {1, 1}));
+            Assert.AreEqual(1025, Pack.BigEndianToUInt16(new byte[] {4, 1}));
+            Assert.AreEqual(ushort.MaxValue, Pack.BigEndianToUInt16(new byte[] {255, 255}));
+        }
+
+        [TestMethod]
+        public void BigEndianToUInt32()
+        {
+            Assert.AreEqual(0U, Pack.BigEndianToUInt32(new byte[] {0, 0, 0, 0}));
+            Assert.AreEqual(1U, Pack.BigEndianToUInt32(new byte[] {0, 0, 0, 1}));
+            Assert.AreEqual(256U, Pack.BigEndianToUInt32(new byte[] {0, 0, 1, 0}));
+            Assert.AreEqual(257U, Pack.BigEndianToUInt32(new byte[] {0, 0, 1, 1}));
+            Assert.AreEqual(1025U, Pack.BigEndianToUInt32(new byte[] {0, 0, 4, 1}));
+            Assert.AreEqual(65536U, Pack.BigEndianToUInt32(new byte[] {0, 1, 0, 0}));
+            Assert.AreEqual(133124U, Pack.BigEndianToUInt32(new byte[] {0, 2, 8, 4}));
+            Assert.AreEqual(16777216U, Pack.BigEndianToUInt32(new byte[] {1, 0, 0, 0}));
+            Assert.AreEqual(uint.MaxValue, Pack.BigEndianToUInt32(new byte[] {255, 255, 255, 255}));
+        }
+
+        [TestMethod]
+        public void BigEndianToUInt64()
+        {
+            Assert.AreEqual(0UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(1UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 0, 1}));
+            Assert.AreEqual(256UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 1, 0}));
+            Assert.AreEqual(257UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 1, 1}));
+            Assert.AreEqual(65536UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 1, 0, 0}));
+            Assert.AreEqual(133124UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 2, 8, 4}));
+            Assert.AreEqual(16777216UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 0, 1, 0, 0, 0}));
+            Assert.AreEqual(4294967296UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 0, 1, 0, 0, 0, 0}));
+            Assert.AreEqual(1099511627776UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 1, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(1099511892096UL, Pack.BigEndianToUInt64(new byte[] {0, 0, 1, 0, 0, 4, 8, 128}));
+            Assert.AreEqual(1099511627776UL * 256, Pack.BigEndianToUInt64(new byte[] {0, 1, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(1099511627776UL * 256 * 256, Pack.BigEndianToUInt64(new byte[] {1, 0, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(ulong.MaxValue, Pack.BigEndianToUInt64(new byte[] {255, 255, 255, 255, 255, 255, 255, 255}));
+        }
+
+        [TestMethod]
+        public void LittleEndianToUInt16()
+        {
+            Assert.AreEqual((ushort) 0, Pack.LittleEndianToUInt16(new byte[] {0, 0}));
+            Assert.AreEqual((ushort) 1, Pack.LittleEndianToUInt16(new byte[] {1, 0}));
+            Assert.AreEqual((ushort) 256, Pack.LittleEndianToUInt16(new byte[] {0, 1}));
+            Assert.AreEqual((ushort) 257, Pack.LittleEndianToUInt16(new byte[] {1, 1}));
+            Assert.AreEqual((ushort) 1025, Pack.LittleEndianToUInt16(new byte[] {1, 4}));
+            Assert.AreEqual(ushort.MaxValue, Pack.LittleEndianToUInt16(new byte[] {255, 255}));
+        }
+
+        [TestMethod]
+        public void LittleEndianToUInt32()
+        {
+            Assert.AreEqual(0U, Pack.LittleEndianToUInt32(new byte[] {0, 0, 0, 0}));
+            Assert.AreEqual(1U, Pack.LittleEndianToUInt32(new byte[] {1, 0, 0, 0}));
+            Assert.AreEqual(256U, Pack.LittleEndianToUInt32(new byte[] {0, 1, 0, 0}));
+            Assert.AreEqual(257U, Pack.LittleEndianToUInt32(new byte[] {1, 1, 0, 0}));
+            Assert.AreEqual(1025U, Pack.LittleEndianToUInt32(new byte[] {1, 4, 0, 0}));
+            Assert.AreEqual(65536U, Pack.LittleEndianToUInt32(new byte[] {0, 0, 1, 0}));
+            Assert.AreEqual(133124U, Pack.LittleEndianToUInt32(new byte[] {4, 8, 2, 0}));
+            Assert.AreEqual(16777216U, Pack.LittleEndianToUInt32(new byte[] {0, 0, 0, 1}));
+            Assert.AreEqual(uint.MaxValue, Pack.LittleEndianToUInt32(new byte[] {255, 255, 255, 255}));
+        }
+
+        [TestMethod]
+        public void LittleEndianToUInt64()
+        {
+            Assert.AreEqual(0UL, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(1UL, Pack.LittleEndianToUInt64(new byte[] {1, 0, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(256UL, Pack.LittleEndianToUInt64(new byte[] {0, 1, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(257UL, Pack.LittleEndianToUInt64(new byte[] {1, 1, 0, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(65536UL, Pack.LittleEndianToUInt64(new byte[] {0, 0, 1, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(133124UL, Pack.LittleEndianToUInt64(new byte[] {4, 8, 2, 0, 0, 0, 0, 0}));
+            Assert.AreEqual(16777216UL, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 1, 0, 0, 0, 0}));
+            Assert.AreEqual(4294967296UL, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 0, 1, 0, 0, 0}));
+            Assert.AreEqual(1099511627776UL, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 1, 0, 0}));
+            Assert.AreEqual(1099511892096UL, Pack.LittleEndianToUInt64(new byte[] {128, 8, 4, 0, 0, 1, 0, 0}));
+            Assert.AreEqual(1099511627776UL * 256, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 1, 0}));
+            Assert.AreEqual(1099511627776UL * 256 * 256, Pack.LittleEndianToUInt64(new byte[] {0, 0, 0, 0, 0, 0, 0, 1}));
+            Assert.AreEqual(ulong.MaxValue, Pack.LittleEndianToUInt64(new byte[] {255, 255, 255, 255, 255, 255, 255, 255}));
+        }
+
+        [TestMethod]
+        public void UInt16ToLittleEndian()
+        {
+            AssertEqual(new byte[] {0, 0}, Pack.UInt16ToLittleEndian(0));
+            AssertEqual(new byte[] {1, 0}, Pack.UInt16ToLittleEndian(1));
+            AssertEqual(new byte[] {0, 1}, Pack.UInt16ToLittleEndian(256));
+            AssertEqual(new byte[] {1, 1}, Pack.UInt16ToLittleEndian(257));
+            AssertEqual(new byte[] {1, 4}, Pack.UInt16ToLittleEndian(1025));
+            AssertEqual(new byte[] {255, 255}, Pack.UInt16ToLittleEndian(ushort.MaxValue));
+        }
+
+        [TestMethod]
+        public void UInt32ToLittleEndian()
+        {
+            AssertEqual(new byte[] {0, 0, 0, 0}, Pack.UInt32ToLittleEndian(0));
+            AssertEqual(new byte[] {1, 0, 0, 0}, Pack.UInt32ToLittleEndian(1));
+            AssertEqual(new byte[] {0, 1, 0, 0}, Pack.UInt32ToLittleEndian(256));
+            AssertEqual(new byte[] {1, 1, 0, 0}, Pack.UInt32ToLittleEndian(257));
+            AssertEqual(new byte[] {1, 4, 0, 0}, Pack.UInt32ToLittleEndian(1025));
+            AssertEqual(new byte[] {0, 0, 1, 0}, Pack.UInt32ToLittleEndian(65536));
+            AssertEqual(new byte[] {4, 8, 2, 0}, Pack.UInt32ToLittleEndian(133124));
+            AssertEqual(new byte[] {0, 0, 0, 1}, Pack.UInt32ToLittleEndian(16777216));
+            AssertEqual(new byte[] {255, 255, 255, 255}, Pack.UInt32ToLittleEndian(uint.MaxValue));
+        }
+
+        [TestMethod]
+        public void UInt64ToLittleEndian()
+        {
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(0UL));
+            AssertEqual(new byte[] {1, 0, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(1UL));
+            AssertEqual(new byte[] {0, 1, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(256UL));
+            AssertEqual(new byte[] {1, 1, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(257UL));
+            AssertEqual(new byte[] {0, 0, 1, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(65536UL));
+            AssertEqual(new byte[] {4, 8, 2, 0, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(133124UL));
+            AssertEqual(new byte[] {0, 0, 0, 1, 0, 0, 0, 0}, Pack.UInt64ToLittleEndian(16777216UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 1, 0, 0, 0}, Pack.UInt64ToLittleEndian(4294967296UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 1, 0, 0}, Pack.UInt64ToLittleEndian(1099511627776UL));
+            AssertEqual(new byte[] {128, 8, 4, 0, 0, 1, 0, 0}, Pack.UInt64ToLittleEndian(1099511892096UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 1, 0}, Pack.UInt64ToLittleEndian(1099511627776UL * 256));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 0, 1}, Pack.UInt64ToLittleEndian(1099511627776UL * 256 * 256));
+            AssertEqual(new byte[] {255, 255, 255, 255, 255, 255, 255, 255}, Pack.UInt64ToLittleEndian(ulong.MaxValue));
+        }
+
+        [TestMethod]
+        public void UInt16ToBigEndian()
+        {
+            AssertEqual(new byte[] {0, 0}, Pack.UInt16ToBigEndian(0));
+            AssertEqual(new byte[] {0, 1}, Pack.UInt16ToBigEndian(1));
+            AssertEqual(new byte[] {1, 0}, Pack.UInt16ToBigEndian(256));
+            AssertEqual(new byte[] {1, 1}, Pack.UInt16ToBigEndian(257));
+            AssertEqual(new byte[] {4, 1}, Pack.UInt16ToBigEndian(1025));
+            AssertEqual(new byte[] {255, 255}, Pack.UInt16ToBigEndian(ushort.MaxValue));
+        }
+
+        [TestMethod]
+        public void UInt32ToBigEndian()
+        {
+            AssertEqual(new byte[] {0, 0, 0, 0}, Pack.UInt32ToBigEndian(0));
+            AssertEqual(new byte[] {0, 0, 0, 1}, Pack.UInt32ToBigEndian(1));
+            AssertEqual(new byte[] {0, 0, 1, 0}, Pack.UInt32ToBigEndian(256));
+            AssertEqual(new byte[] {0, 0, 1, 1}, Pack.UInt32ToBigEndian(257));
+            AssertEqual(new byte[] {0, 0, 4, 1}, Pack.UInt32ToBigEndian(1025));
+            AssertEqual(new byte[] {0, 1, 0, 0}, Pack.UInt32ToBigEndian(65536));
+            AssertEqual(new byte[] {0, 2, 8, 4}, Pack.UInt32ToBigEndian(133124));
+            AssertEqual(new byte[] {1, 0, 0, 0}, Pack.UInt32ToBigEndian(16777216));
+            AssertEqual(new byte[] {255, 255, 255, 255}, Pack.UInt32ToBigEndian(uint.MaxValue));
+        }
+
+        [TestMethod]
+        public void UInt64ToBigEndian()
+        {
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToBigEndian(0UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 0, 1}, Pack.UInt64ToBigEndian(1UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 1, 0}, Pack.UInt64ToBigEndian(256UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 0, 1, 1}, Pack.UInt64ToBigEndian(257UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 1, 0, 0}, Pack.UInt64ToBigEndian(65536UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 0, 2, 8, 4}, Pack.UInt64ToBigEndian(133124UL));
+            AssertEqual(new byte[] {0, 0, 0, 0, 1, 0, 0, 0}, Pack.UInt64ToBigEndian(16777216UL));
+            AssertEqual(new byte[] {0, 0, 0, 1, 0, 0, 0, 0}, Pack.UInt64ToBigEndian(4294967296UL));
+            AssertEqual(new byte[] {0, 0, 1, 0, 0, 0, 0, 0}, Pack.UInt64ToBigEndian(1099511627776UL));
+            AssertEqual(new byte[] {0, 0, 1, 0, 0, 4, 8, 128}, Pack.UInt64ToBigEndian(1099511892096UL));
+            AssertEqual(new byte[] {0, 1, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToBigEndian(1099511627776UL * 256));
+            AssertEqual(new byte[] {1, 0, 0, 0, 0, 0, 0, 0}, Pack.UInt64ToBigEndian(1099511627776UL * 256 * 256));
+            AssertEqual(new byte[] {255, 255, 255, 255, 255, 255, 255, 255}, Pack.UInt64ToBigEndian(ulong.MaxValue));
+        }
+
+        private static void AssertEqual(byte[] expected, byte[] actual)
+        {
+            Assert.IsTrue(expected.IsEqualTo(actual));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 196ed7d62..35aeb8eb3 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Classes\Common\ExtensionsTest_Take_Count.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Take_OffsetAndCount.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_TrimLeadingZeros.cs" />
+    <Compile Include="Classes\Common\PackTest.cs" />
     <Compile Include="Classes\ConnectionInfoTest_Authenticate_Failure.cs" />
     <Compile Include="Classes\ConnectionInfoTest_Authenticate_Success.cs" />
     <Compile Include="Classes\ForwardedPortDynamicTest_Dispose_PortStarted_ChannelBound.cs" />
diff --git a/src/Renci.SshNet/Common/Pack.cs b/src/Renci.SshNet/Common/Pack.cs
new file mode 100644
index 000000000..a35f84b74
--- /dev/null
+++ b/src/Renci.SshNet/Common/Pack.cs
@@ -0,0 +1,266 @@
+namespace Renci.SshNet.Common
+{
+    /// <summary>
+    /// Provides convenience methods for conversion to and from both Big Endian and Little Endian.
+    /// </summary>
+    internal static class Pack
+    {
+        /// <summary>
+        /// Converts little endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="ushort" />.</returns>
+        internal static ushort LittleEndianToUInt16(byte[] buffer)
+        {
+            ushort n = buffer[0];
+            n |= (ushort) (buffer[1] << 8);
+            return n;
+        }
+
+        /// <summary>
+        /// Converts little endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <param name="offset">The buffer offset.</param>
+        /// <returns>Converted <see cref="uint" />.</returns>
+        internal static uint LittleEndianToUInt32(byte[] buffer, int offset)
+        {
+            uint n = buffer[offset];
+            n |= (uint) buffer[offset + 1] << 8;
+            n |= (uint) buffer[offset + 2] << 16;
+            n |= (uint) buffer[offset + 3] << 24;
+            return n;
+        }
+
+        /// <summary>
+        /// Converts little endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="uint" />.</returns>
+        internal static uint LittleEndianToUInt32(byte[] buffer)
+        {
+            uint n = buffer[0];
+            n |= (uint) buffer[1] << 8;
+            n |= (uint) buffer[2] << 16;
+            n |= (uint) buffer[3] << 24;
+            return n;
+        }
+
+        /// <summary>
+        /// Converts little endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="ulong" />.</returns>
+        internal static ulong LittleEndianToUInt64(byte[] buffer)
+        {
+            ulong n = buffer[0];
+            n |= (ulong) buffer[1] << 8;
+            n |= (ulong) buffer[2] << 16;
+            n |= (ulong) buffer[3] << 24;
+            n |= (ulong) buffer[4] << 32;
+            n |= (ulong) buffer[5] << 40;
+            n |= (ulong) buffer[6] << 48;
+            n |= (ulong) buffer[7] << 56;
+            return n;
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        internal static byte[] UInt16ToLittleEndian(ushort value)
+        {
+            var buffer = new byte[2];
+            UInt16ToLittleEndian(value, buffer);
+            return buffer;
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <param name="buffer">The buffer.</param>
+        internal static void UInt16ToLittleEndian(ushort value, byte[] buffer)
+        {
+            buffer[0] = (byte) (value & 0x00FF);
+            buffer[1] = (byte) ((value & 0xFF00) >> 8);
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        internal static byte[] UInt32ToLittleEndian(uint value)
+        {
+            var buffer = new byte[4];
+            UInt32ToLittleEndian(value, buffer);
+            return buffer;
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <param name="buffer">The buffer.</param>
+        internal static void UInt32ToLittleEndian(uint value, byte[] buffer)
+        {
+            buffer[0] = (byte) (value & 0x000000FF);
+            buffer[1] = (byte) ((value & 0x0000FF00) >> 8);
+            buffer[2] = (byte) ((value & 0x00FF0000) >> 16);
+            buffer[3] = (byte) ((value & 0xFF000000) >> 24);
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <param name="buffer">The buffer.</param>
+        /// <param name="offset">The buffer offset.</param>
+        internal static void UInt32ToLittleEndian(uint value, byte[] buffer, int offset)
+        {
+            buffer[offset] = (byte)(value & 0x000000FF);
+            buffer[offset + 1] = (byte)((value & 0x0000FF00) >> 8);
+            buffer[offset + 2] = (byte)((value & 0x00FF0000) >> 16);
+            buffer[offset + 3] = (byte)((value & 0xFF000000) >> 24);
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        internal static byte[] UInt64ToLittleEndian(ulong value)
+        {
+            var buffer = new byte[8];
+            UInt64ToLittleEndian(value, buffer);
+            return buffer;
+        }
+
+        /// <summary>
+        /// Populates buffer with little endian number representation.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <param name="buffer">The buffer.</param>
+        internal static void UInt64ToLittleEndian(ulong value, byte[] buffer)
+        {
+            buffer[0] = (byte)(value & 0x00000000000000FF);
+            buffer[1] = (byte) ((value & 0x000000000000FF00) >> 8);
+            buffer[2] = (byte) ((value & 0x0000000000FF0000) >> 16);
+            buffer[3] = (byte) ((value & 0x00000000FF000000) >> 24);
+            buffer[4] = (byte) ((value & 0x000000FF00000000) >> 32);
+            buffer[5] = (byte) ((value & 0x0000FF0000000000) >> 40);
+            buffer[6] = (byte) ((value & 0x00FF000000000000) >> 48);
+            buffer[7] = (byte) ((value & 0xFF00000000000000) >> 56);
+        }
+
+        internal static byte[] UInt16ToBigEndian(ushort value)
+        {
+            var buffer = new byte[2];
+            UInt16ToBigEndian(value, buffer);
+            return buffer;
+        }
+
+        internal static void UInt16ToBigEndian(ushort value, byte[] buffer)
+        {
+            buffer[0] = (byte) (value >> 8);
+            buffer[1] = (byte) (value & 0x00FF);
+        }
+
+        internal static void UInt16ToBigEndian(ushort value, byte[] buffer, int offset)
+        {
+            buffer[offset] = (byte) (value >> 8);
+            buffer[offset + 1] = (byte) (value & 0x00FF);
+        }
+
+        internal static void UInt32ToBigEndian(uint value, byte[] buffer)
+        {
+            buffer[0] = (byte) ((value & 0xFF000000) >> 24);
+            buffer[1] = (byte) ((value & 0x00FF0000) >> 16);
+            buffer[2] = (byte) ((value & 0x0000FF00) >> 8);
+            buffer[3] = (byte) (value & 0x000000FF);
+        }
+
+        internal static void UInt32ToBigEndian(uint value, byte[] buffer, int offset)
+        {
+            buffer[offset++] = (byte) ((value & 0xFF000000) >> 24);
+            buffer[offset++] = (byte) ((value & 0x00FF0000) >> 16);
+            buffer[offset++] = (byte) ((value & 0x0000FF00) >> 8);
+            buffer[offset] = (byte) (value & 0x000000FF);
+        }
+
+        internal static byte[] UInt32ToBigEndian(uint value)
+        {
+            var buffer = new byte[4];
+            UInt32ToBigEndian(value, buffer);
+            return buffer;
+        }
+
+        /// <summary>
+        /// Returns the specified 64-bit unsigned integer value as an array of bytes.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <returns>An array of bytes with length 8.</returns>
+        internal static byte[] UInt64ToBigEndian(ulong value)
+        {
+            return new[]
+                {
+                    (byte) ((value & 0xFF00000000000000) >> 56),
+                    (byte) ((value & 0x00FF000000000000) >> 48),
+                    (byte) ((value & 0x0000FF0000000000) >> 40),
+                    (byte) ((value & 0x000000FF00000000) >> 32),
+                    (byte) ((value & 0x00000000FF000000) >> 24),
+                    (byte) ((value & 0x0000000000FF0000) >> 16),
+                    (byte) ((value & 0x000000000000FF00) >> 8),
+                    (byte) (value & 0x00000000000000FF)
+                };
+        }
+
+        /// <summary>
+        /// Converts big endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="ushort" />.</returns>
+        internal static ushort BigEndianToUInt16(byte[] buffer)
+        {
+            return (ushort) (buffer[0] << 8 | buffer[1]);
+        }
+
+        /// <summary>
+        /// Converts big endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <param name="offset">The buffer offset.</param>
+        /// <returns>Converted <see cref="uint" />.</returns>
+        internal static uint BigEndianToUInt32(byte[] buffer, int offset)
+        {
+            return (uint) buffer[offset + 0] << 24
+                   | (uint) buffer[offset + 1] << 16
+                   | (uint) buffer[offset + 2] << 8
+                   | buffer[offset + 3];
+        }
+
+        /// <summary>
+        /// Converts big endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="uint" />.</returns>
+        internal static uint BigEndianToUInt32(byte[] buffer)
+        {
+            return (uint) buffer[0] << 24
+                   | (uint) buffer[1] << 16
+                   | (uint) buffer[2] << 8
+                   | buffer[3];
+        }
+
+        /// <summary>
+        /// Converts big endian bytes into number.
+        /// </summary>
+        /// <param name="buffer">The buffer.</param>
+        /// <returns>Converted <see cref="ulong" />.</returns>
+        internal static ulong BigEndianToUInt64(byte[] buffer)
+        {
+            return (ulong) buffer[0] << 56 | (ulong) buffer[1] << 48 | (ulong) buffer[2] << 40 |
+                   (ulong) buffer[3] << 32 | (ulong) buffer[4] << 24 | (ulong) buffer[5] << 16 |
+                   (ulong) buffer[6] << 8 | buffer[7];
+        }
+    }
+}
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index fdc4063d6..7b7a2631a 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -96,6 +96,7 @@
     <Compile Include="Common\ChannelOpenFailedEventArgs.cs" />
     <Compile Include="Common\ChannelRequestEventArgs.cs" />
     <Compile Include="Common\CountdownEvent.cs" />
+    <Compile Include="Common\Pack.cs" />
     <Compile Include="Common\ProxyException.cs">
       <SubType>Code</SubType>
     </Compile>

From 9f6496da62989ce1994857a984813c8b94783ce3 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 14 Feb 2017 18:00:09 +0100
Subject: [PATCH 061/128] Added encrypt and decrypt test for CBC mode.

---
 .../Cryptography/Ciphers/DesCipherTest.cs     | 89 ++++++++-----------
 1 file changed, 36 insertions(+), 53 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/DesCipherTest.cs b/src/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/DesCipherTest.cs
index cff5b9dbc..4851f38ff 100644
--- a/src/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/DesCipherTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/DesCipherTest.cs
@@ -1,5 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Security.Cryptography.Ciphers;
+using Renci.SshNet.Security.Cryptography.Ciphers.Modes;
+using Renci.SshNet.Security.Cryptography.Ciphers.Paddings;
 using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Security.Cryptography.Ciphers
@@ -10,64 +13,44 @@ namespace Renci.SshNet.Tests.Classes.Security.Cryptography.Ciphers
     [TestClass]
     public class DesCipherTest : TestBase
     {
-        /// <summary>
-        ///A test for DesCipher Constructor
-        ///</summary>
         [TestMethod]
-        [Ignore] // placeholder for actual test
-        public void DesCipherConstructorTest()
+        public void Cbc_Encrypt()
         {
-            byte[] key = null; // TODO: Initialize to an appropriate value
-            CipherMode mode = null; // TODO: Initialize to an appropriate value
-            CipherPadding padding = null; // TODO: Initialize to an appropriate value
-            DesCipher target = new DesCipher(key, mode, padding);
-            Assert.Inconclusive("TODO: Implement code to verify target");
-        }
+            var expectedCypher = new byte[]
+                {
+                    0x15, 0x43, 0x3e, 0x97, 0x65, 0x66, 0xea, 0x81, 0x22, 0xab, 0xe3,
+                    0x11, 0x0f, 0x7d, 0xcb, 0x78, 0x56, 0x91, 0x22, 0x3d, 0xd6, 0xca,
+                    0xe3, 0xbd
+                };
 
-        /// <summary>
-        ///A test for DecryptBlock
-        ///</summary>
-        [TestMethod]
-        [Ignore] // placeholder for actual test
-        public void DecryptBlockTest()
-        {
-            byte[] key = null; // TODO: Initialize to an appropriate value
-            CipherMode mode = null; // TODO: Initialize to an appropriate value
-            CipherPadding padding = null; // TODO: Initialize to an appropriate value
-            DesCipher target = new DesCipher(key, mode, padding); // TODO: Initialize to an appropriate value
-            byte[] inputBuffer = null; // TODO: Initialize to an appropriate value
-            int inputOffset = 0; // TODO: Initialize to an appropriate value
-            int inputCount = 0; // TODO: Initialize to an appropriate value
-            byte[] outputBuffer = null; // TODO: Initialize to an appropriate value
-            int outputOffset = 0; // TODO: Initialize to an appropriate value
-            int expected = 0; // TODO: Initialize to an appropriate value
-            int actual;
-            actual = target.DecryptBlock(inputBuffer, inputOffset, inputCount, outputBuffer, outputOffset);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
+            var input = Encoding.ASCII.GetBytes("www.javaCODEgeeks.com!!!");
+            var key = new byte[] {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
+            var iv = new byte[] {0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00};
+
+            var des = new DesCipher(key, new CbcCipherMode(iv), new PKCS7Padding());
+            var actualCypher = des.Encrypt(input);
+
+            Assert.IsTrue((expectedCypher.IsEqualTo(actualCypher)));
         }
 
-        /// <summary>
-        ///A test for EncryptBlock
-        ///</summary>
         [TestMethod]
-        [Ignore] // placeholder for actual test
-        public void EncryptBlockTest()
+        public void Cbc_Decrypt()
         {
-            byte[] key = null; // TODO: Initialize to an appropriate value
-            CipherMode mode = null; // TODO: Initialize to an appropriate value
-            CipherPadding padding = null; // TODO: Initialize to an appropriate value
-            DesCipher target = new DesCipher(key, mode, padding); // TODO: Initialize to an appropriate value
-            byte[] inputBuffer = null; // TODO: Initialize to an appropriate value
-            int inputOffset = 0; // TODO: Initialize to an appropriate value
-            int inputCount = 0; // TODO: Initialize to an appropriate value
-            byte[] outputBuffer = null; // TODO: Initialize to an appropriate value
-            int outputOffset = 0; // TODO: Initialize to an appropriate value
-            int expected = 0; // TODO: Initialize to an appropriate value
-            int actual;
-            actual = target.EncryptBlock(inputBuffer, inputOffset, inputCount, outputBuffer, outputOffset);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
+            var expectedPlain = Encoding.ASCII.GetBytes("www.javaCODEgeeks.com!!!");
+
+            var key = new byte[] { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
+            var iv = new byte[] { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
+            var cypher = new byte[]
+                {
+                    0x15, 0x43, 0x3e, 0x97, 0x65, 0x66, 0xea, 0x81, 0x22, 0xab, 0xe3,
+                    0x11, 0x0f, 0x7d, 0xcb, 0x78, 0x56, 0x91, 0x22, 0x3d, 0xd6, 0xca,
+                    0xe3, 0xbd
+                };
+
+            var des = new DesCipher(key, new CbcCipherMode(iv), new PKCS7Padding());
+            var plain = des.Decrypt(cypher);
+
+            Assert.IsTrue(expectedPlain.IsEqualTo(plain));
         }
-    }
+   }
 }
\ No newline at end of file

From b73d2e1ea8e12688a4fa0d95e946adcf28d4830d Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 14 Feb 2017 18:00:18 +0100
Subject: [PATCH 062/128] Formatting.

---
 src/Renci.SshNet/Common/Pack.cs | 37 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Renci.SshNet/Common/Pack.cs b/src/Renci.SshNet/Common/Pack.cs
index a35f84b74..fd8626623 100644
--- a/src/Renci.SshNet/Common/Pack.cs
+++ b/src/Renci.SshNet/Common/Pack.cs
@@ -118,10 +118,10 @@ internal static void UInt32ToLittleEndian(uint value, byte[] buffer)
         /// <param name="offset">The buffer offset.</param>
         internal static void UInt32ToLittleEndian(uint value, byte[] buffer, int offset)
         {
-            buffer[offset] = (byte)(value & 0x000000FF);
-            buffer[offset + 1] = (byte)((value & 0x0000FF00) >> 8);
-            buffer[offset + 2] = (byte)((value & 0x00FF0000) >> 16);
-            buffer[offset + 3] = (byte)((value & 0xFF000000) >> 24);
+            buffer[offset] = (byte) (value & 0x000000FF);
+            buffer[offset + 1] = (byte) ((value & 0x0000FF00) >> 8);
+            buffer[offset + 2] = (byte) ((value & 0x00FF0000) >> 16);
+            buffer[offset + 3] = (byte) ((value & 0xFF000000) >> 24);
         }
 
         /// <summary>
@@ -142,7 +142,7 @@ internal static byte[] UInt64ToLittleEndian(ulong value)
         /// <param name="buffer">The buffer.</param>
         internal static void UInt64ToLittleEndian(ulong value, byte[] buffer)
         {
-            buffer[0] = (byte)(value & 0x00000000000000FF);
+            buffer[0] = (byte) (value & 0x00000000000000FF);
             buffer[1] = (byte) ((value & 0x000000000000FF00) >> 8);
             buffer[2] = (byte) ((value & 0x0000000000FF0000) >> 16);
             buffer[3] = (byte) ((value & 0x00000000FF000000) >> 24);
@@ -232,10 +232,10 @@ internal static ushort BigEndianToUInt16(byte[] buffer)
         /// <returns>Converted <see cref="uint" />.</returns>
         internal static uint BigEndianToUInt32(byte[] buffer, int offset)
         {
-            return (uint) buffer[offset + 0] << 24
-                   | (uint) buffer[offset + 1] << 16
-                   | (uint) buffer[offset + 2] << 8
-                   | buffer[offset + 3];
+            return (uint) buffer[offset + 0] << 24 |
+                   (uint) buffer[offset + 1] << 16 |
+                   (uint) buffer[offset + 2] << 8 |
+                   buffer[offset + 3];
         }
 
         /// <summary>
@@ -245,10 +245,10 @@ internal static uint BigEndianToUInt32(byte[] buffer, int offset)
         /// <returns>Converted <see cref="uint" />.</returns>
         internal static uint BigEndianToUInt32(byte[] buffer)
         {
-            return (uint) buffer[0] << 24
-                   | (uint) buffer[1] << 16
-                   | (uint) buffer[2] << 8
-                   | buffer[3];
+            return (uint) buffer[0] << 24 |
+                   (uint) buffer[1] << 16 |
+                   (uint) buffer[2] << 8 |
+                   buffer[3];
         }
 
         /// <summary>
@@ -258,9 +258,14 @@ internal static uint BigEndianToUInt32(byte[] buffer)
         /// <returns>Converted <see cref="ulong" />.</returns>
         internal static ulong BigEndianToUInt64(byte[] buffer)
         {
-            return (ulong) buffer[0] << 56 | (ulong) buffer[1] << 48 | (ulong) buffer[2] << 40 |
-                   (ulong) buffer[3] << 32 | (ulong) buffer[4] << 24 | (ulong) buffer[5] << 16 |
-                   (ulong) buffer[6] << 8 | buffer[7];
+            return (ulong) buffer[0] << 56 |
+                   (ulong) buffer[1] << 48 |
+                   (ulong) buffer[2] << 40 |
+                   (ulong) buffer[3] << 32 |
+                   (ulong) buffer[4] << 24 |
+                   (ulong) buffer[5] << 16 |
+                   (ulong) buffer[6] << 8 |
+                   buffer[7];
         }
     }
 }

From 9ca3880c29049b4dcc706015a49d60d6e71059d3 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 14 Feb 2017 18:05:38 +0100
Subject: [PATCH 063/128] Added tests for Reverse.

---
 .../Classes/Common/ExtensionsTest_Reverse.cs  | 83 +++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                 |  1 +
 2 files changed, 84 insertions(+)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Reverse.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Reverse.cs b/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Reverse.cs
new file mode 100644
index 000000000..040f82839
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Reverse.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Renci.SshNet.Tests.Classes.Common
+{
+    [TestClass]
+    [SuppressMessage("ReSharper", "InvokeAsExtensionMethod")]
+    public class ExtensionsTest_Reverse
+    {
+        [TestMethod]
+        public void Empty()
+        {
+            var value = new byte[0];
+
+            var actual = Extensions.Reverse(value);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(0, actual.Length);
+        }
+
+        [TestInitialize]
+        public void Null()
+        {
+            const byte[] value = null;
+
+            try
+            {
+                Extensions.Reverse(value);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("array", ex.ParamName);
+            }
+        }
+
+        [TestMethod]
+        public void Small()
+        {
+            var value = new[] {0, 1, 4, 3, 7, 9};
+
+            var actual = Extensions.Reverse(value);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(6, actual.Length);
+            Assert.AreEqual(9, actual[0]);
+            Assert.AreEqual(7, actual[1]);
+            Assert.AreEqual(3, actual[2]);
+            Assert.AreEqual(4, actual[3]);
+            Assert.AreEqual(1, actual[4]);
+            Assert.AreEqual(0, actual[5]);
+
+            Assert.AreEqual(9, value[0]);
+            Assert.AreEqual(7, value[1]);
+            Assert.AreEqual(3, value[2]);
+            Assert.AreEqual(4, value[3]);
+            Assert.AreEqual(1, value[4]);
+            Assert.AreEqual(0, value[5]);
+        }
+
+        [TestMethod]
+        [Ignore]
+        public void Perf_Large()
+        {
+            var value = new byte[2048];
+            new Random().NextBytes(value);
+
+            var stopwatch = Stopwatch.StartNew();
+
+            for (var i = 0; i < 1000000; i++)
+            {
+                Extensions.Reverse(value);
+            }
+
+            stopwatch.Stop();
+            Console.WriteLine(stopwatch.ElapsedMilliseconds);
+        }
+    }
+}
+
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 35aeb8eb3..d26c0c35e 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -145,6 +145,7 @@
     <Compile Include="Classes\Common\CountdownEventTest.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Concat.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_IsEqualTo_ByteArray.cs" />
+    <Compile Include="Classes\Common\ExtensionsTest_Reverse.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Take_Count.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Take_OffsetAndCount.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_TrimLeadingZeros.cs" />

From 1c288485edf1352ca6f4bd9f93557c5cc110ca33 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Tue, 14 Feb 2017 18:10:34 +0100
Subject: [PATCH 064/128] Use packing methods from newly introduced Pack class.

---
 .../SftpSessionTest_Connected_RequestRead.cs  |    4 +-
 ...ftpSessionTest_Connected_RequestStatVfs.cs |    4 +-
 src/Renci.SshNet/Common/DerData.cs            |    2 +-
 src/Renci.SshNet/Common/Extensions.cs         |   64 -
 src/Renci.SshNet/Common/SshDataStream.cs      |    9 +-
 src/Renci.SshNet/Messages/Message.cs          |    4 +-
 .../Security/Cryptography/Cipher.cs           |  216 +---
 .../Cryptography/Ciphers/AesCipher.cs         | 1033 +++++++++--------
 .../Cryptography/Ciphers/BlowfishCipher.cs    |   19 +-
 .../Cryptography/Ciphers/CastCipher.cs        |   21 +-
 .../Cryptography/Ciphers/DesCipher.cs         |  128 +-
 .../Security/KeyExchangeDiffieHellman.cs      |    2 +-
 src/Renci.SshNet/Session.cs                   |    6 +-
 13 files changed, 619 insertions(+), 893 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index 7b05b5839..ef2a428c2 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -118,9 +118,9 @@ private static byte[] CreateSftpNameResponse(uint responseId, Encoding encoding,
                 var nameBytes = encoding.GetBytes(name);
                 var attributesBytes = SftpFileAttributes.Empty.GetBytes();
 
-                namesAndAttributes.AddRange((((uint) nameBytes.Length).GetBytes())); // filename length
+                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian((uint) nameBytes.Length)); // filename length
                 namesAndAttributes.AddRange(nameBytes); // filename
-                namesAndAttributes.AddRange(((uint) 0).GetBytes()); // longname length
+                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian(0U)); // longname length
                 namesAndAttributes.AddRange(attributesBytes); // attributes
             }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index e1075a949..a88fee21a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -111,9 +111,9 @@ private static byte[] CreateSftpNameResponse(uint responseId, Encoding encoding,
                 var nameBytes = encoding.GetBytes(name);
                 var attributesBytes = SftpFileAttributes.Empty.GetBytes();
 
-                namesAndAttributes.AddRange((((uint) nameBytes.Length).GetBytes())); // filename length
+                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian((uint) nameBytes.Length)); // filename length
                 namesAndAttributes.AddRange(nameBytes); // filename
-                namesAndAttributes.AddRange(((uint) 0).GetBytes()); // longname length
+                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian(0U)); // longname length
                 namesAndAttributes.AddRange(attributesBytes); // attributes
             }
 
diff --git a/src/Renci.SshNet/Common/DerData.cs b/src/Renci.SshNet/Common/DerData.cs
index 7093ca08b..c84c0b176 100644
--- a/src/Renci.SshNet/Common/DerData.cs
+++ b/src/Renci.SshNet/Common/DerData.cs
@@ -157,7 +157,7 @@ public void Write(bool data)
         /// <param name="data">UInt32 data to write.</param>
         public void Write(uint data)
         {
-            var bytes = data.GetBytes();
+            var bytes = Pack.UInt32ToBigEndian(data);
             _data.Add(Integer);
             var length = GetLength(bytes.Length);
             WriteBytes(length);
diff --git a/src/Renci.SshNet/Common/Extensions.cs b/src/Renci.SshNet/Common/Extensions.cs
index 690c5cb62..bebec03ad 100644
--- a/src/Renci.SshNet/Common/Extensions.cs
+++ b/src/Renci.SshNet/Common/Extensions.cs
@@ -111,70 +111,6 @@ internal static T CreateInstance<T>(this Type type) where T : class
             return Activator.CreateInstance(type) as T;
         }
 
-        /// <summary>
-        /// Returns the specified 16-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 2.</returns>
-        internal static byte[] GetBytes(this ushort value)
-        {
-            return new[] {(byte) (value >> 8), (byte) (value & 0xFF)};
-        }
-
-        /// <summary>
-        /// Returns the specified 32-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 4.</returns>
-        internal static byte[] GetBytes(this uint value)
-        {
-            var buffer = new byte[4];
-            value.Write(buffer, 0);
-            return buffer;
-        }
-
-        /// <summary>
-        /// Returns the specified 32-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The array of bytes to write <paramref name="value"/> to.</param>
-        /// <param name="offset">The zero-based offset in <paramref name="buffer"/> at which to begin writing.</param>
-        internal static void Write(this uint value, byte[] buffer, int offset)
-        {
-            buffer[offset++] = (byte) (value >> 24);
-            buffer[offset++] = (byte) (value >> 16);
-            buffer[offset++] = (byte)(value >> 8);
-            buffer[offset] = (byte) (value & 0xFF);
-        }
-
-        /// <summary>
-        /// Returns the specified 64-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 8.</returns>
-        internal static byte[] GetBytes(this ulong value)
-        {
-            return new[]
-                {
-                    (byte) (value >> 56), (byte) (value >> 48), (byte) (value >> 40), (byte) (value >> 32),
-                    (byte) (value >> 24), (byte) (value >> 16), (byte) (value >> 8), (byte) (value & 0xFF)
-                };
-        }
-
-        /// <summary>
-        /// Returns the specified 64-bit signed integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 8.</returns>
-        internal static byte[] GetBytes(this long value)
-        {
-            return new[]
-                {
-                    (byte) (value >> 56), (byte) (value >> 48), (byte) (value >> 40), (byte) (value >> 32),
-                    (byte) (value >> 24), (byte) (value >> 16), (byte) (value >> 8), (byte) (value & 0xFF)
-                };
-        }
-
         internal static void ValidatePort(this uint value, string argument)
         {
             if (value > IPEndPoint.MaxPort)
diff --git a/src/Renci.SshNet/Common/SshDataStream.cs b/src/Renci.SshNet/Common/SshDataStream.cs
index 408d8704e..010800c3e 100644
--- a/src/Renci.SshNet/Common/SshDataStream.cs
+++ b/src/Renci.SshNet/Common/SshDataStream.cs
@@ -62,7 +62,7 @@ public bool IsEndOfData
         /// <param name="value"><see cref="uint"/> data to write.</param>
         public void Write(uint value)
         {
-            var bytes = value.GetBytes();
+            var bytes = Pack.UInt32ToBigEndian(value);
             Write(bytes, 0, bytes.Length);
         }
 
@@ -72,7 +72,7 @@ public void Write(uint value)
         /// <param name="value"><see cref="ulong"/> data to write.</param>
         public void Write(ulong value)
         {
-            var bytes = value.GetBytes();
+            var bytes = Pack.UInt64ToBigEndian(value);
             Write(bytes, 0, bytes.Length);
         }
 
@@ -183,7 +183,7 @@ public BigInteger ReadBigInt()
         public uint ReadUInt32()
         {
             var data = ReadBytes(4);
-            return (uint) (data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]);
+            return Pack.BigEndianToUInt32(data);
         }
 
         /// <summary>
@@ -195,8 +195,7 @@ public uint ReadUInt32()
         public ulong ReadUInt64()
         {
             var data = ReadBytes(8);
-            return ((ulong) data[0] << 56 | (ulong) data[1] << 48 | (ulong) data[2] << 40 | (ulong) data[3] << 32 |
-                    (ulong) data[4] << 24 | (ulong) data[5] << 16 | (ulong) data[6] << 8 | data[7]);
+            return Pack.BigEndianToUInt64(data);
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Message.cs b/src/Renci.SshNet/Messages/Message.cs
index 9a48e03af..5946ebc3f 100644
--- a/src/Renci.SshNet/Messages/Message.cs
+++ b/src/Renci.SshNet/Messages/Message.cs
@@ -94,7 +94,7 @@ internal byte[] GetPacket(byte paddingMultiplier, Compressor compressor)
                 sshDataStream.Seek(outboundPacketSequenceSize, SeekOrigin.Begin);
 
                 // add packet data length
-                sshDataStream.Write(packetDataLength.GetBytes(), 0, 4);
+                sshDataStream.Write(packetDataLength);
 
                 //  add packet padding length
                 sshDataStream.WriteByte(paddingLength);
@@ -115,7 +115,7 @@ internal byte[] GetPacket(byte paddingMultiplier, Compressor compressor)
                 sshDataStream.Seek(outboundPacketSequenceSize, SeekOrigin.Begin);
 
                 // add packet data length
-                sshDataStream.Write(packetDataLength.GetBytes(), 0, 4);
+                sshDataStream.Write(packetDataLength);
 
                 //  add packet padding length
                 sshDataStream.WriteByte(paddingLength);
diff --git a/src/Renci.SshNet/Security/Cryptography/Cipher.cs b/src/Renci.SshNet/Security/Cryptography/Cipher.cs
index 7c075f41b..e624bbba3 100644
--- a/src/Renci.SshNet/Security/Cryptography/Cipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Cipher.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Renci.SshNet.Security.Cryptography
+namespace Renci.SshNet.Security.Cryptography
 {
     /// <summary>
     /// Base class for cipher implementation.
@@ -55,217 +53,5 @@ public byte[] Encrypt(byte[] input)
         /// The decrypted data.
         /// </returns>
         public abstract byte[] Decrypt(byte[] input, int offset, int length);
-
-        #region Packing functions
-
-        /// <summary>
-        /// Populates buffer with big endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        protected static void UInt32ToBigEndian(uint number, byte[] buffer)
-        {
-            buffer[0] = (byte)(number >> 24);
-            buffer[1] = (byte)(number >> 16);
-            buffer[2] = (byte)(number >> 8);
-            buffer[3] = (byte)(number);
-        }
-
-        /// <summary>
-        /// Populates buffer with big endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        protected static void UInt32ToBigEndian(uint number, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(number >> 24);
-            buffer[offset + 1] = (byte)(number >> 16);
-            buffer[offset + 2] = (byte)(number >> 8);
-            buffer[offset + 3] = (byte)(number);
-        }
-
-        /// <summary>
-        /// Converts big endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <returns>Converted <see cref="Int32" />.</returns>
-        protected static uint BigEndianToUInt32(byte[] buffer)
-        {
-            uint n = (uint)buffer[0] << 24;
-            n |= (uint)buffer[1] << 16;
-            n |= (uint)buffer[2] << 8;
-            n |= (uint)buffer[3];
-            return n;
-        }
-
-        /// <summary>
-        /// Converts big endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        /// <returns>Converted <see cref="UInt32" />.</returns>
-        protected static uint BigEndianToUInt32(byte[] buffer, int offset)
-        {
-            uint n = (uint)buffer[offset] << 24;
-            n |= (uint)buffer[offset + 1] << 16;
-            n |= (uint)buffer[offset + 2] << 8;
-            n |= (uint)buffer[offset + 3];
-            return n;
-        }
-
-        /// <summary>
-        /// Converts big endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <returns>Converted <see cref="UInt64" />.</returns>
-        protected static ulong BigEndianToUInt64(byte[] buffer)
-        {
-            uint hi = BigEndianToUInt32(buffer);
-            uint lo = BigEndianToUInt32(buffer, 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        /// <summary>
-        /// Converts big endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        /// <returns>Converted <see cref="UInt64" />.</returns>
-        protected static ulong BigEndianToUInt64(byte[] buffer, int offset)
-        {
-            uint hi = BigEndianToUInt32(buffer, offset);
-            uint lo = BigEndianToUInt32(buffer, offset + 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        /// <summary>
-        /// Populates buffer with big endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        protected static void UInt64ToBigEndian(ulong number, byte[] buffer)
-        {
-            UInt32ToBigEndian((uint)(number >> 32), buffer);
-            UInt32ToBigEndian((uint)(number), buffer, 4);
-        }
-
-        /// <summary>
-        /// Populates buffer with big endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        protected static void UInt64ToBigEndian(ulong number, byte[] buffer, int offset)
-        {
-            UInt32ToBigEndian((uint)(number >> 32), buffer, offset);
-            UInt32ToBigEndian((uint)(number), buffer, offset + 4);
-        }
-
-        /// <summary>
-        /// Populates buffer with little endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        protected static void UInt32ToLittleEndian(uint number, byte[] buffer)
-        {
-            buffer[0] = (byte)(number);
-            buffer[1] = (byte)(number >> 8);
-            buffer[2] = (byte)(number >> 16);
-            buffer[3] = (byte)(number >> 24);
-        }
-
-        /// <summary>
-        /// Populates buffer with little endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        protected static void UInt32ToLittleEndian(uint number, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(number);
-            buffer[offset + 1] = (byte)(number >> 8);
-            buffer[offset + 2] = (byte)(number >> 16);
-            buffer[offset + 3] = (byte)(number >> 24);
-        }
-
-        /// <summary>
-        /// Converts little endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <returns>Converted <see cref="UInt32" />.</returns>
-        protected static uint LittleEndianToUInt32(byte[] buffer)
-        {
-            uint n = (uint)buffer[0];
-            n |= (uint)buffer[1] << 8;
-            n |= (uint)buffer[2] << 16;
-            n |= (uint)buffer[3] << 24;
-            return n;
-        }
-
-        /// <summary>
-        /// Converts little endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        /// <returns>Converted <see cref="Int32" />.</returns>
-        protected static uint LittleEndianToUInt32(byte[] buffer, int offset)
-        {
-            uint n = (uint)buffer[offset];
-            n |= (uint)buffer[offset + 1] << 8;
-            n |= (uint)buffer[offset + 2] << 16;
-            n |= (uint)buffer[offset + 3] << 24;
-            return n;
-        }
-
-        /// <summary>
-        /// Converts little endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <returns>Converted <see cref="UInt64" />.</returns>
-        protected static ulong LittleEndianToUInt64(byte[] buffer)
-        {
-            uint lo = LittleEndianToUInt32(buffer);
-            uint hi = LittleEndianToUInt32(buffer, 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        /// <summary>
-        /// Converts little endian bytes into number.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        /// <returns>Converted <see cref="UInt64" />.</returns>
-        protected static ulong LittleEndianToUInt64(byte[] buffer, int offset)
-        {
-            uint lo = LittleEndianToUInt32(buffer, offset);
-            uint hi = LittleEndianToUInt32(buffer, offset + 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        /// <summary>
-        /// Populates buffer with little endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        protected static void UInt64ToLittleEndian(ulong number, byte[] buffer)
-        {
-            UInt32ToLittleEndian((uint)(number), buffer);
-            UInt32ToLittleEndian((uint)(number >> 32), buffer, 4);
-        }
-
-        /// <summary>
-        /// Populates buffer with little endian number representation.
-        /// </summary>
-        /// <param name="number">The number to convert.</param>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The buffer offset.</param>
-        protected static void UInt64ToLittleEndian(ulong number, byte[] buffer, int offset)
-        {
-            UInt32ToLittleEndian((uint)(number), buffer, offset);
-            UInt32ToLittleEndian((uint)(number >> 32), buffer, offset + 4);
-        }
-
-        #endregion
     }
 }
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs
index 77c014551..b42258624 100644
--- a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
 {
@@ -25,533 +26,533 @@ public sealed class AesCipher : BlockCipher
         #region Static Definition Tables
 
         private static readonly byte[] S =
-		{
-			99, 124, 119, 123, 242, 107, 111, 197,
-			48,   1, 103,  43, 254, 215, 171, 118,
-			202, 130, 201, 125, 250,  89,  71, 240,
-			173, 212, 162, 175, 156, 164, 114, 192,
-			183, 253, 147,  38,  54,  63, 247, 204,
-			52, 165, 229, 241, 113, 216,  49,  21,
-			4, 199,  35, 195,  24, 150,   5, 154,
-			7,  18, 128, 226, 235,  39, 178, 117,
-			9, 131,  44,  26,  27, 110,  90, 160,
-			82,  59, 214, 179,  41, 227,  47, 132,
-			83, 209,   0, 237,  32, 252, 177,  91,
-			106, 203, 190,  57,  74,  76,  88, 207,
-			208, 239, 170, 251,  67,  77,  51, 133,
-			69, 249,   2, 127,  80,  60, 159, 168,
-			81, 163,  64, 143, 146, 157,  56, 245,
-			188, 182, 218,  33,  16, 255, 243, 210,
-			205,  12,  19, 236,  95, 151,  68,  23,
-			196, 167, 126,  61, 100,  93,  25, 115,
-			96, 129,  79, 220,  34,  42, 144, 136,
-			70, 238, 184,  20, 222,  94,  11, 219,
-			224,  50,  58,  10,  73,   6,  36,  92,
-			194, 211, 172,  98, 145, 149, 228, 121,
-			231, 200,  55, 109, 141, 213,  78, 169,
-			108,  86, 244, 234, 101, 122, 174,   8,
-			186, 120,  37,  46,  28, 166, 180, 198,
-			232, 221, 116,  31,  75, 189, 139, 138,
-			112,  62, 181, 102,  72,   3, 246,  14,
-			97,  53,  87, 185, 134, 193,  29, 158,
-			225, 248, 152,  17, 105, 217, 142, 148,
-			155,  30, 135, 233, 206,  85,  40, 223,
-			140, 161, 137,  13, 191, 230,  66, 104,
-			65, 153,  45,  15, 176,  84, 187,  22
-		};
+        {
+            99, 124, 119, 123, 242, 107, 111, 197,
+            48, 1, 103, 43, 254, 215, 171, 118,
+            202, 130, 201, 125, 250, 89, 71, 240,
+            173, 212, 162, 175, 156, 164, 114, 192,
+            183, 253, 147, 38, 54, 63, 247, 204,
+            52, 165, 229, 241, 113, 216, 49, 21,
+            4, 199, 35, 195, 24, 150, 5, 154,
+            7, 18, 128, 226, 235, 39, 178, 117,
+            9, 131, 44, 26, 27, 110, 90, 160,
+            82, 59, 214, 179, 41, 227, 47, 132,
+            83, 209, 0, 237, 32, 252, 177, 91,
+            106, 203, 190, 57, 74, 76, 88, 207,
+            208, 239, 170, 251, 67, 77, 51, 133,
+            69, 249, 2, 127, 80, 60, 159, 168,
+            81, 163, 64, 143, 146, 157, 56, 245,
+            188, 182, 218, 33, 16, 255, 243, 210,
+            205, 12, 19, 236, 95, 151, 68, 23,
+            196, 167, 126, 61, 100, 93, 25, 115,
+            96, 129, 79, 220, 34, 42, 144, 136,
+            70, 238, 184, 20, 222, 94, 11, 219,
+            224, 50, 58, 10, 73, 6, 36, 92,
+            194, 211, 172, 98, 145, 149, 228, 121,
+            231, 200, 55, 109, 141, 213, 78, 169,
+            108, 86, 244, 234, 101, 122, 174, 8,
+            186, 120, 37, 46, 28, 166, 180, 198,
+            232, 221, 116, 31, 75, 189, 139, 138,
+            112, 62, 181, 102, 72, 3, 246, 14,
+            97, 53, 87, 185, 134, 193, 29, 158,
+            225, 248, 152, 17, 105, 217, 142, 148,
+            155, 30, 135, 233, 206, 85, 40, 223,
+            140, 161, 137, 13, 191, 230, 66, 104,
+            65, 153, 45, 15, 176, 84, 187, 22
+        };
 
         // The inverse S-box
         private static readonly byte[] Si =
-		{
-			82,   9, 106, 213,  48,  54, 165,  56,
-			191,  64, 163, 158, 129, 243, 215, 251,
-			124, 227,  57, 130, 155,  47, 255, 135,
-			52, 142,  67,  68, 196, 222, 233, 203,
-			84, 123, 148,  50, 166, 194,  35,  61,
-			238,  76, 149,  11,  66, 250, 195,  78,
-			8,  46, 161, 102,  40, 217,  36, 178,
-			118,  91, 162,  73, 109, 139, 209,  37,
-			114, 248, 246, 100, 134, 104, 152,  22,
-			212, 164,  92, 204,  93, 101, 182, 146,
-			108, 112,  72,  80, 253, 237, 185, 218,
-			94,  21,  70,  87, 167, 141, 157, 132,
-			144, 216, 171,   0, 140, 188, 211,  10,
-			247, 228,  88,   5, 184, 179,  69,   6,
-			208,  44,  30, 143, 202,  63,  15,   2,
-			193, 175, 189,   3,   1,  19, 138, 107,
-			58, 145,  17,  65,  79, 103, 220, 234,
-			151, 242, 207, 206, 240, 180, 230, 115,
-			150, 172, 116,  34, 231, 173,  53, 133,
-			226, 249,  55, 232,  28, 117, 223, 110,
-			71, 241,  26, 113,  29,  41, 197, 137,
-			111, 183,  98,  14, 170,  24, 190,  27,
-			252,  86,  62,  75, 198, 210, 121,  32,
-			154, 219, 192, 254, 120, 205,  90, 244,
-			31, 221, 168,  51, 136,   7, 199,  49,
-			177,  18,  16,  89,  39, 128, 236,  95,
-			96,  81, 127, 169,  25, 181,  74,  13,
-			45, 229, 122, 159, 147, 201, 156, 239,
-			160, 224,  59,  77, 174,  42, 245, 176,
-			200, 235, 187,  60, 131,  83, 153,  97,
-			23,  43,   4, 126, 186, 119, 214,  38,
-			225, 105,  20,  99,  85,  33,  12, 125
-		};
+        {
+            82, 9, 106, 213, 48, 54, 165, 56,
+            191, 64, 163, 158, 129, 243, 215, 251,
+            124, 227, 57, 130, 155, 47, 255, 135,
+            52, 142, 67, 68, 196, 222, 233, 203,
+            84, 123, 148, 50, 166, 194, 35, 61,
+            238, 76, 149, 11, 66, 250, 195, 78,
+            8, 46, 161, 102, 40, 217, 36, 178,
+            118, 91, 162, 73, 109, 139, 209, 37,
+            114, 248, 246, 100, 134, 104, 152, 22,
+            212, 164, 92, 204, 93, 101, 182, 146,
+            108, 112, 72, 80, 253, 237, 185, 218,
+            94, 21, 70, 87, 167, 141, 157, 132,
+            144, 216, 171, 0, 140, 188, 211, 10,
+            247, 228, 88, 5, 184, 179, 69, 6,
+            208, 44, 30, 143, 202, 63, 15, 2,
+            193, 175, 189, 3, 1, 19, 138, 107,
+            58, 145, 17, 65, 79, 103, 220, 234,
+            151, 242, 207, 206, 240, 180, 230, 115,
+            150, 172, 116, 34, 231, 173, 53, 133,
+            226, 249, 55, 232, 28, 117, 223, 110,
+            71, 241, 26, 113, 29, 41, 197, 137,
+            111, 183, 98, 14, 170, 24, 190, 27,
+            252, 86, 62, 75, 198, 210, 121, 32,
+            154, 219, 192, 254, 120, 205, 90, 244,
+            31, 221, 168, 51, 136, 7, 199, 49,
+            177, 18, 16, 89, 39, 128, 236, 95,
+            96, 81, 127, 169, 25, 181, 74, 13,
+            45, 229, 122, 159, 147, 201, 156, 239,
+            160, 224, 59, 77, 174, 42, 245, 176,
+            200, 235, 187, 60, 131, 83, 153, 97,
+            23, 43, 4, 126, 186, 119, 214, 38,
+            225, 105, 20, 99, 85, 33, 12, 125
+        };
 
         // vector used in calculating key schedule (powers of x in GF(256))
         private static readonly byte[] rcon =
-		{
-			0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
-			0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
-		};
+        {
+            0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
+            0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
+        };
 
         // precomputation tables of calculations for rounds
         private static readonly uint[] T0 =
-		{
-			0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 0x0df2f2ff,
-			0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 0x50303060, 0x03010102,
-			0xa96767ce, 0x7d2b2b56, 0x19fefee7, 0x62d7d7b5, 0xe6abab4d,
-			0x9a7676ec, 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
-			0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 0xecadad41,
-			0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 0xbf9c9c23, 0xf7a4a453,
-			0x967272e4, 0x5bc0c09b, 0xc2b7b775, 0x1cfdfde1, 0xae93933d,
-			0x6a26264c, 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
-			0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 0x937171e2,
-			0x73d8d8ab, 0x53313162, 0x3f15152a, 0x0c040408, 0x52c7c795,
-			0x65232346, 0x5ec3c39d, 0x28181830, 0xa1969637, 0x0f05050a,
-			0xb59a9a2f, 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
-			0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 0x1b090912,
-			0x9e83831d, 0x742c2c58, 0x2e1a1a34, 0x2d1b1b36, 0xb26e6edc,
-			0xee5a5ab4, 0xfba0a05b, 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7,
-			0xceb3b37d, 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
-			0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 0x60202040,
-			0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 0xbe6a6ad4, 0x46cbcb8d,
-			0xd9bebe67, 0x4b393972, 0xde4a4a94, 0xd44c4c98, 0xe85858b0,
-			0x4acfcf85, 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
-			0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 0xcf45458a,
-			0x10f9f9e9, 0x06020204, 0x817f7ffe, 0xf05050a0, 0x443c3c78,
-			0xba9f9f25, 0xe3a8a84b, 0xf35151a2, 0xfea3a35d, 0xc0404080,
-			0x8a8f8f05, 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
-			0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 0x30101020,
-			0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 0x4ccdcd81, 0x140c0c18,
-			0x35131326, 0x2fececc3, 0xe15f5fbe, 0xa2979735, 0xcc444488,
-			0x3917172e, 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
-			0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 0xa06060c0,
-			0x98818119, 0xd14f4f9e, 0x7fdcdca3, 0x66222244, 0x7e2a2a54,
-			0xab90903b, 0x8388880b, 0xca46468c, 0x29eeeec7, 0xd3b8b86b,
-			0x3c141428, 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
-			0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 0xdb494992,
-			0x0a06060c, 0x6c242448, 0xe45c5cb8, 0x5dc2c29f, 0x6ed3d3bd,
-			0xefacac43, 0xa66262c4, 0xa8919139, 0xa4959531, 0x37e4e4d3,
-			0x8b7979f2, 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
-			0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 0xb46c6cd8,
-			0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 0xaf6565ca, 0x8e7a7af4,
-			0xe9aeae47, 0x18080810, 0xd5baba6f, 0x887878f0, 0x6f25254a,
-			0x722e2e5c, 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
-			0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 0xdd4b4b96,
-			0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 0x907070e0, 0x423e3e7c,
-			0xc4b5b571, 0xaa6666cc, 0xd8484890, 0x05030306, 0x01f6f6f7,
-			0x120e0e1c, 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
-			0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 0x38e1e1d9,
-			0x13f8f8eb, 0xb398982b, 0x33111122, 0xbb6969d2, 0x70d9d9a9,
-			0x898e8e07, 0xa7949433, 0xb69b9b2d, 0x221e1e3c, 0x92878715,
-			0x20e9e9c9, 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
-			0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 0xdabfbf65,
-			0x31e6e6d7, 0xc6424284, 0xb86868d0, 0xc3414182, 0xb0999929,
-			0x772d2d5a, 0x110f0f1e, 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d,
-			0x3a16162c
-		};
+        {
+            0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 0x0df2f2ff,
+            0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 0x50303060, 0x03010102,
+            0xa96767ce, 0x7d2b2b56, 0x19fefee7, 0x62d7d7b5, 0xe6abab4d,
+            0x9a7676ec, 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
+            0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 0xecadad41,
+            0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 0xbf9c9c23, 0xf7a4a453,
+            0x967272e4, 0x5bc0c09b, 0xc2b7b775, 0x1cfdfde1, 0xae93933d,
+            0x6a26264c, 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
+            0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 0x937171e2,
+            0x73d8d8ab, 0x53313162, 0x3f15152a, 0x0c040408, 0x52c7c795,
+            0x65232346, 0x5ec3c39d, 0x28181830, 0xa1969637, 0x0f05050a,
+            0xb59a9a2f, 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
+            0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 0x1b090912,
+            0x9e83831d, 0x742c2c58, 0x2e1a1a34, 0x2d1b1b36, 0xb26e6edc,
+            0xee5a5ab4, 0xfba0a05b, 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7,
+            0xceb3b37d, 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
+            0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 0x60202040,
+            0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 0xbe6a6ad4, 0x46cbcb8d,
+            0xd9bebe67, 0x4b393972, 0xde4a4a94, 0xd44c4c98, 0xe85858b0,
+            0x4acfcf85, 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
+            0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 0xcf45458a,
+            0x10f9f9e9, 0x06020204, 0x817f7ffe, 0xf05050a0, 0x443c3c78,
+            0xba9f9f25, 0xe3a8a84b, 0xf35151a2, 0xfea3a35d, 0xc0404080,
+            0x8a8f8f05, 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
+            0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 0x30101020,
+            0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 0x4ccdcd81, 0x140c0c18,
+            0x35131326, 0x2fececc3, 0xe15f5fbe, 0xa2979735, 0xcc444488,
+            0x3917172e, 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
+            0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 0xa06060c0,
+            0x98818119, 0xd14f4f9e, 0x7fdcdca3, 0x66222244, 0x7e2a2a54,
+            0xab90903b, 0x8388880b, 0xca46468c, 0x29eeeec7, 0xd3b8b86b,
+            0x3c141428, 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
+            0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 0xdb494992,
+            0x0a06060c, 0x6c242448, 0xe45c5cb8, 0x5dc2c29f, 0x6ed3d3bd,
+            0xefacac43, 0xa66262c4, 0xa8919139, 0xa4959531, 0x37e4e4d3,
+            0x8b7979f2, 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
+            0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 0xb46c6cd8,
+            0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 0xaf6565ca, 0x8e7a7af4,
+            0xe9aeae47, 0x18080810, 0xd5baba6f, 0x887878f0, 0x6f25254a,
+            0x722e2e5c, 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
+            0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 0xdd4b4b96,
+            0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 0x907070e0, 0x423e3e7c,
+            0xc4b5b571, 0xaa6666cc, 0xd8484890, 0x05030306, 0x01f6f6f7,
+            0x120e0e1c, 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
+            0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 0x38e1e1d9,
+            0x13f8f8eb, 0xb398982b, 0x33111122, 0xbb6969d2, 0x70d9d9a9,
+            0x898e8e07, 0xa7949433, 0xb69b9b2d, 0x221e1e3c, 0x92878715,
+            0x20e9e9c9, 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
+            0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 0xdabfbf65,
+            0x31e6e6d7, 0xc6424284, 0xb86868d0, 0xc3414182, 0xb0999929,
+            0x772d2d5a, 0x110f0f1e, 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d,
+            0x3a16162c
+        };
 
         private static readonly uint[] T1 =
-		{
-			0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d, 0xf2f2ff0d,
-			0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154, 0x30306050, 0x01010203,
-			0x6767cea9, 0x2b2b567d, 0xfefee719, 0xd7d7b562, 0xabab4de6,
-			0x7676ec9a, 0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
-			0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b, 0xadad41ec,
-			0xd4d4b367, 0xa2a25ffd, 0xafaf45ea, 0x9c9c23bf, 0xa4a453f7,
-			0x7272e496, 0xc0c09b5b, 0xb7b775c2, 0xfdfde11c, 0x93933dae,
-			0x26264c6a, 0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
-			0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908, 0x7171e293,
-			0xd8d8ab73, 0x31316253, 0x15152a3f, 0x0404080c, 0xc7c79552,
-			0x23234665, 0xc3c39d5e, 0x18183028, 0x969637a1, 0x05050a0f,
-			0x9a9a2fb5, 0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
-			0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f, 0x0909121b,
-			0x83831d9e, 0x2c2c5874, 0x1a1a342e, 0x1b1b362d, 0x6e6edcb2,
-			0x5a5ab4ee, 0xa0a05bfb, 0x5252a4f6, 0x3b3b764d, 0xd6d6b761,
-			0xb3b37dce, 0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
-			0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c, 0x20204060,
-			0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed, 0x6a6ad4be, 0xcbcb8d46,
-			0xbebe67d9, 0x3939724b, 0x4a4a94de, 0x4c4c98d4, 0x5858b0e8,
-			0xcfcf854a, 0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
-			0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194, 0x45458acf,
-			0xf9f9e910, 0x02020406, 0x7f7ffe81, 0x5050a0f0, 0x3c3c7844,
-			0x9f9f25ba, 0xa8a84be3, 0x5151a2f3, 0xa3a35dfe, 0x404080c0,
-			0x8f8f058a, 0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
-			0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263, 0x10102030,
-			0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d, 0xcdcd814c, 0x0c0c1814,
-			0x13132635, 0xececc32f, 0x5f5fbee1, 0x979735a2, 0x444488cc,
-			0x17172e39, 0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
-			0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695, 0x6060c0a0,
-			0x81811998, 0x4f4f9ed1, 0xdcdca37f, 0x22224466, 0x2a2a547e,
-			0x90903bab, 0x88880b83, 0x46468cca, 0xeeeec729, 0xb8b86bd3,
-			0x1414283c, 0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
-			0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e, 0x494992db,
-			0x06060c0a, 0x2424486c, 0x5c5cb8e4, 0xc2c29f5d, 0xd3d3bd6e,
-			0xacac43ef, 0x6262c4a6, 0x919139a8, 0x959531a4, 0xe4e4d337,
-			0x7979f28b, 0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
-			0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0, 0x6c6cd8b4,
-			0x5656acfa, 0xf4f4f307, 0xeaeacf25, 0x6565caaf, 0x7a7af48e,
-			0xaeae47e9, 0x08081018, 0xbaba6fd5, 0x7878f088, 0x25254a6f,
-			0x2e2e5c72, 0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
-			0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21, 0x4b4b96dd,
-			0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85, 0x7070e090, 0x3e3e7c42,
-			0xb5b571c4, 0x6666ccaa, 0x484890d8, 0x03030605, 0xf6f6f701,
-			0x0e0e1c12, 0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
-			0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9, 0xe1e1d938,
-			0xf8f8eb13, 0x98982bb3, 0x11112233, 0x6969d2bb, 0xd9d9a970,
-			0x8e8e0789, 0x949433a7, 0x9b9b2db6, 0x1e1e3c22, 0x87871592,
-			0xe9e9c920, 0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
-			0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17, 0xbfbf65da,
-			0xe6e6d731, 0x424284c6, 0x6868d0b8, 0x414182c3, 0x999929b0,
-			0x2d2d5a77, 0x0f0f1e11, 0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6,
-			0x16162c3a
-		};
+        {
+            0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d, 0xf2f2ff0d,
+            0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154, 0x30306050, 0x01010203,
+            0x6767cea9, 0x2b2b567d, 0xfefee719, 0xd7d7b562, 0xabab4de6,
+            0x7676ec9a, 0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
+            0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b, 0xadad41ec,
+            0xd4d4b367, 0xa2a25ffd, 0xafaf45ea, 0x9c9c23bf, 0xa4a453f7,
+            0x7272e496, 0xc0c09b5b, 0xb7b775c2, 0xfdfde11c, 0x93933dae,
+            0x26264c6a, 0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
+            0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908, 0x7171e293,
+            0xd8d8ab73, 0x31316253, 0x15152a3f, 0x0404080c, 0xc7c79552,
+            0x23234665, 0xc3c39d5e, 0x18183028, 0x969637a1, 0x05050a0f,
+            0x9a9a2fb5, 0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
+            0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f, 0x0909121b,
+            0x83831d9e, 0x2c2c5874, 0x1a1a342e, 0x1b1b362d, 0x6e6edcb2,
+            0x5a5ab4ee, 0xa0a05bfb, 0x5252a4f6, 0x3b3b764d, 0xd6d6b761,
+            0xb3b37dce, 0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
+            0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c, 0x20204060,
+            0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed, 0x6a6ad4be, 0xcbcb8d46,
+            0xbebe67d9, 0x3939724b, 0x4a4a94de, 0x4c4c98d4, 0x5858b0e8,
+            0xcfcf854a, 0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
+            0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194, 0x45458acf,
+            0xf9f9e910, 0x02020406, 0x7f7ffe81, 0x5050a0f0, 0x3c3c7844,
+            0x9f9f25ba, 0xa8a84be3, 0x5151a2f3, 0xa3a35dfe, 0x404080c0,
+            0x8f8f058a, 0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
+            0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263, 0x10102030,
+            0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d, 0xcdcd814c, 0x0c0c1814,
+            0x13132635, 0xececc32f, 0x5f5fbee1, 0x979735a2, 0x444488cc,
+            0x17172e39, 0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
+            0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695, 0x6060c0a0,
+            0x81811998, 0x4f4f9ed1, 0xdcdca37f, 0x22224466, 0x2a2a547e,
+            0x90903bab, 0x88880b83, 0x46468cca, 0xeeeec729, 0xb8b86bd3,
+            0x1414283c, 0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
+            0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e, 0x494992db,
+            0x06060c0a, 0x2424486c, 0x5c5cb8e4, 0xc2c29f5d, 0xd3d3bd6e,
+            0xacac43ef, 0x6262c4a6, 0x919139a8, 0x959531a4, 0xe4e4d337,
+            0x7979f28b, 0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
+            0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0, 0x6c6cd8b4,
+            0x5656acfa, 0xf4f4f307, 0xeaeacf25, 0x6565caaf, 0x7a7af48e,
+            0xaeae47e9, 0x08081018, 0xbaba6fd5, 0x7878f088, 0x25254a6f,
+            0x2e2e5c72, 0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
+            0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21, 0x4b4b96dd,
+            0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85, 0x7070e090, 0x3e3e7c42,
+            0xb5b571c4, 0x6666ccaa, 0x484890d8, 0x03030605, 0xf6f6f701,
+            0x0e0e1c12, 0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
+            0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9, 0xe1e1d938,
+            0xf8f8eb13, 0x98982bb3, 0x11112233, 0x6969d2bb, 0xd9d9a970,
+            0x8e8e0789, 0x949433a7, 0x9b9b2db6, 0x1e1e3c22, 0x87871592,
+            0xe9e9c920, 0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
+            0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17, 0xbfbf65da,
+            0xe6e6d731, 0x424284c6, 0x6868d0b8, 0x414182c3, 0x999929b0,
+            0x2d2d5a77, 0x0f0f1e11, 0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6,
+            0x16162c3a
+        };
 
         private static readonly uint[] T2 =
-		{
-			0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b, 0xf2ff0df2,
-			0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5, 0x30605030, 0x01020301,
-			0x67cea967, 0x2b567d2b, 0xfee719fe, 0xd7b562d7, 0xab4de6ab,
-			0x76ec9a76, 0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
-			0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0, 0xad41ecad,
-			0xd4b367d4, 0xa25ffda2, 0xaf45eaaf, 0x9c23bf9c, 0xa453f7a4,
-			0x72e49672, 0xc09b5bc0, 0xb775c2b7, 0xfde11cfd, 0x933dae93,
-			0x264c6a26, 0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
-			0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1, 0x71e29371,
-			0xd8ab73d8, 0x31625331, 0x152a3f15, 0x04080c04, 0xc79552c7,
-			0x23466523, 0xc39d5ec3, 0x18302818, 0x9637a196, 0x050a0f05,
-			0x9a2fb59a, 0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
-			0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75, 0x09121b09,
-			0x831d9e83, 0x2c58742c, 0x1a342e1a, 0x1b362d1b, 0x6edcb26e,
-			0x5ab4ee5a, 0xa05bfba0, 0x52a4f652, 0x3b764d3b, 0xd6b761d6,
-			0xb37dceb3, 0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
-			0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced, 0x20406020,
-			0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b, 0x6ad4be6a, 0xcb8d46cb,
-			0xbe67d9be, 0x39724b39, 0x4a94de4a, 0x4c98d44c, 0x58b0e858,
-			0xcf854acf, 0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
-			0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485, 0x458acf45,
-			0xf9e910f9, 0x02040602, 0x7ffe817f, 0x50a0f050, 0x3c78443c,
-			0x9f25ba9f, 0xa84be3a8, 0x51a2f351, 0xa35dfea3, 0x4080c040,
-			0x8f058a8f, 0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
-			0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321, 0x10203010,
-			0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2, 0xcd814ccd, 0x0c18140c,
-			0x13263513, 0xecc32fec, 0x5fbee15f, 0x9735a297, 0x4488cc44,
-			0x172e3917, 0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
-			0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573, 0x60c0a060,
-			0x81199881, 0x4f9ed14f, 0xdca37fdc, 0x22446622, 0x2a547e2a,
-			0x903bab90, 0x880b8388, 0x468cca46, 0xeec729ee, 0xb86bd3b8,
-			0x14283c14, 0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
-			0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a, 0x4992db49,
-			0x060c0a06, 0x24486c24, 0x5cb8e45c, 0xc29f5dc2, 0xd3bd6ed3,
-			0xac43efac, 0x62c4a662, 0x9139a891, 0x9531a495, 0xe4d337e4,
-			0x79f28b79, 0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
-			0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9, 0x6cd8b46c,
-			0x56acfa56, 0xf4f307f4, 0xeacf25ea, 0x65caaf65, 0x7af48e7a,
-			0xae47e9ae, 0x08101808, 0xba6fd5ba, 0x78f08878, 0x254a6f25,
-			0x2e5c722e, 0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
-			0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f, 0x4b96dd4b,
-			0xbd61dcbd, 0x8b0d868b, 0x8a0f858a, 0x70e09070, 0x3e7c423e,
-			0xb571c4b5, 0x66ccaa66, 0x4890d848, 0x03060503, 0xf6f701f6,
-			0x0e1c120e, 0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
-			0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e, 0xe1d938e1,
-			0xf8eb13f8, 0x982bb398, 0x11223311, 0x69d2bb69, 0xd9a970d9,
-			0x8e07898e, 0x9433a794, 0x9b2db69b, 0x1e3c221e, 0x87159287,
-			0xe9c920e9, 0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
-			0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d, 0xbf65dabf,
-			0xe6d731e6, 0x4284c642, 0x68d0b868, 0x4182c341, 0x9929b099,
-			0x2d5a772d, 0x0f1e110f, 0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb,
-			0x162c3a16
-		};
+        {
+            0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b, 0xf2ff0df2,
+            0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5, 0x30605030, 0x01020301,
+            0x67cea967, 0x2b567d2b, 0xfee719fe, 0xd7b562d7, 0xab4de6ab,
+            0x76ec9a76, 0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
+            0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0, 0xad41ecad,
+            0xd4b367d4, 0xa25ffda2, 0xaf45eaaf, 0x9c23bf9c, 0xa453f7a4,
+            0x72e49672, 0xc09b5bc0, 0xb775c2b7, 0xfde11cfd, 0x933dae93,
+            0x264c6a26, 0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
+            0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1, 0x71e29371,
+            0xd8ab73d8, 0x31625331, 0x152a3f15, 0x04080c04, 0xc79552c7,
+            0x23466523, 0xc39d5ec3, 0x18302818, 0x9637a196, 0x050a0f05,
+            0x9a2fb59a, 0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
+            0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75, 0x09121b09,
+            0x831d9e83, 0x2c58742c, 0x1a342e1a, 0x1b362d1b, 0x6edcb26e,
+            0x5ab4ee5a, 0xa05bfba0, 0x52a4f652, 0x3b764d3b, 0xd6b761d6,
+            0xb37dceb3, 0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
+            0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced, 0x20406020,
+            0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b, 0x6ad4be6a, 0xcb8d46cb,
+            0xbe67d9be, 0x39724b39, 0x4a94de4a, 0x4c98d44c, 0x58b0e858,
+            0xcf854acf, 0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
+            0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485, 0x458acf45,
+            0xf9e910f9, 0x02040602, 0x7ffe817f, 0x50a0f050, 0x3c78443c,
+            0x9f25ba9f, 0xa84be3a8, 0x51a2f351, 0xa35dfea3, 0x4080c040,
+            0x8f058a8f, 0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
+            0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321, 0x10203010,
+            0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2, 0xcd814ccd, 0x0c18140c,
+            0x13263513, 0xecc32fec, 0x5fbee15f, 0x9735a297, 0x4488cc44,
+            0x172e3917, 0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
+            0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573, 0x60c0a060,
+            0x81199881, 0x4f9ed14f, 0xdca37fdc, 0x22446622, 0x2a547e2a,
+            0x903bab90, 0x880b8388, 0x468cca46, 0xeec729ee, 0xb86bd3b8,
+            0x14283c14, 0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
+            0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a, 0x4992db49,
+            0x060c0a06, 0x24486c24, 0x5cb8e45c, 0xc29f5dc2, 0xd3bd6ed3,
+            0xac43efac, 0x62c4a662, 0x9139a891, 0x9531a495, 0xe4d337e4,
+            0x79f28b79, 0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
+            0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9, 0x6cd8b46c,
+            0x56acfa56, 0xf4f307f4, 0xeacf25ea, 0x65caaf65, 0x7af48e7a,
+            0xae47e9ae, 0x08101808, 0xba6fd5ba, 0x78f08878, 0x254a6f25,
+            0x2e5c722e, 0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
+            0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f, 0x4b96dd4b,
+            0xbd61dcbd, 0x8b0d868b, 0x8a0f858a, 0x70e09070, 0x3e7c423e,
+            0xb571c4b5, 0x66ccaa66, 0x4890d848, 0x03060503, 0xf6f701f6,
+            0x0e1c120e, 0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
+            0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e, 0xe1d938e1,
+            0xf8eb13f8, 0x982bb398, 0x11223311, 0x69d2bb69, 0xd9a970d9,
+            0x8e07898e, 0x9433a794, 0x9b2db69b, 0x1e3c221e, 0x87159287,
+            0xe9c920e9, 0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
+            0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d, 0xbf65dabf,
+            0xe6d731e6, 0x4284c642, 0x68d0b868, 0x4182c341, 0x9929b099,
+            0x2d5a772d, 0x0f1e110f, 0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb,
+            0x162c3a16
+        };
 
         private static readonly uint[] T3 =
-		{
-			0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b, 0xff0df2f2,
-			0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5, 0x60503030, 0x02030101,
-			0xcea96767, 0x567d2b2b, 0xe719fefe, 0xb562d7d7, 0x4de6abab,
-			0xec9a7676, 0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
-			0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0, 0x41ecadad,
-			0xb367d4d4, 0x5ffda2a2, 0x45eaafaf, 0x23bf9c9c, 0x53f7a4a4,
-			0xe4967272, 0x9b5bc0c0, 0x75c2b7b7, 0xe11cfdfd, 0x3dae9393,
-			0x4c6a2626, 0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
-			0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1, 0xe2937171,
-			0xab73d8d8, 0x62533131, 0x2a3f1515, 0x080c0404, 0x9552c7c7,
-			0x46652323, 0x9d5ec3c3, 0x30281818, 0x37a19696, 0x0a0f0505,
-			0x2fb59a9a, 0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
-			0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575, 0x121b0909,
-			0x1d9e8383, 0x58742c2c, 0x342e1a1a, 0x362d1b1b, 0xdcb26e6e,
-			0xb4ee5a5a, 0x5bfba0a0, 0xa4f65252, 0x764d3b3b, 0xb761d6d6,
-			0x7dceb3b3, 0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
-			0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded, 0x40602020,
-			0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b, 0xd4be6a6a, 0x8d46cbcb,
-			0x67d9bebe, 0x724b3939, 0x94de4a4a, 0x98d44c4c, 0xb0e85858,
-			0x854acfcf, 0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
-			0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585, 0x8acf4545,
-			0xe910f9f9, 0x04060202, 0xfe817f7f, 0xa0f05050, 0x78443c3c,
-			0x25ba9f9f, 0x4be3a8a8, 0xa2f35151, 0x5dfea3a3, 0x80c04040,
-			0x058a8f8f, 0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
-			0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121, 0x20301010,
-			0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2, 0x814ccdcd, 0x18140c0c,
-			0x26351313, 0xc32fecec, 0xbee15f5f, 0x35a29797, 0x88cc4444,
-			0x2e391717, 0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
-			0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373, 0xc0a06060,
-			0x19988181, 0x9ed14f4f, 0xa37fdcdc, 0x44662222, 0x547e2a2a,
-			0x3bab9090, 0x0b838888, 0x8cca4646, 0xc729eeee, 0x6bd3b8b8,
-			0x283c1414, 0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
-			0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a, 0x92db4949,
-			0x0c0a0606, 0x486c2424, 0xb8e45c5c, 0x9f5dc2c2, 0xbd6ed3d3,
-			0x43efacac, 0xc4a66262, 0x39a89191, 0x31a49595, 0xd337e4e4,
-			0xf28b7979, 0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
-			0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9, 0xd8b46c6c,
-			0xacfa5656, 0xf307f4f4, 0xcf25eaea, 0xcaaf6565, 0xf48e7a7a,
-			0x47e9aeae, 0x10180808, 0x6fd5baba, 0xf0887878, 0x4a6f2525,
-			0x5c722e2e, 0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
-			0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f, 0x96dd4b4b,
-			0x61dcbdbd, 0x0d868b8b, 0x0f858a8a, 0xe0907070, 0x7c423e3e,
-			0x71c4b5b5, 0xccaa6666, 0x90d84848, 0x06050303, 0xf701f6f6,
-			0x1c120e0e, 0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
-			0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e, 0xd938e1e1,
-			0xeb13f8f8, 0x2bb39898, 0x22331111, 0xd2bb6969, 0xa970d9d9,
-			0x07898e8e, 0x33a79494, 0x2db69b9b, 0x3c221e1e, 0x15928787,
-			0xc920e9e9, 0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
-			0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d, 0x65dabfbf,
-			0xd731e6e6, 0x84c64242, 0xd0b86868, 0x82c34141, 0x29b09999,
-			0x5a772d2d, 0x1e110f0f, 0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb,
-			0x2c3a1616
-		};
+        {
+            0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b, 0xff0df2f2,
+            0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5, 0x60503030, 0x02030101,
+            0xcea96767, 0x567d2b2b, 0xe719fefe, 0xb562d7d7, 0x4de6abab,
+            0xec9a7676, 0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
+            0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0, 0x41ecadad,
+            0xb367d4d4, 0x5ffda2a2, 0x45eaafaf, 0x23bf9c9c, 0x53f7a4a4,
+            0xe4967272, 0x9b5bc0c0, 0x75c2b7b7, 0xe11cfdfd, 0x3dae9393,
+            0x4c6a2626, 0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
+            0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1, 0xe2937171,
+            0xab73d8d8, 0x62533131, 0x2a3f1515, 0x080c0404, 0x9552c7c7,
+            0x46652323, 0x9d5ec3c3, 0x30281818, 0x37a19696, 0x0a0f0505,
+            0x2fb59a9a, 0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
+            0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575, 0x121b0909,
+            0x1d9e8383, 0x58742c2c, 0x342e1a1a, 0x362d1b1b, 0xdcb26e6e,
+            0xb4ee5a5a, 0x5bfba0a0, 0xa4f65252, 0x764d3b3b, 0xb761d6d6,
+            0x7dceb3b3, 0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
+            0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded, 0x40602020,
+            0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b, 0xd4be6a6a, 0x8d46cbcb,
+            0x67d9bebe, 0x724b3939, 0x94de4a4a, 0x98d44c4c, 0xb0e85858,
+            0x854acfcf, 0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
+            0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585, 0x8acf4545,
+            0xe910f9f9, 0x04060202, 0xfe817f7f, 0xa0f05050, 0x78443c3c,
+            0x25ba9f9f, 0x4be3a8a8, 0xa2f35151, 0x5dfea3a3, 0x80c04040,
+            0x058a8f8f, 0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
+            0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121, 0x20301010,
+            0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2, 0x814ccdcd, 0x18140c0c,
+            0x26351313, 0xc32fecec, 0xbee15f5f, 0x35a29797, 0x88cc4444,
+            0x2e391717, 0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
+            0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373, 0xc0a06060,
+            0x19988181, 0x9ed14f4f, 0xa37fdcdc, 0x44662222, 0x547e2a2a,
+            0x3bab9090, 0x0b838888, 0x8cca4646, 0xc729eeee, 0x6bd3b8b8,
+            0x283c1414, 0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
+            0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a, 0x92db4949,
+            0x0c0a0606, 0x486c2424, 0xb8e45c5c, 0x9f5dc2c2, 0xbd6ed3d3,
+            0x43efacac, 0xc4a66262, 0x39a89191, 0x31a49595, 0xd337e4e4,
+            0xf28b7979, 0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
+            0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9, 0xd8b46c6c,
+            0xacfa5656, 0xf307f4f4, 0xcf25eaea, 0xcaaf6565, 0xf48e7a7a,
+            0x47e9aeae, 0x10180808, 0x6fd5baba, 0xf0887878, 0x4a6f2525,
+            0x5c722e2e, 0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
+            0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f, 0x96dd4b4b,
+            0x61dcbdbd, 0x0d868b8b, 0x0f858a8a, 0xe0907070, 0x7c423e3e,
+            0x71c4b5b5, 0xccaa6666, 0x90d84848, 0x06050303, 0xf701f6f6,
+            0x1c120e0e, 0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
+            0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e, 0xd938e1e1,
+            0xeb13f8f8, 0x2bb39898, 0x22331111, 0xd2bb6969, 0xa970d9d9,
+            0x07898e8e, 0x33a79494, 0x2db69b9b, 0x3c221e1e, 0x15928787,
+            0xc920e9e9, 0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
+            0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d, 0x65dabfbf,
+            0xd731e6e6, 0x84c64242, 0xd0b86868, 0x82c34141, 0x29b09999,
+            0x5a772d2d, 0x1e110f0f, 0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb,
+            0x2c3a1616
+        };
 
         private static readonly uint[] Tinv0 =
-		{
-			0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, 0xcb6bab3b,
-			0xf1459d1f, 0xab58faac, 0x9303e34b, 0x55fa3020, 0xf66d76ad,
-			0x9176cc88, 0x254c02f5, 0xfcd7e54f, 0xd7cb2ac5, 0x80443526,
-			0x8fa362b5, 0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d,
-			0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b, 0xe75f8f03,
-			0x959c9215, 0xeb7a6dbf, 0xda595295, 0x2d83bed4, 0xd3217458,
-			0x2969e049, 0x44c8c98e, 0x6a89c275, 0x78798ef4, 0x6b3e5899,
-			0xdd71b927, 0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d,
-			0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362, 0xe07764b1,
-			0x84ae6bbb, 0x1ca081fe, 0x942b08f9, 0x58684870, 0x19fd458f,
-			0x876cde94, 0xb7f87b52, 0x23d373ab, 0xe2024b72, 0x578f1fe3,
-			0x2aab5566, 0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3,
-			0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed, 0x2b1ccf8a,
-			0x92b479a7, 0xf0f207f3, 0xa1e2694e, 0xcdf4da65, 0xd5be0506,
-			0x1f6234d1, 0x8afea6c4, 0x9d532e34, 0xa055f3a2, 0x32e18a05,
-			0x75ebf6a4, 0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd,
-			0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d, 0xb58d5491,
-			0x055dc471, 0x6fd40604, 0xff155060, 0x24fb9819, 0x97e9bdd6,
-			0xcc434089, 0x779ed967, 0xbd42e8b0, 0x888b8907, 0x385b19e7,
-			0xdbeec879, 0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000,
-			0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c, 0xfbff0efd,
-			0x5638850f, 0x1ed5ae3d, 0x27392d36, 0x64d90f0a, 0x21a65c68,
-			0xd1545b9b, 0x3a2e3624, 0xb1670a0c, 0x0fe75793, 0xd296eeb4,
-			0x9e919b1b, 0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c,
-			0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12, 0x0b0d090e,
-			0xadc78bf2, 0xb9a8b62d, 0xc8a91e14, 0x8519f157, 0x4c0775af,
-			0xbbdd99ee, 0xfd607fa3, 0x9f2601f7, 0xbcf5725c, 0xc53b6644,
-			0x347efb5b, 0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8,
-			0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684, 0x7d244a85,
-			0xf83dbbd2, 0x1132f9ae, 0x6da129c7, 0x4b2f9e1d, 0xf330b2dc,
-			0xec52860d, 0xd0e3c177, 0x6c16b32b, 0x99b970a9, 0xfa489411,
-			0x2264e947, 0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322,
-			0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498, 0xcf81f5a6,
-			0x28de7aa5, 0x268eb7da, 0xa4bfad3f, 0xe49d3a2c, 0x0d927850,
-			0x9bcc5f6a, 0x62467e54, 0xc2138df6, 0xe8b8d890, 0x5ef7392e,
-			0xf5afc382, 0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf,
-			0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb, 0x097826cd,
-			0xf418596e, 0x01b79aec, 0xa89a4f83, 0x656e95e6, 0x7ee6ffaa,
-			0x08cfbc21, 0xe6e815ef, 0xd99be7ba, 0xce366f4a, 0xd4099fea,
-			0xd67cb029, 0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235,
-			0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733, 0x4a9804f1,
-			0xf7daec41, 0x0e50cd7f, 0x2ff69117, 0x8dd64d76, 0x4db0ef43,
-			0x544daacc, 0xdf0496e4, 0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1,
-			0x7f516546, 0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb,
-			0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d, 0x8c61d79a,
-			0x7a0ca137, 0x8e14f859, 0x893c13eb, 0xee27a9ce, 0x35c961b7,
-			0xede51ce1, 0x3cb1477a, 0x59dfd29c, 0x3f73f255, 0x79ce1418,
-			0xbf37c773, 0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478,
-			0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2, 0x72c31d16,
-			0x0c25e2bc, 0x8b493c28, 0x41950dff, 0x7101a839, 0xdeb30c08,
-			0x9ce4b4d8, 0x90c15664, 0x6184cb7b, 0x70b632d5, 0x745c6c48,
-			0x4257b8d0
-		};
+        {
+            0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, 0xcb6bab3b,
+            0xf1459d1f, 0xab58faac, 0x9303e34b, 0x55fa3020, 0xf66d76ad,
+            0x9176cc88, 0x254c02f5, 0xfcd7e54f, 0xd7cb2ac5, 0x80443526,
+            0x8fa362b5, 0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d,
+            0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b, 0xe75f8f03,
+            0x959c9215, 0xeb7a6dbf, 0xda595295, 0x2d83bed4, 0xd3217458,
+            0x2969e049, 0x44c8c98e, 0x6a89c275, 0x78798ef4, 0x6b3e5899,
+            0xdd71b927, 0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d,
+            0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362, 0xe07764b1,
+            0x84ae6bbb, 0x1ca081fe, 0x942b08f9, 0x58684870, 0x19fd458f,
+            0x876cde94, 0xb7f87b52, 0x23d373ab, 0xe2024b72, 0x578f1fe3,
+            0x2aab5566, 0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3,
+            0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed, 0x2b1ccf8a,
+            0x92b479a7, 0xf0f207f3, 0xa1e2694e, 0xcdf4da65, 0xd5be0506,
+            0x1f6234d1, 0x8afea6c4, 0x9d532e34, 0xa055f3a2, 0x32e18a05,
+            0x75ebf6a4, 0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd,
+            0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d, 0xb58d5491,
+            0x055dc471, 0x6fd40604, 0xff155060, 0x24fb9819, 0x97e9bdd6,
+            0xcc434089, 0x779ed967, 0xbd42e8b0, 0x888b8907, 0x385b19e7,
+            0xdbeec879, 0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000,
+            0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c, 0xfbff0efd,
+            0x5638850f, 0x1ed5ae3d, 0x27392d36, 0x64d90f0a, 0x21a65c68,
+            0xd1545b9b, 0x3a2e3624, 0xb1670a0c, 0x0fe75793, 0xd296eeb4,
+            0x9e919b1b, 0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c,
+            0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12, 0x0b0d090e,
+            0xadc78bf2, 0xb9a8b62d, 0xc8a91e14, 0x8519f157, 0x4c0775af,
+            0xbbdd99ee, 0xfd607fa3, 0x9f2601f7, 0xbcf5725c, 0xc53b6644,
+            0x347efb5b, 0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8,
+            0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684, 0x7d244a85,
+            0xf83dbbd2, 0x1132f9ae, 0x6da129c7, 0x4b2f9e1d, 0xf330b2dc,
+            0xec52860d, 0xd0e3c177, 0x6c16b32b, 0x99b970a9, 0xfa489411,
+            0x2264e947, 0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322,
+            0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498, 0xcf81f5a6,
+            0x28de7aa5, 0x268eb7da, 0xa4bfad3f, 0xe49d3a2c, 0x0d927850,
+            0x9bcc5f6a, 0x62467e54, 0xc2138df6, 0xe8b8d890, 0x5ef7392e,
+            0xf5afc382, 0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf,
+            0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb, 0x097826cd,
+            0xf418596e, 0x01b79aec, 0xa89a4f83, 0x656e95e6, 0x7ee6ffaa,
+            0x08cfbc21, 0xe6e815ef, 0xd99be7ba, 0xce366f4a, 0xd4099fea,
+            0xd67cb029, 0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235,
+            0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733, 0x4a9804f1,
+            0xf7daec41, 0x0e50cd7f, 0x2ff69117, 0x8dd64d76, 0x4db0ef43,
+            0x544daacc, 0xdf0496e4, 0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1,
+            0x7f516546, 0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb,
+            0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d, 0x8c61d79a,
+            0x7a0ca137, 0x8e14f859, 0x893c13eb, 0xee27a9ce, 0x35c961b7,
+            0xede51ce1, 0x3cb1477a, 0x59dfd29c, 0x3f73f255, 0x79ce1418,
+            0xbf37c773, 0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478,
+            0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2, 0x72c31d16,
+            0x0c25e2bc, 0x8b493c28, 0x41950dff, 0x7101a839, 0xdeb30c08,
+            0x9ce4b4d8, 0x90c15664, 0x6184cb7b, 0x70b632d5, 0x745c6c48,
+            0x4257b8d0
+        };
 
         private static readonly uint[] Tinv1 =
-		{
-			0xa7f45150, 0x65417e53, 0xa4171ac3, 0x5e273a96, 0x6bab3bcb,
-			0x459d1ff1, 0x58faacab, 0x03e34b93, 0xfa302055, 0x6d76adf6,
-			0x76cc8891, 0x4c02f525, 0xd7e54ffc, 0xcb2ac5d7, 0x44352680,
-			0xa362b58f, 0x5ab1de49, 0x1bba2567, 0x0eea4598, 0xc0fe5de1,
-			0x752fc302, 0xf04c8112, 0x97468da3, 0xf9d36bc6, 0x5f8f03e7,
-			0x9c921595, 0x7a6dbfeb, 0x595295da, 0x83bed42d, 0x217458d3,
-			0x69e04929, 0xc8c98e44, 0x89c2756a, 0x798ef478, 0x3e58996b,
-			0x71b927dd, 0x4fe1beb6, 0xad88f017, 0xac20c966, 0x3ace7db4,
-			0x4adf6318, 0x311ae582, 0x33519760, 0x7f536245, 0x7764b1e0,
-			0xae6bbb84, 0xa081fe1c, 0x2b08f994, 0x68487058, 0xfd458f19,
-			0x6cde9487, 0xf87b52b7, 0xd373ab23, 0x024b72e2, 0x8f1fe357,
-			0xab55662a, 0x28ebb207, 0xc2b52f03, 0x7bc5869a, 0x0837d3a5,
-			0x872830f2, 0xa5bf23b2, 0x6a0302ba, 0x8216ed5c, 0x1ccf8a2b,
-			0xb479a792, 0xf207f3f0, 0xe2694ea1, 0xf4da65cd, 0xbe0506d5,
-			0x6234d11f, 0xfea6c48a, 0x532e349d, 0x55f3a2a0, 0xe18a0532,
-			0xebf6a475, 0xec830b39, 0xef6040aa, 0x9f715e06, 0x106ebd51,
-			0x8a213ef9, 0x06dd963d, 0x053eddae, 0xbde64d46, 0x8d5491b5,
-			0x5dc47105, 0xd406046f, 0x155060ff, 0xfb981924, 0xe9bdd697,
-			0x434089cc, 0x9ed96777, 0x42e8b0bd, 0x8b890788, 0x5b19e738,
-			0xeec879db, 0x0a7ca147, 0x0f427ce9, 0x1e84f8c9, 0x00000000,
-			0x86800983, 0xed2b3248, 0x70111eac, 0x725a6c4e, 0xff0efdfb,
-			0x38850f56, 0xd5ae3d1e, 0x392d3627, 0xd90f0a64, 0xa65c6821,
-			0x545b9bd1, 0x2e36243a, 0x670a0cb1, 0xe757930f, 0x96eeb4d2,
-			0x919b1b9e, 0xc5c0804f, 0x20dc61a2, 0x4b775a69, 0x1a121c16,
-			0xba93e20a, 0x2aa0c0e5, 0xe0223c43, 0x171b121d, 0x0d090e0b,
-			0xc78bf2ad, 0xa8b62db9, 0xa91e14c8, 0x19f15785, 0x0775af4c,
-			0xdd99eebb, 0x607fa3fd, 0x2601f79f, 0xf5725cbc, 0x3b6644c5,
-			0x7efb5b34, 0x29438b76, 0xc623cbdc, 0xfcedb668, 0xf1e4b863,
-			0xdc31d7ca, 0x85634210, 0x22971340, 0x11c68420, 0x244a857d,
-			0x3dbbd2f8, 0x32f9ae11, 0xa129c76d, 0x2f9e1d4b, 0x30b2dcf3,
-			0x52860dec, 0xe3c177d0, 0x16b32b6c, 0xb970a999, 0x489411fa,
-			0x64e94722, 0x8cfca8c4, 0x3ff0a01a, 0x2c7d56d8, 0x903322ef,
-			0x4e4987c7, 0xd138d9c1, 0xa2ca8cfe, 0x0bd49836, 0x81f5a6cf,
-			0xde7aa528, 0x8eb7da26, 0xbfad3fa4, 0x9d3a2ce4, 0x9278500d,
-			0xcc5f6a9b, 0x467e5462, 0x138df6c2, 0xb8d890e8, 0xf7392e5e,
-			0xafc382f5, 0x805d9fbe, 0x93d0697c, 0x2dd56fa9, 0x1225cfb3,
-			0x99acc83b, 0x7d1810a7, 0x639ce86e, 0xbb3bdb7b, 0x7826cd09,
-			0x18596ef4, 0xb79aec01, 0x9a4f83a8, 0x6e95e665, 0xe6ffaa7e,
-			0xcfbc2108, 0xe815efe6, 0x9be7bad9, 0x366f4ace, 0x099fead4,
-			0x7cb029d6, 0xb2a431af, 0x233f2a31, 0x94a5c630, 0x66a235c0,
-			0xbc4e7437, 0xca82fca6, 0xd090e0b0, 0xd8a73315, 0x9804f14a,
-			0xdaec41f7, 0x50cd7f0e, 0xf691172f, 0xd64d768d, 0xb0ef434d,
-			0x4daacc54, 0x0496e4df, 0xb5d19ee3, 0x886a4c1b, 0x1f2cc1b8,
-			0x5165467f, 0xea5e9d04, 0x358c015d, 0x7487fa73, 0x410bfb2e,
-			0x1d67b35a, 0xd2db9252, 0x5610e933, 0x47d66d13, 0x61d79a8c,
-			0x0ca1377a, 0x14f8598e, 0x3c13eb89, 0x27a9ceee, 0xc961b735,
-			0xe51ce1ed, 0xb1477a3c, 0xdfd29c59, 0x73f2553f, 0xce141879,
-			0x37c773bf, 0xcdf753ea, 0xaafd5f5b, 0x6f3ddf14, 0xdb447886,
-			0xf3afca81, 0xc468b93e, 0x3424382c, 0x40a3c25f, 0xc31d1672,
-			0x25e2bc0c, 0x493c288b, 0x950dff41, 0x01a83971, 0xb30c08de,
-			0xe4b4d89c, 0xc1566490, 0x84cb7b61, 0xb632d570, 0x5c6c4874,
-			0x57b8d042
-		};
+        {
+            0xa7f45150, 0x65417e53, 0xa4171ac3, 0x5e273a96, 0x6bab3bcb,
+            0x459d1ff1, 0x58faacab, 0x03e34b93, 0xfa302055, 0x6d76adf6,
+            0x76cc8891, 0x4c02f525, 0xd7e54ffc, 0xcb2ac5d7, 0x44352680,
+            0xa362b58f, 0x5ab1de49, 0x1bba2567, 0x0eea4598, 0xc0fe5de1,
+            0x752fc302, 0xf04c8112, 0x97468da3, 0xf9d36bc6, 0x5f8f03e7,
+            0x9c921595, 0x7a6dbfeb, 0x595295da, 0x83bed42d, 0x217458d3,
+            0x69e04929, 0xc8c98e44, 0x89c2756a, 0x798ef478, 0x3e58996b,
+            0x71b927dd, 0x4fe1beb6, 0xad88f017, 0xac20c966, 0x3ace7db4,
+            0x4adf6318, 0x311ae582, 0x33519760, 0x7f536245, 0x7764b1e0,
+            0xae6bbb84, 0xa081fe1c, 0x2b08f994, 0x68487058, 0xfd458f19,
+            0x6cde9487, 0xf87b52b7, 0xd373ab23, 0x024b72e2, 0x8f1fe357,
+            0xab55662a, 0x28ebb207, 0xc2b52f03, 0x7bc5869a, 0x0837d3a5,
+            0x872830f2, 0xa5bf23b2, 0x6a0302ba, 0x8216ed5c, 0x1ccf8a2b,
+            0xb479a792, 0xf207f3f0, 0xe2694ea1, 0xf4da65cd, 0xbe0506d5,
+            0x6234d11f, 0xfea6c48a, 0x532e349d, 0x55f3a2a0, 0xe18a0532,
+            0xebf6a475, 0xec830b39, 0xef6040aa, 0x9f715e06, 0x106ebd51,
+            0x8a213ef9, 0x06dd963d, 0x053eddae, 0xbde64d46, 0x8d5491b5,
+            0x5dc47105, 0xd406046f, 0x155060ff, 0xfb981924, 0xe9bdd697,
+            0x434089cc, 0x9ed96777, 0x42e8b0bd, 0x8b890788, 0x5b19e738,
+            0xeec879db, 0x0a7ca147, 0x0f427ce9, 0x1e84f8c9, 0x00000000,
+            0x86800983, 0xed2b3248, 0x70111eac, 0x725a6c4e, 0xff0efdfb,
+            0x38850f56, 0xd5ae3d1e, 0x392d3627, 0xd90f0a64, 0xa65c6821,
+            0x545b9bd1, 0x2e36243a, 0x670a0cb1, 0xe757930f, 0x96eeb4d2,
+            0x919b1b9e, 0xc5c0804f, 0x20dc61a2, 0x4b775a69, 0x1a121c16,
+            0xba93e20a, 0x2aa0c0e5, 0xe0223c43, 0x171b121d, 0x0d090e0b,
+            0xc78bf2ad, 0xa8b62db9, 0xa91e14c8, 0x19f15785, 0x0775af4c,
+            0xdd99eebb, 0x607fa3fd, 0x2601f79f, 0xf5725cbc, 0x3b6644c5,
+            0x7efb5b34, 0x29438b76, 0xc623cbdc, 0xfcedb668, 0xf1e4b863,
+            0xdc31d7ca, 0x85634210, 0x22971340, 0x11c68420, 0x244a857d,
+            0x3dbbd2f8, 0x32f9ae11, 0xa129c76d, 0x2f9e1d4b, 0x30b2dcf3,
+            0x52860dec, 0xe3c177d0, 0x16b32b6c, 0xb970a999, 0x489411fa,
+            0x64e94722, 0x8cfca8c4, 0x3ff0a01a, 0x2c7d56d8, 0x903322ef,
+            0x4e4987c7, 0xd138d9c1, 0xa2ca8cfe, 0x0bd49836, 0x81f5a6cf,
+            0xde7aa528, 0x8eb7da26, 0xbfad3fa4, 0x9d3a2ce4, 0x9278500d,
+            0xcc5f6a9b, 0x467e5462, 0x138df6c2, 0xb8d890e8, 0xf7392e5e,
+            0xafc382f5, 0x805d9fbe, 0x93d0697c, 0x2dd56fa9, 0x1225cfb3,
+            0x99acc83b, 0x7d1810a7, 0x639ce86e, 0xbb3bdb7b, 0x7826cd09,
+            0x18596ef4, 0xb79aec01, 0x9a4f83a8, 0x6e95e665, 0xe6ffaa7e,
+            0xcfbc2108, 0xe815efe6, 0x9be7bad9, 0x366f4ace, 0x099fead4,
+            0x7cb029d6, 0xb2a431af, 0x233f2a31, 0x94a5c630, 0x66a235c0,
+            0xbc4e7437, 0xca82fca6, 0xd090e0b0, 0xd8a73315, 0x9804f14a,
+            0xdaec41f7, 0x50cd7f0e, 0xf691172f, 0xd64d768d, 0xb0ef434d,
+            0x4daacc54, 0x0496e4df, 0xb5d19ee3, 0x886a4c1b, 0x1f2cc1b8,
+            0x5165467f, 0xea5e9d04, 0x358c015d, 0x7487fa73, 0x410bfb2e,
+            0x1d67b35a, 0xd2db9252, 0x5610e933, 0x47d66d13, 0x61d79a8c,
+            0x0ca1377a, 0x14f8598e, 0x3c13eb89, 0x27a9ceee, 0xc961b735,
+            0xe51ce1ed, 0xb1477a3c, 0xdfd29c59, 0x73f2553f, 0xce141879,
+            0x37c773bf, 0xcdf753ea, 0xaafd5f5b, 0x6f3ddf14, 0xdb447886,
+            0xf3afca81, 0xc468b93e, 0x3424382c, 0x40a3c25f, 0xc31d1672,
+            0x25e2bc0c, 0x493c288b, 0x950dff41, 0x01a83971, 0xb30c08de,
+            0xe4b4d89c, 0xc1566490, 0x84cb7b61, 0xb632d570, 0x5c6c4874,
+            0x57b8d042
+        };
 
         private static readonly uint[] Tinv2 =
-		{
-			0xf45150a7, 0x417e5365, 0x171ac3a4, 0x273a965e, 0xab3bcb6b,
-			0x9d1ff145, 0xfaacab58, 0xe34b9303, 0x302055fa, 0x76adf66d,
-			0xcc889176, 0x02f5254c, 0xe54ffcd7, 0x2ac5d7cb, 0x35268044,
-			0x62b58fa3, 0xb1de495a, 0xba25671b, 0xea45980e, 0xfe5de1c0,
-			0x2fc30275, 0x4c8112f0, 0x468da397, 0xd36bc6f9, 0x8f03e75f,
-			0x9215959c, 0x6dbfeb7a, 0x5295da59, 0xbed42d83, 0x7458d321,
-			0xe0492969, 0xc98e44c8, 0xc2756a89, 0x8ef47879, 0x58996b3e,
-			0xb927dd71, 0xe1beb64f, 0x88f017ad, 0x20c966ac, 0xce7db43a,
-			0xdf63184a, 0x1ae58231, 0x51976033, 0x5362457f, 0x64b1e077,
-			0x6bbb84ae, 0x81fe1ca0, 0x08f9942b, 0x48705868, 0x458f19fd,
-			0xde94876c, 0x7b52b7f8, 0x73ab23d3, 0x4b72e202, 0x1fe3578f,
-			0x55662aab, 0xebb20728, 0xb52f03c2, 0xc5869a7b, 0x37d3a508,
-			0x2830f287, 0xbf23b2a5, 0x0302ba6a, 0x16ed5c82, 0xcf8a2b1c,
-			0x79a792b4, 0x07f3f0f2, 0x694ea1e2, 0xda65cdf4, 0x0506d5be,
-			0x34d11f62, 0xa6c48afe, 0x2e349d53, 0xf3a2a055, 0x8a0532e1,
-			0xf6a475eb, 0x830b39ec, 0x6040aaef, 0x715e069f, 0x6ebd5110,
-			0x213ef98a, 0xdd963d06, 0x3eddae05, 0xe64d46bd, 0x5491b58d,
-			0xc471055d, 0x06046fd4, 0x5060ff15, 0x981924fb, 0xbdd697e9,
-			0x4089cc43, 0xd967779e, 0xe8b0bd42, 0x8907888b, 0x19e7385b,
-			0xc879dbee, 0x7ca1470a, 0x427ce90f, 0x84f8c91e, 0x00000000,
-			0x80098386, 0x2b3248ed, 0x111eac70, 0x5a6c4e72, 0x0efdfbff,
-			0x850f5638, 0xae3d1ed5, 0x2d362739, 0x0f0a64d9, 0x5c6821a6,
-			0x5b9bd154, 0x36243a2e, 0x0a0cb167, 0x57930fe7, 0xeeb4d296,
-			0x9b1b9e91, 0xc0804fc5, 0xdc61a220, 0x775a694b, 0x121c161a,
-			0x93e20aba, 0xa0c0e52a, 0x223c43e0, 0x1b121d17, 0x090e0b0d,
-			0x8bf2adc7, 0xb62db9a8, 0x1e14c8a9, 0xf1578519, 0x75af4c07,
-			0x99eebbdd, 0x7fa3fd60, 0x01f79f26, 0x725cbcf5, 0x6644c53b,
-			0xfb5b347e, 0x438b7629, 0x23cbdcc6, 0xedb668fc, 0xe4b863f1,
-			0x31d7cadc, 0x63421085, 0x97134022, 0xc6842011, 0x4a857d24,
-			0xbbd2f83d, 0xf9ae1132, 0x29c76da1, 0x9e1d4b2f, 0xb2dcf330,
-			0x860dec52, 0xc177d0e3, 0xb32b6c16, 0x70a999b9, 0x9411fa48,
-			0xe9472264, 0xfca8c48c, 0xf0a01a3f, 0x7d56d82c, 0x3322ef90,
-			0x4987c74e, 0x38d9c1d1, 0xca8cfea2, 0xd498360b, 0xf5a6cf81,
-			0x7aa528de, 0xb7da268e, 0xad3fa4bf, 0x3a2ce49d, 0x78500d92,
-			0x5f6a9bcc, 0x7e546246, 0x8df6c213, 0xd890e8b8, 0x392e5ef7,
-			0xc382f5af, 0x5d9fbe80, 0xd0697c93, 0xd56fa92d, 0x25cfb312,
-			0xacc83b99, 0x1810a77d, 0x9ce86e63, 0x3bdb7bbb, 0x26cd0978,
-			0x596ef418, 0x9aec01b7, 0x4f83a89a, 0x95e6656e, 0xffaa7ee6,
-			0xbc2108cf, 0x15efe6e8, 0xe7bad99b, 0x6f4ace36, 0x9fead409,
-			0xb029d67c, 0xa431afb2, 0x3f2a3123, 0xa5c63094, 0xa235c066,
-			0x4e7437bc, 0x82fca6ca, 0x90e0b0d0, 0xa73315d8, 0x04f14a98,
-			0xec41f7da, 0xcd7f0e50, 0x91172ff6, 0x4d768dd6, 0xef434db0,
-			0xaacc544d, 0x96e4df04, 0xd19ee3b5, 0x6a4c1b88, 0x2cc1b81f,
-			0x65467f51, 0x5e9d04ea, 0x8c015d35, 0x87fa7374, 0x0bfb2e41,
-			0x67b35a1d, 0xdb9252d2, 0x10e93356, 0xd66d1347, 0xd79a8c61,
-			0xa1377a0c, 0xf8598e14, 0x13eb893c, 0xa9ceee27, 0x61b735c9,
-			0x1ce1ede5, 0x477a3cb1, 0xd29c59df, 0xf2553f73, 0x141879ce,
-			0xc773bf37, 0xf753eacd, 0xfd5f5baa, 0x3ddf146f, 0x447886db,
-			0xafca81f3, 0x68b93ec4, 0x24382c34, 0xa3c25f40, 0x1d1672c3,
-			0xe2bc0c25, 0x3c288b49, 0x0dff4195, 0xa8397101, 0x0c08deb3,
-			0xb4d89ce4, 0x566490c1, 0xcb7b6184, 0x32d570b6, 0x6c48745c,
-			0xb8d04257
-		};
+        {
+            0xf45150a7, 0x417e5365, 0x171ac3a4, 0x273a965e, 0xab3bcb6b,
+            0x9d1ff145, 0xfaacab58, 0xe34b9303, 0x302055fa, 0x76adf66d,
+            0xcc889176, 0x02f5254c, 0xe54ffcd7, 0x2ac5d7cb, 0x35268044,
+            0x62b58fa3, 0xb1de495a, 0xba25671b, 0xea45980e, 0xfe5de1c0,
+            0x2fc30275, 0x4c8112f0, 0x468da397, 0xd36bc6f9, 0x8f03e75f,
+            0x9215959c, 0x6dbfeb7a, 0x5295da59, 0xbed42d83, 0x7458d321,
+            0xe0492969, 0xc98e44c8, 0xc2756a89, 0x8ef47879, 0x58996b3e,
+            0xb927dd71, 0xe1beb64f, 0x88f017ad, 0x20c966ac, 0xce7db43a,
+            0xdf63184a, 0x1ae58231, 0x51976033, 0x5362457f, 0x64b1e077,
+            0x6bbb84ae, 0x81fe1ca0, 0x08f9942b, 0x48705868, 0x458f19fd,
+            0xde94876c, 0x7b52b7f8, 0x73ab23d3, 0x4b72e202, 0x1fe3578f,
+            0x55662aab, 0xebb20728, 0xb52f03c2, 0xc5869a7b, 0x37d3a508,
+            0x2830f287, 0xbf23b2a5, 0x0302ba6a, 0x16ed5c82, 0xcf8a2b1c,
+            0x79a792b4, 0x07f3f0f2, 0x694ea1e2, 0xda65cdf4, 0x0506d5be,
+            0x34d11f62, 0xa6c48afe, 0x2e349d53, 0xf3a2a055, 0x8a0532e1,
+            0xf6a475eb, 0x830b39ec, 0x6040aaef, 0x715e069f, 0x6ebd5110,
+            0x213ef98a, 0xdd963d06, 0x3eddae05, 0xe64d46bd, 0x5491b58d,
+            0xc471055d, 0x06046fd4, 0x5060ff15, 0x981924fb, 0xbdd697e9,
+            0x4089cc43, 0xd967779e, 0xe8b0bd42, 0x8907888b, 0x19e7385b,
+            0xc879dbee, 0x7ca1470a, 0x427ce90f, 0x84f8c91e, 0x00000000,
+            0x80098386, 0x2b3248ed, 0x111eac70, 0x5a6c4e72, 0x0efdfbff,
+            0x850f5638, 0xae3d1ed5, 0x2d362739, 0x0f0a64d9, 0x5c6821a6,
+            0x5b9bd154, 0x36243a2e, 0x0a0cb167, 0x57930fe7, 0xeeb4d296,
+            0x9b1b9e91, 0xc0804fc5, 0xdc61a220, 0x775a694b, 0x121c161a,
+            0x93e20aba, 0xa0c0e52a, 0x223c43e0, 0x1b121d17, 0x090e0b0d,
+            0x8bf2adc7, 0xb62db9a8, 0x1e14c8a9, 0xf1578519, 0x75af4c07,
+            0x99eebbdd, 0x7fa3fd60, 0x01f79f26, 0x725cbcf5, 0x6644c53b,
+            0xfb5b347e, 0x438b7629, 0x23cbdcc6, 0xedb668fc, 0xe4b863f1,
+            0x31d7cadc, 0x63421085, 0x97134022, 0xc6842011, 0x4a857d24,
+            0xbbd2f83d, 0xf9ae1132, 0x29c76da1, 0x9e1d4b2f, 0xb2dcf330,
+            0x860dec52, 0xc177d0e3, 0xb32b6c16, 0x70a999b9, 0x9411fa48,
+            0xe9472264, 0xfca8c48c, 0xf0a01a3f, 0x7d56d82c, 0x3322ef90,
+            0x4987c74e, 0x38d9c1d1, 0xca8cfea2, 0xd498360b, 0xf5a6cf81,
+            0x7aa528de, 0xb7da268e, 0xad3fa4bf, 0x3a2ce49d, 0x78500d92,
+            0x5f6a9bcc, 0x7e546246, 0x8df6c213, 0xd890e8b8, 0x392e5ef7,
+            0xc382f5af, 0x5d9fbe80, 0xd0697c93, 0xd56fa92d, 0x25cfb312,
+            0xacc83b99, 0x1810a77d, 0x9ce86e63, 0x3bdb7bbb, 0x26cd0978,
+            0x596ef418, 0x9aec01b7, 0x4f83a89a, 0x95e6656e, 0xffaa7ee6,
+            0xbc2108cf, 0x15efe6e8, 0xe7bad99b, 0x6f4ace36, 0x9fead409,
+            0xb029d67c, 0xa431afb2, 0x3f2a3123, 0xa5c63094, 0xa235c066,
+            0x4e7437bc, 0x82fca6ca, 0x90e0b0d0, 0xa73315d8, 0x04f14a98,
+            0xec41f7da, 0xcd7f0e50, 0x91172ff6, 0x4d768dd6, 0xef434db0,
+            0xaacc544d, 0x96e4df04, 0xd19ee3b5, 0x6a4c1b88, 0x2cc1b81f,
+            0x65467f51, 0x5e9d04ea, 0x8c015d35, 0x87fa7374, 0x0bfb2e41,
+            0x67b35a1d, 0xdb9252d2, 0x10e93356, 0xd66d1347, 0xd79a8c61,
+            0xa1377a0c, 0xf8598e14, 0x13eb893c, 0xa9ceee27, 0x61b735c9,
+            0x1ce1ede5, 0x477a3cb1, 0xd29c59df, 0xf2553f73, 0x141879ce,
+            0xc773bf37, 0xf753eacd, 0xfd5f5baa, 0x3ddf146f, 0x447886db,
+            0xafca81f3, 0x68b93ec4, 0x24382c34, 0xa3c25f40, 0x1d1672c3,
+            0xe2bc0c25, 0x3c288b49, 0x0dff4195, 0xa8397101, 0x0c08deb3,
+            0xb4d89ce4, 0x566490c1, 0xcb7b6184, 0x32d570b6, 0x6c48745c,
+            0xb8d04257
+        };
 
         private static readonly uint[] Tinv3 =
-		{
-			0x5150a7f4, 0x7e536541, 0x1ac3a417, 0x3a965e27, 0x3bcb6bab,
-			0x1ff1459d, 0xacab58fa, 0x4b9303e3, 0x2055fa30, 0xadf66d76,
-			0x889176cc, 0xf5254c02, 0x4ffcd7e5, 0xc5d7cb2a, 0x26804435,
-			0xb58fa362, 0xde495ab1, 0x25671bba, 0x45980eea, 0x5de1c0fe,
-			0xc302752f, 0x8112f04c, 0x8da39746, 0x6bc6f9d3, 0x03e75f8f,
-			0x15959c92, 0xbfeb7a6d, 0x95da5952, 0xd42d83be, 0x58d32174,
-			0x492969e0, 0x8e44c8c9, 0x756a89c2, 0xf478798e, 0x996b3e58,
-			0x27dd71b9, 0xbeb64fe1, 0xf017ad88, 0xc966ac20, 0x7db43ace,
-			0x63184adf, 0xe582311a, 0x97603351, 0x62457f53, 0xb1e07764,
-			0xbb84ae6b, 0xfe1ca081, 0xf9942b08, 0x70586848, 0x8f19fd45,
-			0x94876cde, 0x52b7f87b, 0xab23d373, 0x72e2024b, 0xe3578f1f,
-			0x662aab55, 0xb20728eb, 0x2f03c2b5, 0x869a7bc5, 0xd3a50837,
-			0x30f28728, 0x23b2a5bf, 0x02ba6a03, 0xed5c8216, 0x8a2b1ccf,
-			0xa792b479, 0xf3f0f207, 0x4ea1e269, 0x65cdf4da, 0x06d5be05,
-			0xd11f6234, 0xc48afea6, 0x349d532e, 0xa2a055f3, 0x0532e18a,
-			0xa475ebf6, 0x0b39ec83, 0x40aaef60, 0x5e069f71, 0xbd51106e,
-			0x3ef98a21, 0x963d06dd, 0xddae053e, 0x4d46bde6, 0x91b58d54,
-			0x71055dc4, 0x046fd406, 0x60ff1550, 0x1924fb98, 0xd697e9bd,
-			0x89cc4340, 0x67779ed9, 0xb0bd42e8, 0x07888b89, 0xe7385b19,
-			0x79dbeec8, 0xa1470a7c, 0x7ce90f42, 0xf8c91e84, 0x00000000,
-			0x09838680, 0x3248ed2b, 0x1eac7011, 0x6c4e725a, 0xfdfbff0e,
-			0x0f563885, 0x3d1ed5ae, 0x3627392d, 0x0a64d90f, 0x6821a65c,
-			0x9bd1545b, 0x243a2e36, 0x0cb1670a, 0x930fe757, 0xb4d296ee,
-			0x1b9e919b, 0x804fc5c0, 0x61a220dc, 0x5a694b77, 0x1c161a12,
-			0xe20aba93, 0xc0e52aa0, 0x3c43e022, 0x121d171b, 0x0e0b0d09,
-			0xf2adc78b, 0x2db9a8b6, 0x14c8a91e, 0x578519f1, 0xaf4c0775,
-			0xeebbdd99, 0xa3fd607f, 0xf79f2601, 0x5cbcf572, 0x44c53b66,
-			0x5b347efb, 0x8b762943, 0xcbdcc623, 0xb668fced, 0xb863f1e4,
-			0xd7cadc31, 0x42108563, 0x13402297, 0x842011c6, 0x857d244a,
-			0xd2f83dbb, 0xae1132f9, 0xc76da129, 0x1d4b2f9e, 0xdcf330b2,
-			0x0dec5286, 0x77d0e3c1, 0x2b6c16b3, 0xa999b970, 0x11fa4894,
-			0x472264e9, 0xa8c48cfc, 0xa01a3ff0, 0x56d82c7d, 0x22ef9033,
-			0x87c74e49, 0xd9c1d138, 0x8cfea2ca, 0x98360bd4, 0xa6cf81f5,
-			0xa528de7a, 0xda268eb7, 0x3fa4bfad, 0x2ce49d3a, 0x500d9278,
-			0x6a9bcc5f, 0x5462467e, 0xf6c2138d, 0x90e8b8d8, 0x2e5ef739,
-			0x82f5afc3, 0x9fbe805d, 0x697c93d0, 0x6fa92dd5, 0xcfb31225,
-			0xc83b99ac, 0x10a77d18, 0xe86e639c, 0xdb7bbb3b, 0xcd097826,
-			0x6ef41859, 0xec01b79a, 0x83a89a4f, 0xe6656e95, 0xaa7ee6ff,
-			0x2108cfbc, 0xefe6e815, 0xbad99be7, 0x4ace366f, 0xead4099f,
-			0x29d67cb0, 0x31afb2a4, 0x2a31233f, 0xc63094a5, 0x35c066a2,
-			0x7437bc4e, 0xfca6ca82, 0xe0b0d090, 0x3315d8a7, 0xf14a9804,
-			0x41f7daec, 0x7f0e50cd, 0x172ff691, 0x768dd64d, 0x434db0ef,
-			0xcc544daa, 0xe4df0496, 0x9ee3b5d1, 0x4c1b886a, 0xc1b81f2c,
-			0x467f5165, 0x9d04ea5e, 0x015d358c, 0xfa737487, 0xfb2e410b,
-			0xb35a1d67, 0x9252d2db, 0xe9335610, 0x6d1347d6, 0x9a8c61d7,
-			0x377a0ca1, 0x598e14f8, 0xeb893c13, 0xceee27a9, 0xb735c961,
-			0xe1ede51c, 0x7a3cb147, 0x9c59dfd2, 0x553f73f2, 0x1879ce14,
-			0x73bf37c7, 0x53eacdf7, 0x5f5baafd, 0xdf146f3d, 0x7886db44,
-			0xca81f3af, 0xb93ec468, 0x382c3424, 0xc25f40a3, 0x1672c31d,
-			0xbc0c25e2, 0x288b493c, 0xff41950d, 0x397101a8, 0x08deb30c,
-			0xd89ce4b4, 0x6490c156, 0x7b6184cb, 0xd570b632, 0x48745c6c,
-			0xd04257b8
-		};
+        {
+            0x5150a7f4, 0x7e536541, 0x1ac3a417, 0x3a965e27, 0x3bcb6bab,
+            0x1ff1459d, 0xacab58fa, 0x4b9303e3, 0x2055fa30, 0xadf66d76,
+            0x889176cc, 0xf5254c02, 0x4ffcd7e5, 0xc5d7cb2a, 0x26804435,
+            0xb58fa362, 0xde495ab1, 0x25671bba, 0x45980eea, 0x5de1c0fe,
+            0xc302752f, 0x8112f04c, 0x8da39746, 0x6bc6f9d3, 0x03e75f8f,
+            0x15959c92, 0xbfeb7a6d, 0x95da5952, 0xd42d83be, 0x58d32174,
+            0x492969e0, 0x8e44c8c9, 0x756a89c2, 0xf478798e, 0x996b3e58,
+            0x27dd71b9, 0xbeb64fe1, 0xf017ad88, 0xc966ac20, 0x7db43ace,
+            0x63184adf, 0xe582311a, 0x97603351, 0x62457f53, 0xb1e07764,
+            0xbb84ae6b, 0xfe1ca081, 0xf9942b08, 0x70586848, 0x8f19fd45,
+            0x94876cde, 0x52b7f87b, 0xab23d373, 0x72e2024b, 0xe3578f1f,
+            0x662aab55, 0xb20728eb, 0x2f03c2b5, 0x869a7bc5, 0xd3a50837,
+            0x30f28728, 0x23b2a5bf, 0x02ba6a03, 0xed5c8216, 0x8a2b1ccf,
+            0xa792b479, 0xf3f0f207, 0x4ea1e269, 0x65cdf4da, 0x06d5be05,
+            0xd11f6234, 0xc48afea6, 0x349d532e, 0xa2a055f3, 0x0532e18a,
+            0xa475ebf6, 0x0b39ec83, 0x40aaef60, 0x5e069f71, 0xbd51106e,
+            0x3ef98a21, 0x963d06dd, 0xddae053e, 0x4d46bde6, 0x91b58d54,
+            0x71055dc4, 0x046fd406, 0x60ff1550, 0x1924fb98, 0xd697e9bd,
+            0x89cc4340, 0x67779ed9, 0xb0bd42e8, 0x07888b89, 0xe7385b19,
+            0x79dbeec8, 0xa1470a7c, 0x7ce90f42, 0xf8c91e84, 0x00000000,
+            0x09838680, 0x3248ed2b, 0x1eac7011, 0x6c4e725a, 0xfdfbff0e,
+            0x0f563885, 0x3d1ed5ae, 0x3627392d, 0x0a64d90f, 0x6821a65c,
+            0x9bd1545b, 0x243a2e36, 0x0cb1670a, 0x930fe757, 0xb4d296ee,
+            0x1b9e919b, 0x804fc5c0, 0x61a220dc, 0x5a694b77, 0x1c161a12,
+            0xe20aba93, 0xc0e52aa0, 0x3c43e022, 0x121d171b, 0x0e0b0d09,
+            0xf2adc78b, 0x2db9a8b6, 0x14c8a91e, 0x578519f1, 0xaf4c0775,
+            0xeebbdd99, 0xa3fd607f, 0xf79f2601, 0x5cbcf572, 0x44c53b66,
+            0x5b347efb, 0x8b762943, 0xcbdcc623, 0xb668fced, 0xb863f1e4,
+            0xd7cadc31, 0x42108563, 0x13402297, 0x842011c6, 0x857d244a,
+            0xd2f83dbb, 0xae1132f9, 0xc76da129, 0x1d4b2f9e, 0xdcf330b2,
+            0x0dec5286, 0x77d0e3c1, 0x2b6c16b3, 0xa999b970, 0x11fa4894,
+            0x472264e9, 0xa8c48cfc, 0xa01a3ff0, 0x56d82c7d, 0x22ef9033,
+            0x87c74e49, 0xd9c1d138, 0x8cfea2ca, 0x98360bd4, 0xa6cf81f5,
+            0xa528de7a, 0xda268eb7, 0x3fa4bfad, 0x2ce49d3a, 0x500d9278,
+            0x6a9bcc5f, 0x5462467e, 0xf6c2138d, 0x90e8b8d8, 0x2e5ef739,
+            0x82f5afc3, 0x9fbe805d, 0x697c93d0, 0x6fa92dd5, 0xcfb31225,
+            0xc83b99ac, 0x10a77d18, 0xe86e639c, 0xdb7bbb3b, 0xcd097826,
+            0x6ef41859, 0xec01b79a, 0x83a89a4f, 0xe6656e95, 0xaa7ee6ff,
+            0x2108cfbc, 0xefe6e815, 0xbad99be7, 0x4ace366f, 0xead4099f,
+            0x29d67cb0, 0x31afb2a4, 0x2a31233f, 0xc63094a5, 0x35c066a2,
+            0x7437bc4e, 0xfca6ca82, 0xe0b0d090, 0x3315d8a7, 0xf14a9804,
+            0x41f7daec, 0x7f0e50cd, 0x172ff691, 0x768dd64d, 0x434db0ef,
+            0xcc544daa, 0xe4df0496, 0x9ee3b5d1, 0x4c1b886a, 0xc1b81f2c,
+            0x467f5165, 0x9d04ea5e, 0x015d358c, 0xfa737487, 0xfb2e410b,
+            0xb35a1d67, 0x9252d2db, 0xe9335610, 0x6d1347d6, 0x9a8c61d7,
+            0x377a0ca1, 0x598e14f8, 0xeb893c13, 0xceee27a9, 0xb735c961,
+            0xe1ede51c, 0x7a3cb147, 0x9c59dfd2, 0x553f73f2, 0x1879ce14,
+            0x73bf37c7, 0x53eacdf7, 0x5f5baafd, 0xdf146f3d, 0x7886db44,
+            0xca81f3af, 0xb93ec468, 0x382c3424, 0xc25f40a3, 0x1672c31d,
+            0xbc0c25e2, 0x288b493c, 0xff41950d, 0x397101a8, 0x08deb30c,
+            0xd89ce4b4, 0x6490c156, 0x7b6184cb, 0xd570b632, 0x48745c6c,
+            0xd04257b8
+        };
 
         #endregion
 
@@ -670,7 +671,7 @@ private uint[] GenerateWorkingKey(bool isEncryption, byte[] key)
                 throw new ArgumentException("Key length not 128/192/256 bits.");
 
             _rounds = KC + 6;  // This is not always true for the generalized Rijndael that allows larger block sizes
-            uint[] W = new uint[(_rounds + 1) *  4];   // 4 words in a block
+            uint[] W = new uint[(_rounds + 1) * 4];   // 4 words in a block
 
             //
             // copy the key into the round key array
@@ -680,7 +681,7 @@ private uint[] GenerateWorkingKey(bool isEncryption, byte[] key)
 
             for (int i = 0; i < key.Length; t++)
             {
-                W[(t >> 2) * 4 + (t & 3)] = LittleEndianToUInt32(key, i);
+                W[(t >> 2) * 4 + (t & 3)] = Pack.LittleEndianToUInt32(key, i);
                 i += 4;
             }
 
@@ -748,18 +749,18 @@ private static uint SubWord(uint x)
 
         private void UnPackBlock(byte[] bytes, int off)
         {
-            C0 = LittleEndianToUInt32(bytes, off);
-            C1 = LittleEndianToUInt32(bytes, off + 4);
-            C2 = LittleEndianToUInt32(bytes, off + 8);
-            C3 = LittleEndianToUInt32(bytes, off + 12);
+            C0 = Pack.LittleEndianToUInt32(bytes, off);
+            C1 = Pack.LittleEndianToUInt32(bytes, off + 4);
+            C2 = Pack.LittleEndianToUInt32(bytes, off + 8);
+            C3 = Pack.LittleEndianToUInt32(bytes, off + 12);
         }
 
         private void PackBlock(byte[] bytes, int off)
         {
-            UInt32ToLittleEndian(C0, bytes, off);
-            UInt32ToLittleEndian(C1, bytes, off + 4);
-            UInt32ToLittleEndian(C2, bytes, off + 8);
-            UInt32ToLittleEndian(C3, bytes, off + 12);
+            Pack.UInt32ToLittleEndian(C0, bytes, off);
+            Pack.UInt32ToLittleEndian(C1, bytes, off + 4);
+            Pack.UInt32ToLittleEndian(C2, bytes, off + 8);
+            Pack.UInt32ToLittleEndian(C3, bytes, off + 12);
         }
 
         private void EncryptBlock(uint[] KW)
@@ -772,7 +773,7 @@ private void EncryptBlock(uint[] KW)
             C2 ^= KW[0 * 4 + 2];
             C3 ^= KW[0 * 4 + 3];
 
-            for (r = 1; r < _rounds - 1; )
+            for (r = 1; r < _rounds - 1;)
             {
                 r0 = T0[C0 & 255] ^ T1[(C1 >> 8) & 255] ^ T2[(C2 >> 16) & 255] ^ T3[C3 >> 24] ^ KW[r * 4 + 0];
                 r1 = T0[C1 & 255] ^ T1[(C2 >> 8) & 255] ^ T2[(C3 >> 16) & 255] ^ T3[C0 >> 24] ^ KW[r * 4 + 1];
@@ -807,7 +808,7 @@ private void DecryptBlock(uint[] KW)
             C2 ^= KW[_rounds * 4 + 2];
             C3 ^= KW[_rounds * 4 + 3];
 
-            for (r = _rounds - 1; r > 1; )
+            for (r = _rounds - 1; r > 1;)
             {
                 r0 = Tinv0[C0 & 255] ^ Tinv1[(C3 >> 8) & 255] ^ Tinv2[(C2 >> 16) & 255] ^ Tinv3[C1 >> 24] ^ KW[r * 4 + 0];
                 r1 = Tinv0[C1 & 255] ^ Tinv1[(C0 >> 8) & 255] ^ Tinv2[(C3 >> 16) & 255] ^ Tinv3[C2 >> 24] ^ KW[r * 4 + 1];
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/BlowfishCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/BlowfishCipher.cs
index 973f8ee35..d68d39886 100644
--- a/src/Renci.SshNet/Security/Cryptography/Ciphers/BlowfishCipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Ciphers/BlowfishCipher.cs
@@ -1,4 +1,5 @@
 using System;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
 {
@@ -349,8 +350,8 @@ public override int EncryptBlock(byte[] inputBuffer, int inputOffset, int inputC
             if (inputCount != BlockSize)
                 throw new ArgumentException("inputCount");
 
-            uint xl = BigEndianToUInt32(inputBuffer, inputOffset);
-            uint xr = BigEndianToUInt32(inputBuffer, inputOffset + 4);
+            uint xl = Pack.BigEndianToUInt32(inputBuffer, inputOffset);
+            uint xr = Pack.BigEndianToUInt32(inputBuffer, inputOffset + 4);
 
             xl ^= _p[0];
 
@@ -362,8 +363,8 @@ public override int EncryptBlock(byte[] inputBuffer, int inputOffset, int inputC
 
             xr ^= _p[Rounds + 1];
 
-            UInt32ToBigEndian(xr, outputBuffer, outputOffset);
-            UInt32ToBigEndian(xl, outputBuffer, outputOffset + 4);
+            Pack.UInt32ToBigEndian(xr, outputBuffer, outputOffset);
+            Pack.UInt32ToBigEndian(xl, outputBuffer, outputOffset + 4);
 
             return BlockSize;
         }
@@ -384,12 +385,12 @@ public override int DecryptBlock(byte[] inputBuffer, int inputOffset, int inputC
             if (inputCount != BlockSize)
                 throw new ArgumentException("inputCount");
 
-            uint xl = BigEndianToUInt32(inputBuffer, inputOffset);
-            uint xr = BigEndianToUInt32(inputBuffer, inputOffset + 4);
+            var xl = Pack.BigEndianToUInt32(inputBuffer, inputOffset);
+            var xr = Pack.BigEndianToUInt32(inputBuffer, inputOffset + 4);
 
             xl ^= _p[Rounds + 1];
 
-            for (int i = Rounds; i > 0; i -= 2)
+            for (var i = Rounds; i > 0; i -= 2)
             {
                 xr ^= F(xl) ^ _p[i];
                 xl ^= F(xr) ^ _p[i - 1];
@@ -397,8 +398,8 @@ public override int DecryptBlock(byte[] inputBuffer, int inputOffset, int inputC
 
             xr ^= _p[0];
 
-            UInt32ToBigEndian(xr, outputBuffer, outputOffset);
-            UInt32ToBigEndian(xl, outputBuffer, outputOffset + 4);
+            Pack.UInt32ToBigEndian(xr, outputBuffer, outputOffset);
+            Pack.UInt32ToBigEndian(xl, outputBuffer, outputOffset + 4);
 
             return BlockSize;
         }
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/CastCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/CastCipher.cs
index 67000e4f7..81bb13f20 100644
--- a/src/Renci.SshNet/Security/Cryptography/Ciphers/CastCipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Ciphers/CastCipher.cs
@@ -1,4 +1,5 @@
 using System;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
 {
@@ -59,15 +60,15 @@ public override int EncryptBlock(byte[] inputBuffer, int inputOffset, int inputC
             // batch the units up into a 32 bit chunk and go for it
             // the array is in bytes, the increment is 8x8 bits = 64
 
-            uint L0 = BigEndianToUInt32(inputBuffer, inputOffset);
-            uint R0 = BigEndianToUInt32(inputBuffer, inputOffset + 4);
+            var L0 = Pack.BigEndianToUInt32(inputBuffer, inputOffset);
+            var R0 = Pack.BigEndianToUInt32(inputBuffer, inputOffset + 4);
 
-            uint[] result = new uint[2];
+            var result = new uint[2];
             CastEncipher(L0, R0, result);
 
             // now stuff them into the destination block
-            UInt32ToBigEndian(result[0], outputBuffer, outputOffset);
-            UInt32ToBigEndian(result[1], outputBuffer, outputOffset + 4);
+            Pack.UInt32ToBigEndian(result[0], outputBuffer, outputOffset);
+            Pack.UInt32ToBigEndian(result[1], outputBuffer, outputOffset + 4);
 
             return BlockSize;
         }
@@ -88,15 +89,15 @@ public override int DecryptBlock(byte[] inputBuffer, int inputOffset, int inputC
             // process the input block
             // batch the units up into a 32 bit chunk and go for it
             // the array is in bytes, the increment is 8x8 bits = 64
-            uint L16 = BigEndianToUInt32(inputBuffer, inputOffset);
-            uint R16 = BigEndianToUInt32(inputBuffer, inputOffset + 4);
+            var L16 = Pack.BigEndianToUInt32(inputBuffer, inputOffset);
+            var R16 = Pack.BigEndianToUInt32(inputBuffer, inputOffset + 4);
 
-            uint[] result = new uint[2];
+            var result = new uint[2];
             CastDecipher(L16, R16, result);
 
             // now stuff them into the destination block
-            UInt32ToBigEndian(result[0], outputBuffer, outputOffset);
-            UInt32ToBigEndian(result[1], outputBuffer, outputOffset + 4);
+            Pack.UInt32ToBigEndian(result[0], outputBuffer, outputOffset);
+            Pack.UInt32ToBigEndian(result[1], outputBuffer, outputOffset + 4);
 
             return BlockSize;
         }
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/DesCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/DesCipher.cs
index 35408aef7..1f6a2aa95 100644
--- a/src/Renci.SshNet/Security/Cryptography/Ciphers/DesCipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Ciphers/DesCipher.cs
@@ -1,4 +1,5 @@
 using System;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
 {
@@ -13,44 +14,45 @@ public class DesCipher : BlockCipher
 
         #region Static tables
 
-        private static readonly short[] bytebit = {128, 64, 32, 16, 8, 4, 2, 1};
+        private static readonly short[] Bytebit = {128, 64, 32, 16, 8, 4, 2, 1};
 
-        private static readonly int[] bigbyte =
+        private static readonly int[] Bigbyte =
         {
-            0x800000,   0x400000,   0x200000,   0x100000,
-            0x80000,    0x40000,    0x20000,    0x10000,
-            0x8000,     0x4000,     0x2000,     0x1000,
-            0x800,      0x400,      0x200,      0x100,
-            0x80,       0x40,       0x20,       0x10,
-            0x8,        0x4,        0x2,        0x1
+            0x800000, 0x400000, 0x200000, 0x100000,
+            0x080000, 0x040000, 0x020000, 0x010000,
+            0x008000, 0x004000, 0x002000, 0x001000,
+            0x000800, 0x000400, 0x000200, 0x000100,
+            0x000080, 0x000040, 0x000020, 0x000010,
+            0x000008, 0x000004, 0x000002, 0x000001
         };
 
         /*
          * Use the key schedule specified in the Standard (ANSI X3.92-1981).
          */
-        private static readonly byte[] pc1 =
+
+        private static readonly byte[] Pc1 =
         {
-            56, 48, 40, 32, 24, 16,  8,   0, 57, 49, 41, 33, 25, 17,
-            9,  1, 58, 50, 42, 34, 26,  18, 10,  2, 59, 51, 43, 35,
-            62, 54, 46, 38, 30, 22, 14,   6, 61, 53, 45, 37, 29, 21,
-            13,  5, 60, 52, 44, 36, 28,  20, 12,  4, 27, 19, 11,  3
+            56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17,
+            9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35,
+            62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21,
+            13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3
         };
 
-        private static readonly byte[] totrot =
+        private static readonly byte[] Totrot =
         {
             1, 2, 4, 6, 8, 10, 12, 14,
             15, 17, 19, 21, 23, 25, 27, 28
         };
 
-        private static readonly byte[] pc2 =
+        private static readonly byte[] Pc2 =
         {
-            13, 16, 10, 23,  0,  4,  2, 27, 14,  5, 20,  9,
-            22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1,
+            13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9,
+            22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1,
             40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
             43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31
         };
 
-        private static readonly uint[] SP1 =
+        private static readonly uint[] Sp1 =
         {
             0x01010400, 0x00000000, 0x00010000, 0x01010404,
             0x01010004, 0x00010404, 0x00000004, 0x00010000,
@@ -70,7 +72,7 @@ public class DesCipher : BlockCipher
             0x00010004, 0x00010400, 0x00000000, 0x01010004
         };
 
-        private static readonly uint[] SP2 =
+        private static readonly uint[] Sp2 =
         {
             0x80108020, 0x80008000, 0x00008000, 0x00108020,
             0x00100000, 0x00000020, 0x80100020, 0x80008020,
@@ -90,7 +92,7 @@ public class DesCipher : BlockCipher
             0x80000000, 0x80100020, 0x80108020, 0x00108000
         };
 
-        private static readonly uint[] SP3 =
+        private static readonly uint[] Sp3 =
         {
             0x00000208, 0x08020200, 0x00000000, 0x08020008,
             0x08000200, 0x00000000, 0x00020208, 0x08000200,
@@ -110,7 +112,7 @@ public class DesCipher : BlockCipher
             0x00020208, 0x00000008, 0x08020008, 0x00020200
         };
 
-        private static readonly uint[] SP4 =
+        private static readonly uint[] Sp4 =
         {
             0x00802001, 0x00002081, 0x00002081, 0x00000080,
             0x00802080, 0x00800081, 0x00800001, 0x00002001,
@@ -130,7 +132,7 @@ public class DesCipher : BlockCipher
             0x00000080, 0x00800000, 0x00002000, 0x00802080
         };
 
-        private static readonly uint[] SP5 =
+        private static readonly uint[] Sp5 =
         {
             0x00000100, 0x02080100, 0x02080000, 0x42000100,
             0x00080000, 0x00000100, 0x40000000, 0x02080000,
@@ -150,7 +152,7 @@ public class DesCipher : BlockCipher
             0x00000000, 0x40080000, 0x02080100, 0x40000100
         };
 
-        private static readonly uint[] SP6 =
+        private static readonly uint[] Sp6 =
         {
             0x20000010, 0x20400000, 0x00004000, 0x20404010,
             0x20400000, 0x00000010, 0x20404010, 0x00400000,
@@ -170,7 +172,7 @@ public class DesCipher : BlockCipher
             0x20404000, 0x20000000, 0x00400010, 0x20004010
         };
 
-        private static readonly uint[] SP7 =
+        private static readonly uint[] Sp7 =
         {
             0x00200000, 0x04200002, 0x04000802, 0x00000000,
             0x00000800, 0x04000802, 0x00200802, 0x04200800,
@@ -190,7 +192,7 @@ public class DesCipher : BlockCipher
             0x04000002, 0x04000800, 0x00000800, 0x00200002
         };
 
-        private static readonly uint[] SP8 =
+        private static readonly uint[] Sp8 =
         {
             0x10001040, 0x00001000, 0x00040000, 0x10041040,
             0x10000000, 0x10001040, 0x00000040, 0x10000000,
@@ -298,9 +300,9 @@ protected int[] GenerateWorkingKey(bool encrypting, byte[] key)
 
             for (int j = 0; j < 56; j++)
             {
-                int l = pc1[j];
+                int l = Pc1[j];
 
-                pc1m[j] = ((key[(uint)l >> 3] & bytebit[l & 07]) != 0);
+                pc1m[j] = ((key[(uint)l >> 3] & Bytebit[l & 07]) != 0);
             }
 
             for (int i = 0; i < 16; i++)
@@ -321,7 +323,7 @@ protected int[] GenerateWorkingKey(bool encrypting, byte[] key)
 
                 for (int j = 0; j < 28; j++)
                 {
-                    l = j + totrot[i];
+                    l = j + Totrot[i];
                     if (l < 28)
                     {
                         pcr[j] = pc1m[l];
@@ -334,7 +336,7 @@ protected int[] GenerateWorkingKey(bool encrypting, byte[] key)
 
                 for (int j = 28; j < 56; j++)
                 {
-                    l = j + totrot[i];
+                    l = j + Totrot[i];
                     if (l < 56)
                     {
                         pcr[j] = pc1m[l];
@@ -347,14 +349,14 @@ protected int[] GenerateWorkingKey(bool encrypting, byte[] key)
 
                 for (int j = 0; j < 24; j++)
                 {
-                    if (pcr[pc2[j]])
+                    if (pcr[Pc2[j]])
                     {
-                        newKey[m] |= bigbyte[j];
+                        newKey[m] |= Bigbyte[j];
                     }
 
-                    if (pcr[pc2[j + 24]])
+                    if (pcr[Pc2[j + 24]])
                     {
-                        newKey[n] |= bigbyte[j];
+                        newKey[n] |= Bigbyte[j];
                     }
                 }
             }
@@ -367,15 +369,15 @@ protected int[] GenerateWorkingKey(bool encrypting, byte[] key)
                 var i1 = newKey[i];
                 var i2 = newKey[i + 1];
 
-                newKey[i] = (int)((uint)((i1 & 0x00fc0000) << 6) |
-                                    (uint)((i1 & 0x00000fc0) << 10) |
-                                    ((uint)(i2 & 0x00fc0000) >> 10) |
-                                    ((uint)(i2 & 0x00000fc0) >> 6));
+                newKey[i] = (int) ((uint) ((i1 & 0x00fc0000) << 6) |
+                                   (uint) ((i1 & 0x00000fc0) << 10) |
+                                   ((uint) (i2 & 0x00fc0000) >> 10) |
+                                   ((uint) (i2 & 0x00000fc0) >> 6));
 
-                newKey[i + 1] = (int)((uint)((i1 & 0x0003f000) << 12) |
-                                      (uint)((i1 & 0x0000003f) << 16) |
-                                      ((uint)(i2 & 0x0003f000) >> 4) |
-                                       (uint)(i2 & 0x0000003f));
+                newKey[i + 1] = (int) ((uint) ((i1 & 0x0003f000) << 12) |
+                                       (uint) ((i1 & 0x0000003f) << 16) |
+                                       ((uint) (i2 & 0x0003f000) >> 4) |
+                                       (uint) (i2 & 0x0000003f));
             }
 
             return newKey;
@@ -402,8 +404,8 @@ protected virtual void ValidateKey()
         /// <param name="outOff">The out off.</param>
         protected static void DesFunc(int[] wKey, byte[] input, int inOff, byte[] outBytes, int outOff)
         {
-            uint left = BigEndianToUInt32(input, inOff);
-            uint right = BigEndianToUInt32(input, inOff + 4);
+            var left = Pack.BigEndianToUInt32(input, inOff);
+            var right = Pack.BigEndianToUInt32(input, inOff + 4);
 
             var work = ((left >> 4) ^ right) & 0x0f0f0f0f;
             right ^= work;
@@ -423,31 +425,31 @@ protected static void DesFunc(int[] wKey, byte[] input, int inOff, byte[] outByt
             right ^= work;
             left = (left << 1) | (left >> 31);
 
-            for (int round = 0; round < 8; round++)
+            for (var round = 0; round < 8; round++)
             {
                 work = (right << 28) | (right >> 4);
                 work ^= (uint)wKey[round * 4 + 0];
-                var fval = SP7[work & 0x3f];
-                fval |= SP5[(work >> 8) & 0x3f];
-                fval |= SP3[(work >> 16) & 0x3f];
-                fval |= SP1[(work >> 24) & 0x3f];
-                work = right ^ (uint)wKey[round * 4 + 1];
-                fval |= SP8[work & 0x3f];
-                fval |= SP6[(work >> 8) & 0x3f];
-                fval |= SP4[(work >> 16) & 0x3f];
-                fval |= SP2[(work >> 24) & 0x3f];
+                var fval = Sp7[work & 0x3f];
+                fval |= Sp5[(work >> 8) & 0x3f];
+                fval |= Sp3[(work >> 16) & 0x3f];
+                fval |= Sp1[(work >> 24) & 0x3f];
+                work = right ^ (uint) wKey[round * 4 + 1];
+                fval |= Sp8[work & 0x3f];
+                fval |= Sp6[(work >> 8) & 0x3f];
+                fval |= Sp4[(work >> 16) & 0x3f];
+                fval |= Sp2[(work >> 24) & 0x3f];
                 left ^= fval;
                 work = (left << 28) | (left >> 4);
                 work ^= (uint)wKey[round * 4 + 2];
-                fval = SP7[work & 0x3f];
-                fval |= SP5[(work >> 8) & 0x3f];
-                fval |= SP3[(work >> 16) & 0x3f];
-                fval |= SP1[(work >> 24) & 0x3f];
+                fval = Sp7[work & 0x3f];
+                fval |= Sp5[(work >> 8) & 0x3f];
+                fval |= Sp3[(work >> 16) & 0x3f];
+                fval |= Sp1[(work >> 24) & 0x3f];
                 work = left ^ (uint)wKey[round * 4 + 3];
-                fval |= SP8[work & 0x3f];
-                fval |= SP6[(work >> 8) & 0x3f];
-                fval |= SP4[(work >> 16) & 0x3f];
-                fval |= SP2[(work >> 24) & 0x3f];
+                fval |= Sp8[work & 0x3f];
+                fval |= Sp6[(work >> 8) & 0x3f];
+                fval |= Sp4[(work >> 16) & 0x3f];
+                fval |= Sp2[(work >> 24) & 0x3f];
                 right ^= fval;
             }
 
@@ -469,8 +471,8 @@ protected static void DesFunc(int[] wKey, byte[] input, int inOff, byte[] outByt
             left ^= work;
             right ^= (work << 4);
 
-            UInt32ToBigEndian(right, outBytes, outOff);
-            UInt32ToBigEndian(left, outBytes, outOff + 4);
+            Pack.UInt32ToBigEndian(right, outBytes, outOff);
+            Pack.UInt32ToBigEndian(left, outBytes, outOff + 4);
         }
     }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchangeDiffieHellman.cs b/src/Renci.SshNet/Security/KeyExchangeDiffieHellman.cs
index 79c84c29c..7ade93796 100644
--- a/src/Renci.SshNet/Security/KeyExchangeDiffieHellman.cs
+++ b/src/Renci.SshNet/Security/KeyExchangeDiffieHellman.cs
@@ -65,7 +65,7 @@ protected override bool ValidateExchangeHash()
         {
             var exchangeHash = CalculateHash();
 
-            var length = (uint) (_hostKey[0] << 24 | _hostKey[1] << 16 | _hostKey[2] << 8 | _hostKey[3]);
+            var length = Pack.BigEndianToUInt32(_hostKey);
             var algorithmName = Encoding.UTF8.GetString(_hostKey, 4, (int)length);
             var key = Session.ConnectionInfo.HostKeyAlgorithms[algorithmName](_hostKey);
 
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index caaa9ae85..a324b3d1e 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -858,7 +858,7 @@ internal void SendMessage(Message message)
                 if (_clientMac != null)
                 {
                     // write outbound packet sequence to start of packet data
-                    _outboundPacketSequence.Write(packetData, 0);
+                    Pack.UInt32ToBigEndian(_outboundPacketSequence, packetData);
                     //  calculate packet hash
                     hash = _clientMac.ComputeHash(packetData);
                 }
@@ -1003,7 +1003,7 @@ private Message ReceiveMessage()
                     firstBlock = _serverCipher.Decrypt(firstBlock);
                 }
 
-                packetLength = (uint) (firstBlock[0] << 24 | firstBlock[1] << 16 | firstBlock[2] << 8 | firstBlock[3]);
+                packetLength = Pack.BigEndianToUInt32(firstBlock);
 
                 // Test packet minimum and maximum boundaries
                 if (packetLength < Math.Max((byte) 16, blockSize) - 4 || packetLength > MaximumSshPacketSize - 4)
@@ -1027,7 +1027,7 @@ private Message ReceiveMessage()
                 // byte[] for the purpose of calculating the client hash. Room for the server MAC is foreseen
                 // to read the packet including server MAC in a single pass (except for the initial block).
                 data = new byte[bytesToRead + blockSize + inboundPacketSequenceLength];
-                _inboundPacketSequence.Write(data, 0);
+                Pack.UInt32ToBigEndian(_inboundPacketSequence, data);
                 Buffer.BlockCopy(firstBlock, 0, data, inboundPacketSequenceLength, firstBlock.Length);
 
                 if (bytesToRead > 0)

From 58ab5b8c2ae7a894c915d88cd6964db90eb64980 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 17 Feb 2017 21:47:52 +0100
Subject: [PATCH 065/128] Fix warning.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 4a65a31ca..6e52d8b95 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -47,13 +47,15 @@ public WaitHandle AvailableWaitHandle
         {
             get
             {
-                if (_waitHandle != null)
-                    return _waitHandle;
-
-                lock (_lock)
+                if (_waitHandle == null)
                 {
-                    if (_waitHandle == null)
-                        _waitHandle = new ManualResetEvent(_currentCount > 0);
+                    lock (_lock)
+                    {
+                        if (_waitHandle == null)
+                        {
+                            _waitHandle = new ManualResetEvent(_currentCount > 0);
+                        }
+                    }
                 }
 
                 return _waitHandle;

From 73437578c8412038ecba4ddfa02bdbaa6430708f Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 17 Feb 2017 21:51:50 +0100
Subject: [PATCH 066/128] Use Monitor.PulseAll to ensure we signal all waiting
 threads.

---
 src/Renci.SshNet/Common/SemaphoreLight.cs |  6 +++---
 src/Renci.SshNet/Sftp/SftpFileReader.cs   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Renci.SshNet/Common/SemaphoreLight.cs b/src/Renci.SshNet/Common/SemaphoreLight.cs
index 6e52d8b95..55e4a840a 100644
--- a/src/Renci.SshNet/Common/SemaphoreLight.cs
+++ b/src/Renci.SshNet/Common/SemaphoreLight.cs
@@ -92,7 +92,7 @@ public int Release(int releaseCount)
                     _waitHandle.Set();
                 }
 
-                Monitor.Pulse(_lock);
+                Monitor.PulseAll(_lock);
 
                 return oldCount;
             }
@@ -118,7 +118,7 @@ public void Wait()
                     _waitHandle.Reset();
                 }
 
-                Monitor.Pulse(_lock);
+                Monitor.PulseAll(_lock);
             }
         }
 
@@ -197,7 +197,7 @@ private bool WaitWithTimeout(int timeoutInMilliseconds)
                     _waitHandle.Reset();
                 }
 
-                Monitor.Pulse(_lock);
+                Monitor.PulseAll(_lock);
 
                 return true;
             }
diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 0bf582a5d..ed3b8b69f 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -25,7 +25,7 @@ internal class SftpFileReader : ISftpFileReader
 
         private int _readAheadChunkIndex;
         private ulong _readAheadOffset;
-        private ManualResetEvent _readAheadCompleted;
+        private readonly ManualResetEvent _readAheadCompleted;
         private ManualResetEvent _disposingWaitHandle;
         private int _nextChunkIndex;
 
@@ -37,7 +37,7 @@ internal class SftpFileReader : ISftpFileReader
         /// Holds a value indicating whether the client has read up to the end of the file.
         /// </summary>
         private bool _isEndOfFileRead;
-        private SemaphoreLight _semaphore;
+        private readonly SemaphoreLight _semaphore;
         private readonly object _readLock;
 
         private Exception _exception;
@@ -223,7 +223,7 @@ protected void Dispose(bool disposing)
                     // in Read()
                     _semaphore.Dispose();
                     // awake Read
-                    Monitor.Pulse(_readLock);
+                    Monitor.PulseAll(_readLock);
                 }
 
                 var closeAsyncResult = _sftpSession.BeginClose(_handle, null, null);
@@ -253,7 +253,7 @@ private void StartReadAhead()
                         // unblock the Read()
                         lock (_readLock)
                         {
-                            Monitor.Pulse(_readLock);
+                            Monitor.PulseAll(_readLock);
                         }
                         // break the read-ahead loop
                         break;
@@ -352,7 +352,7 @@ private void ReadCompleted(IAsyncResult result)
                 _queue.Add(bufferedRead.ChunkIndex, bufferedRead);
                 // signal that a chunk has been read or EOF has been reached;
                 // in both cases, Read() will eventually also unblock the "read-ahead" thread
-                Monitor.Pulse(_readLock);
+                Monitor.PulseAll(_readLock);
             }
 
             // check if server signaled EOF
@@ -373,7 +373,7 @@ private void HandleFailure(Exception cause)
             // unblock Read()
             lock (_readLock)
             {
-                Monitor.Pulse(_readLock);
+                Monitor.PulseAll(_readLock);
             }
         }
 

From 847119fd87eeac98bfd299b94b19ad4b283a9937 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 18 Feb 2017 11:21:40 +0100
Subject: [PATCH 067/128] Identify future optimization.

---
 src/Renci.SshNet/Session.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index a324b3d1e..2fe77a9d8 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1061,6 +1061,8 @@ private Message ReceiveMessage()
                 var clientHash = _serverMac.ComputeHash(data, 0, data.Length - serverMacLength);
                 var serverHash = data.Take(data.Length - serverMacLength, serverMacLength);
 
+                // TODO add IsEqualTo overload that takes left+right index and number of bytes to compare;
+                // TODO that way we can eliminate the extrate allocation of the Take above
                 if (!serverHash.IsEqualTo(clientHash))
                 {
                     throw new SshConnectionException("MAC error", DisconnectReason.MacError);

From 932f36fd86d9cd611a913dba375b354abeeaa4cb Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Sat, 18 Feb 2017 11:36:43 +0100
Subject: [PATCH 068/128] Add Pack to project files.

---
 src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj             | 5 ++++-
 src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj | 5 ++++-
 .../Renci.SshNet.Silverlight5.csproj                         | 5 ++++-
 src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj             | 3 +++
 .../Renci.SshNet.WindowsPhone.csproj                         | 3 +++
 .../Renci.SshNet.WindowsPhone8.csproj                        | 5 ++++-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 73ea2655c..b7024bcd4 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -188,6 +188,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
@@ -944,7 +947,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index a5faa428b..a4d20aa55 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -200,6 +200,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
@@ -937,7 +940,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index bcf08a03c..062514725 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -209,6 +209,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
@@ -943,7 +946,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 46b88f58b..8849e6ae3 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -249,6 +249,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 215e2561c..944fc24bd 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -191,6 +191,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index f5324d51b..b99bb0c5e 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -232,6 +232,9 @@
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Common\Pack.cs">
+      <Link>Common\Pack.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\PipeStream.cs">
       <Link>Common\PipeStream.cs</Link>
     </Compile>
@@ -970,7 +973,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 178512c998f754626ff579ecb7027cc313289be8 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 18 Feb 2017 13:32:16 +0100
Subject: [PATCH 069/128] Use length of actual hash.

---
 src/Renci.SshNet/Session.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 2fe77a9d8..831353da8 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -882,7 +882,7 @@ internal void SendMessage(Message message)
                 }
                 else
                 {
-                    var data = new byte[packetLength + (_clientMac.HashSize/8)];
+                    var data = new byte[packetLength + hash.Length];
                     Buffer.BlockCopy(packetData, packetDataOffset, data, 0, packetLength);
                     Buffer.BlockCopy(hash, 0, data, packetLength, hash.Length);
                     SendPacket(data, 0, data.Length);

From c3927660cf683d90219c088315846102732b08b2 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 18 Feb 2017 13:32:30 +0100
Subject: [PATCH 070/128] Added ExecuteThreadLongRunning.

---
 src/Renci.SshNet/Abstractions/ThreadAbstraction.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
index ef33f8d03..f1ed202ae 100644
--- a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
@@ -19,15 +19,23 @@ public static void Sleep(int millisecondsTimeout)
 #endif
         }
 
+        public static void ExecuteThreadLongRunning(Action action)
+        {
+#if FEATURE_THREAD_TAP
+            var taskCreationOptions = System.Threading.Tasks.TaskCreationOptions.LongRunning;
+            System.Threading.Tasks.Task.Factory.StartNew(action, taskCreationOptions);
+#else
+            var thread = new System.Threading.Thread(() => action());
+            thread.Start();
+#endif
+        }
+
         /// <summary>
         /// Executes the specified action in a separate thread.
         /// </summary>
         /// <param name="action">The action to execute.</param>
         public static void ExecuteThread(Action action)
         {
-            if (action == null)
-                throw new ArgumentNullException("action");
-
 #if FEATURE_THREAD_THREADPOOL
             System.Threading.ThreadPool.QueueUserWorkItem(o => action());
 #elif FEATURE_THREAD_TAP

From 98aba4920d210bdeb19e2e4c70e1e8c5e58843f6 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 18 Feb 2017 13:48:25 +0100
Subject: [PATCH 071/128] Only copy the actual number of bytes received to the
 buffer. Fixes issue #173.

---
 ...aInWriteBufferAndNoDataInReadBuffer_Eof.cs |  93 ++++++++++++++++
 ...fer_LessDataThanReadBufferSizeAvailable.cs | 100 ++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                 |   2 +
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |   3 +-
 4 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
new file mode 100644
index 000000000..43e461157
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof
+    {
+        private Mock<ISftpSession> _sftpSessionMock;
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private SftpFileAttributes _fileAttributes;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private int _actual;
+        private MockSequence _sequence;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        public void TearDown()
+        {
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestClose(_handle));
+        }
+
+        protected void Arrange()
+        {
+            var random = new Random();
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _fileAttributes = SftpFileAttributes.Empty;
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = (uint)random.Next(0, 1000);
+            _writeBufferSize = (uint)random.Next(0, 1000);
+
+            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+
+            _sequence = new MockSequence();
+
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
+                .Returns(_handle);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false))
+                            .Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                .Returns(_readBufferSize);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                .Returns(_writeBufferSize);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.IsOpen)
+                .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(new byte[0]);
+
+            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+        }
+
+        protected void Act()
+        {
+            _actual = _sftpFileStream.ReadByte();
+        }
+
+        [TestMethod]
+        public void ReadByteShouldReturnMinusOne()
+        {
+            Assert.AreEqual(-1, _actual);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.IsOpen)
+                            .Returns(true);
+
+            Assert.AreEqual(0L, _sftpFileStream.Position);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
new file mode 100644
index 000000000..01648a752
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    /// <summary>
+    /// Test for issue #173.
+    /// </summary>
+    [TestClass]
+    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable
+    {
+        private Mock<ISftpSession> _sftpSessionMock;
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private SftpFileAttributes _fileAttributes;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private int _actual;
+        private byte[] _data;
+        private MockSequence _sequence;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        public void TearDown()
+        {
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.RequestClose(_handle));
+        }
+
+        protected void Arrange()
+        {
+            var random = new Random();
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
+            _fileAttributes = SftpFileAttributes.Empty;
+            _bufferSize = (uint) random.Next(5, 1000);
+            _readBufferSize = (uint) random.Next(10, 100);
+            _writeBufferSize = (uint) random.Next(10, 100);
+            _data = new byte[_readBufferSize - 2];
+            CryptoAbstraction.GenerateRandom(_data);
+
+            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+
+            _sequence = new MockSequence();
+
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
+                .Returns(_handle);
+            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false))
+                            .Returns(_fileAttributes);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                .Returns(_readBufferSize);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                .Returns(_writeBufferSize);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.IsOpen)
+                .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(_data);
+
+            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+        }
+
+        protected void Act()
+        {
+            _actual = _sftpFileStream.ReadByte();
+        }
+
+        [TestMethod]
+        public void ReadByteShouldReturnFirstByteThatWasReadFromServer()
+        {
+            Assert.AreEqual(_data[0], _actual);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnOne()
+        {
+            _sftpSessionMock.InSequence(_sequence)
+                            .Setup(p => p.IsOpen)
+                            .Returns(true);
+
+            Assert.AreEqual(1L, _sftpFileStream.Position);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index d26c0c35e..ee56eadad 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -417,6 +417,7 @@
     <Compile Include="Classes\Sftp\Responses\SftpVersionResponseTest.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionNotOpen.cs" />
@@ -424,6 +425,7 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs" />
     <Compile Include="Classes\Sftp\SftpFileTest.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestRead.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestStatVfs.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index dc74c2825..395d6bbd5 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -397,7 +397,6 @@ public override int ReadByte()
                     var data = _session.RequestRead(_handle, (ulong)_position, (uint)_readBufferSize);
 
                     _bufferLen = data.Length;
-                    Buffer.BlockCopy(data, 0, _readBuffer, 0, _readBufferSize);
                     _serverFilePosition = (ulong)_position;
 
                     if (_bufferLen == 0)
@@ -405,6 +404,8 @@ public override int ReadByte()
                         // We've reached EOF.
                         return -1;
                     }
+
+                    Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
                 }
 
                 // Extract the next byte from the buffer.

From 391a41c35dd3a1b1983ffb42ed2a4f0d60cebbbc Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 19 Feb 2017 10:09:24 +0100
Subject: [PATCH 072/128] Move on :p

---
 src/Renci.SshNet/Sftp/SftpFileReader.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index ed3b8b69f..35dcf5c75 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -20,7 +20,7 @@ internal class SftpFileReader : ISftpFileReader
         /// Holds the size of the file, when available.
         /// </summary>
         private readonly long? _fileSize;
-        private readonly IDictionary<int, BufferedRead> _queue;
+        private readonly Dictionary<int, BufferedRead> _queue;
         private readonly WaitHandle[] _waitHandles;
 
         private int _readAheadChunkIndex;
@@ -325,9 +325,7 @@ private bool ContinueReadAhead()
 
         private void ReadCompleted(IAsyncResult result)
         {
-            var readAsyncResult = result as SftpReadAsyncResult;
-            if (readAsyncResult == null)
-                return;
+            var readAsyncResult = (SftpReadAsyncResult) result;
 
             byte[] data;
 
@@ -343,7 +341,7 @@ private void ReadCompleted(IAsyncResult result)
 
             // a read that completes with a zero-byte result signals EOF
             // but there may be pending reads before that read
-            var bufferedRead = (BufferedRead)readAsyncResult.AsyncState;
+            var bufferedRead = (BufferedRead) readAsyncResult.AsyncState;
             bufferedRead.Complete(data);
 
             lock (_readLock)

From 4e2bd636604da02ec179f9be31c9d4d1e4125372 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 19 Feb 2017 10:30:40 +0100
Subject: [PATCH 073/128] Only write to the read buffer if we actually received
 data.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 395d6bbd5..008782afa 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -337,14 +337,14 @@ public override int Read(byte[] buffer, int offset, int count)
                         var data = _session.RequestRead(_handle, (ulong)_position, (uint)_readBufferSize);
 
                         _bufferLen = data.Length;
-
-                        Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
                         _serverFilePosition = (ulong)_position;
 
                         if (_bufferLen == 0)
                         {
                             break;
                         }
+
+                        Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
                         tempLen = _bufferLen;
                     }
 

From c8373c978fc056b4f05db2a36ee028505b9ecda6 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 26 Feb 2017 17:48:55 +0100
Subject: [PATCH 074/128] Eliminate intermediate copy to read buffer.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 63 ++++++++++++++++---------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 008782afa..853010cb0 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -329,40 +329,59 @@ public override int Read(byte[] buffer, int offset, int count)
                 while (count > 0)
                 {
                     // How much data do we have available in the buffer?
-                    var tempLen = _bufferLen - _bufferPosition;
-                    if (tempLen <= 0)
+                    var bytesAvailableInBuffer = _bufferLen - _bufferPosition;
+                    if (bytesAvailableInBuffer <= 0)
                     {
                         _bufferPosition = 0;
+                        _bufferLen = 0;
 
-                        var data = _session.RequestRead(_handle, (ulong)_position, (uint)_readBufferSize);
+                        var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
-                        _bufferLen = data.Length;
-                        _serverFilePosition = (ulong)_position;
+                        // TODO: don't we need to take into account the number of bytes read (data.Length) ?
+                        _serverFilePosition = (ulong) _position;
 
-                        if (_bufferLen == 0)
+                        if (data.Length == 0)
                         {
                             break;
                         }
 
-                        Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
-                        tempLen = _bufferLen;
+                        // determine number of bytes that we can read into caller-provided buffer
+                        var bytesToWriteToCallerBuffer = Math.Min(data.Length, count);
+                        // write bytes to caller-provided buffer
+                        Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesToWriteToCallerBuffer;
+                        // update number of bytes left to read
+                        count -= bytesToWriteToCallerBuffer;
+                        // record total number of bytes read into caller-provided buffer
+                        readLen += bytesToWriteToCallerBuffer;
+                        // update stream position
+                        _position += bytesToWriteToCallerBuffer;
+
+                        if (data.Length > bytesToWriteToCallerBuffer)
+                        {
+                            // copy remaining bytes to read buffer
+                            _bufferLen = data.Length - bytesToWriteToCallerBuffer;
+                            Buffer.BlockCopy(data, count, _readBuffer, 0, _bufferLen);
+                        }
                     }
-
-                    // Don't read more than the caller wants.
-                    if (tempLen > count)
+                    else
                     {
-                        tempLen = count;
+                        // determine number of bytes that we can write from read buffer to caller-provided buffer
+                        var bytesToWriteToCallerBuffer = Math.Min(bytesAvailableInBuffer, count);
+                        // copy data from read buffer to the caller-provided buffer
+                        Buffer.BlockCopy(_readBuffer, _bufferPosition, buffer, offset, bytesToWriteToCallerBuffer);
+                        // update position in read buffer
+                        _bufferPosition += bytesToWriteToCallerBuffer;
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesAvailableInBuffer;
+                        // update number of bytes left to read
+                        count -= bytesToWriteToCallerBuffer;
+                        // record total number of bytes read into caller-provided buffer
+                        readLen += bytesToWriteToCallerBuffer;
+                        // update stream position
+                        _position += bytesToWriteToCallerBuffer;
                     }
-
-                    // Copy stream data to the caller's buffer.
-                    Buffer.BlockCopy(_readBuffer, _bufferPosition, buffer, offset, tempLen);
-
-                    // Advance to the next buffer positions.
-                    readLen += tempLen;
-                    offset += tempLen;
-                    count -= tempLen;
-                    _bufferPosition += tempLen;
-                    _position += tempLen;
                 }
             }
 

From 68dded538685c6ac1ec299e0f0af68d5fc23af04 Mon Sep 17 00:00:00 2001
From: Artem Gayardo-Matrosov <github@gayardo.com>
Date: Fri, 3 Mar 2017 15:15:18 +0100
Subject: [PATCH 075/128] Fix for data corruption when reading to a buffer that
 is smaller than the internal buffer.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 853010cb0..cc66677f5 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -362,7 +362,7 @@ public override int Read(byte[] buffer, int offset, int count)
                         {
                             // copy remaining bytes to read buffer
                             _bufferLen = data.Length - bytesToWriteToCallerBuffer;
-                            Buffer.BlockCopy(data, count, _readBuffer, 0, _bufferLen);
+                            Buffer.BlockCopy(data, bytesToWriteToCallerBuffer, _readBuffer, 0, _bufferLen);
                         }
                     }
                     else

From c2bd7b5171d2ccce0780774f283effd2bf13b84d Mon Sep 17 00:00:00 2001
From: Artem Gayardo-Matrosov <github@gayardo.com>
Date: Fri, 3 Mar 2017 15:39:31 +0100
Subject: [PATCH 076/128] Unit test fix.

---
 src/Renci.SshNet/Abstractions/ThreadAbstraction.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
index f1ed202ae..fe6e3e218 100644
--- a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
@@ -36,6 +36,8 @@ public static void ExecuteThreadLongRunning(Action action)
         /// <param name="action">The action to execute.</param>
         public static void ExecuteThread(Action action)
         {
+            if (action == null)
+                throw new ArgumentNullException("action");
 #if FEATURE_THREAD_THREADPOOL
             System.Threading.ThreadPool.QueueUserWorkItem(o => action());
 #elif FEATURE_THREAD_TAP

From 4b85e78e3cc5d912516b0b92ae77da89f14e7c0c Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 15:58:44 +0100
Subject: [PATCH 077/128] In the SftpFileStream ctor, only obtain file
 attributes when mode is Append and no longer keep the result as instance
 field. Update Seek to only obtain file attributes when SeekOrigin is End.
 Update SetLength to obtain server file attributes before updating sending an
 SSH_FXP_FSETSTAT with the new size/length.

Fixes issue #154.
---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 50 ++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 853010cb0..a7d2ff6cc 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -30,8 +30,6 @@ public class SftpFileStream : Stream
         private bool _canWrite;
         private ulong _serverFilePosition;
 
-        private SftpFileAttributes _attributes;
-
         private readonly object _lock = new object();
 
         /// <summary>
@@ -105,12 +103,11 @@ public override long Length
                         FlushWriteBuffer();
                     }
 
-                    //  Update file attributes
-                    _attributes = _session.RequestFStat(_handle, true);
-
-                    if (_attributes != null && _attributes.Size > -1)
+                    // obtain file attributes
+                    var attributes = _session.RequestFStat(_handle, true);
+                    if (attributes != null)
                     {
-                        return _attributes.Size;
+                        return attributes.Size;
                     }
                     throw new IOException("Seek operation failed.");
                 }
@@ -188,9 +185,9 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
 
             // Initialize the object state.
             _session = session;
-            _canRead = ((access & FileAccess.Read) != 0);
+            _canRead = (access & FileAccess.Read) != 0;
             _canSeek = true;
-            _canWrite = ((access & FileAccess.Write) != 0);
+            _canWrite = (access & FileAccess.Write) != 0;
 
             var flags = Flags.None;
 
@@ -240,21 +237,20 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             if (_handle == null)
                 _handle = _session.RequestOpen(path, flags);
 
-            _attributes = _session.RequestFStat(_handle, false);
-
             // instead of using the specified buffer size as is, we use it to calculate a buffer size
             // that ensures we always receive or send the max. number of bytes in a single SSH_FXP_READ
             // or SSH_FXP_WRITE message
 
-            _readBufferSize = (int) session.CalculateOptimalReadLength((uint)bufferSize);
+            _readBufferSize = (int) session.CalculateOptimalReadLength((uint) bufferSize);
             _readBuffer = new byte[_readBufferSize];
-            _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint)bufferSize, _handle);
+            _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint) bufferSize, _handle);
             _writeBuffer = new byte[_writeBufferSize];
 
             if (mode == FileMode.Append)
             {
-                _position = _attributes.Size;
-                _serverFilePosition = (ulong) _attributes.Size;
+                var attributes = _session.RequestFStat(_handle, false);
+                _position = attributes.Size;
+                _serverFilePosition = (ulong) attributes.Size;
             }
         }
 
@@ -290,13 +286,15 @@ public override void Flush()
         }
 
         /// <summary>
-        /// Reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
+        /// Reads a sequence of bytes from the current stream and advances the position within the stream by the
+        /// number of bytes read.
         /// </summary>
         /// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset"/> and (<paramref name="offset"/> + <paramref name="count"/> - 1) replaced by the bytes read from the current source.</param>
         /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin storing the data read from the current stream.</param>
         /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
         /// <returns>
-        /// The total number of bytes read into the buffer. This can be less than the number of bytes requested if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
+        /// The total number of bytes read into the buffer. This can be less than the number of bytes requested
+        /// if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
         /// </returns>
         /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>. </exception>
@@ -413,10 +411,10 @@ public override int ReadByte()
                 {
                     _bufferPosition = 0;
 
-                    var data = _session.RequestRead(_handle, (ulong)_position, (uint)_readBufferSize);
+                    var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
                     _bufferLen = data.Length;
-                    _serverFilePosition = (ulong)_position;
+                    _serverFilePosition = (ulong) _position;
 
                     if (_bufferLen == 0)
                     {
@@ -466,8 +464,6 @@ public override long Seek(long offset, SeekOrigin origin)
                     return _position;
                 }
 
-                _attributes = _session.RequestFStat(_handle, false);
-
                 // The behaviour depends upon the read/write mode.
                 if (_bufferOwnedByWrite)
                 {
@@ -483,7 +479,8 @@ public override long Seek(long offset, SeekOrigin origin)
                             newPosn = _position + offset;
                             break;
                         case SeekOrigin.End:
-                            newPosn = _attributes.Size - offset;
+                            var attributes = _session.RequestFStat(_handle, false);
+                            newPosn = attributes.Size - offset;
                             break;
                     }
 
@@ -536,7 +533,8 @@ public override long Seek(long offset, SeekOrigin origin)
                             newPosn = _position + offset;
                             break;
                         case SeekOrigin.End:
-                            newPosn = _attributes.Size - offset;
+                            var attributes = _session.RequestFStat(_handle, false);
+                            newPosn = attributes.Size - offset;
                             break;
                     }
 
@@ -573,8 +571,10 @@ public override void SetLength(long value)
                     throw new NotSupportedException("Seek is not supported.");
 
                 SetupWrite();
-                _attributes.Size = value;
-                _session.RequestFSetStat(_handle, _attributes);
+
+                var attributes = _session.RequestFStat(_handle, false);
+                attributes.Size = value;
+                _session.RequestFSetStat(_handle, attributes);
             }
         }
 

From 40e106828df70a12a812120758194d03ef6a58fe Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 16:00:48 +0100
Subject: [PATCH 078/128] Throw ArgumentException for invalid combinations of
 FileMode and FileAccess.

Fixes issue #191.
---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index a7d2ff6cc..8f53570f4 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -175,10 +175,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
                 throw new ArgumentNullException("path");
             if (bufferSize <= 0)
                 throw new ArgumentOutOfRangeException("bufferSize");
-            if (access < FileAccess.Read || access > FileAccess.ReadWrite)
-                throw new ArgumentOutOfRangeException("access");
-            if (mode < FileMode.CreateNew || mode > FileMode.Append)
-                throw new ArgumentOutOfRangeException("mode");
 
             Timeout = TimeSpan.FromSeconds(30);
             Name = path;
@@ -203,6 +199,20 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
                     flags |= Flags.Read;
                     flags |= Flags.Write;
                     break;
+                default:
+                    throw new ArgumentOutOfRangeException("access");
+            }
+
+            if ((access & FileAccess.Write) == 0)
+            {
+                if (mode == FileMode.Create || mode == FileMode.CreateNew || mode == FileMode.Truncate || mode == FileMode.Append)
+                {
+                    throw new ArgumentException(string.Format("Combining {0}: {1} with {2}: {3} is invalid.",
+                        typeof(FileMode).Name,
+                        mode,
+                        typeof(FileAccess).Name,
+                        access));
+                }
             }
 
             switch (mode)
@@ -232,6 +242,8 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
                 case FileMode.Truncate:
                     flags |= Flags.Truncate;
                     break;
+                default:
+                    throw new ArgumentOutOfRangeException("mode");
             }
 
             if (_handle == null)

From 08b2d05ed8214c469d14a2be90c193e5de3e9dc4 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 16:01:34 +0100
Subject: [PATCH 079/128] Added tests for issue #191, and update tests for
 issue #154.

---
 .../Classes/Sftp/SftpFileStreamTestBase.cs    |  48 +++++
 ...treamTest_CanRead_Closed_FileAccessRead.cs |   3 -
 ...Test_CanRead_Closed_FileAccessReadWrite.cs |   3 -
 ...reamTest_CanRead_Closed_FileAccessWrite.cs |   3 -
 ...eamTest_CanRead_Disposed_FileAccessRead.cs |   3 -
 ...st_CanRead_Disposed_FileAccessReadWrite.cs |   3 -
 ...amTest_CanRead_Disposed_FileAccessWrite.cs |   3 -
 ...Test_CanRead_SessionOpen_FileAccessRead.cs |   3 -
 ...CanRead_SessionOpen_FileAccessReadWrite.cs |   3 -
 ...est_CanRead_SessionOpen_FileAccessWrite.cs |   3 -
 ...reamTest_CanWrite_Closed_FileAccessRead.cs |   3 -
 ...est_CanWrite_Closed_FileAccessReadWrite.cs |   3 -
 ...eamTest_CanWrite_Closed_FileAccessWrite.cs |   3 -
 ...amTest_CanWrite_Disposed_FileAccessRead.cs |   3 -
 ...t_CanWrite_Disposed_FileAccessReadWrite.cs |   3 -
 ...mTest_CanWrite_Disposed_FileAccessWrite.cs |   3 -
 ...est_CanWrite_SessionOpen_FileAccessRead.cs |   3 -
 ...anWrite_SessionOpen_FileAccessReadWrite.cs |   3 -
 ...st_CanWrite_SessionOpen_FileAccessWrite.cs |   3 -
 .../Sftp/SftpFileStreamTest_Close_Closed.cs   |   2 -
 .../Sftp/SftpFileStreamTest_Close_Disposed.cs |   3 -
 ...SftpFileStreamTest_Close_SessionNotOpen.cs |   3 -
 .../SftpFileStreamTest_Close_SessionOpen.cs   |   3 -
 ...tpFileStreamTest_Ctor_FileAccessInvalid.cs |  54 ++++++
 ...Test_Ctor_FileModeAppend_FileAccessRead.cs |  55 ++++++
 ...Ctor_FileModeAppend_FileAccessReadWrite.cs | 164 +++++++++++++++++
 ...est_Ctor_FileModeAppend_FileAccessWrite.cs | 169 +++++++++++++++++
 ...t_Ctor_FileModeCreateNew_FileAccessRead.cs |  55 ++++++
 ...r_FileModeCreateNew_FileAccessReadWrite.cs | 147 +++++++++++++++
 ..._Ctor_FileModeCreateNew_FileAccessWrite.cs | 151 ++++++++++++++++
 ...Test_Ctor_FileModeCreate_FileAccessRead.cs |  55 ++++++
 ...te_FileAccessReadWrite_FileDoesNotExist.cs | 150 ++++++++++++++++
 ...deCreate_FileAccessReadWrite_FileExists.cs | 147 +++++++++++++++
 ...Create_FileAccessWrite_FileDoesNotExist.cs | 155 ++++++++++++++++
 ...leModeCreate_FileAccessWrite_FileExists.cs | 151 ++++++++++++++++
 ...SftpFileStreamTest_Ctor_FileModeInvalid.cs |  54 ++++++
 ...tor_FileModeOpenOrCreate_FileAccessRead.cs | 170 ++++++++++++++++++
 ...ileModeOpenOrCreate_FileAccessReadWrite.cs | 147 +++++++++++++++
 ...or_FileModeOpenOrCreate_FileAccessWrite.cs | 151 ++++++++++++++++
 ...amTest_Ctor_FileModeOpen_FileAccessRead.cs | 170 ++++++++++++++++++
 ...t_Ctor_FileModeOpen_FileAccessReadWrite.cs | 147 +++++++++++++++
 ...mTest_Ctor_FileModeOpen_FileAccessWrite.cs | 151 ++++++++++++++++
 ...st_Ctor_FileModeTruncate_FileAccessRead.cs |  55 ++++++
 ...or_FileModeTruncate_FileAccessReadWrite.cs | 147 +++++++++++++++
 ...t_Ctor_FileModeTruncate_FileAccessWrite.cs | 151 ++++++++++++++++
 .../Sftp/SftpFileStreamTest_Dispose_Closed.cs |   3 -
 .../SftpFileStreamTest_Dispose_Disposed.cs    |   3 -
 ...tpFileStreamTest_Dispose_SessionNotOpen.cs |  13 +-
 .../SftpFileStreamTest_Dispose_SessionOpen.cs |   5 +-
 ...SftpFileStreamTest_Finalize_SessionOpen.cs |   5 +-
 ...aInWriteBufferAndNoDataInReadBuffer_Eof.cs |  13 +-
 ...fer_LessDataThanReadBufferSizeAvailable.cs |   4 -
 .../SftpFileStreamTest_SetLength_Closed.cs    |   3 -
 .../SftpFileStreamTest_SetLength_Disposed.cs  |  14 +-
 ...FileStreamTest_SetLength_SessionNotOpen.cs |   3 -
 ...st_SetLength_SessionOpen_FIleAccessRead.cs |   3 -
 ...tLength_SessionOpen_FIleAccessReadWrite.cs |  31 +++-
 ...t_SetLength_SessionOpen_FIleAccessWrite.cs |  33 +++-
 ...tGreatherThanTwoTimesTheWriteBufferSize.cs |   3 -
 .../Common/SftpFileAttributesBuilder.cs       |  85 +++++++++
 .../Renci.SshNet.Tests.csproj                 |  24 +++
 61 files changed, 3026 insertions(+), 128 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileAccessInvalid.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeInvalid.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
 create mode 100644 src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
new file mode 100644
index 000000000..6efaeb75d
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
@@ -0,0 +1,48 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    public abstract class SftpFileStreamTestBase
+    {
+        internal Mock<ISftpSession> SftpSessionMock;
+        protected MockSequence MockSequence;
+
+        private void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
+        }
+
+        protected virtual void SetupData()
+        {
+            MockSequence = new MockSequence();
+        }
+
+        protected abstract void SetupMocks();
+
+        private void CreateMocks()
+        {
+            SftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        }
+
+        [TestInitialize]
+        public void SetUp()
+        {
+            Arrange();
+            Act();
+        }
+
+        protected abstract void Act();
+
+        protected byte[] GenerateRandom(int length, Random random)
+        {
+            var buffer = new byte[length];
+            random.NextBytes(buffer);
+            return buffer;
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
index 995dcab87..25b8714bc 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Closed_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
index 87d3ba31d..4fd4d45cb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
index b68e69ed8..159708709 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Closed_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
index 016c4b989..00b29d0dd 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Disposed_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
index 540803cfe..f3b959664 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
index 41bf419a7..dc6d3451b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_Disposed_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
index 01a7a759f..b0f26fe36 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
index 772be07ba..1ab4a8a01 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
index 1c72aaf19..86d30e2e0 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
index ca6d7bb9a..f2ae4ac3e 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Closed_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
index c23396583..8815d01d9 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
index 8f3c473a3..6d435d3a8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Closed_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
index 9a81e61e6..b6b09fe1a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Disposed_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
index 3e0f53b06..b1481803f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
index 2b0dc8a27..0de568a4c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
index c8a1b84e3..3aa5e651b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
index 0c90a2c2b..1aa7a0114 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
index f7ef9d8ee..fbea2d753 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(0, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
index 964da09e5..80bb277d3 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
@@ -31,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(1, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -42,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
index a5500e00f..bc0a0cb93 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Close_Disposed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(1, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
index 0e5019774..71c2d1e01 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Close_SessionNotOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(1, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
index b7f7623db..94c2aea1a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Close_SessionOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileAccessInvalid.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileAccessInvalid.cs
new file mode 100644
index 000000000..29e36fbf0
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileAccessInvalid.cs
@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileAccessInvalid : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentOutOfRangeException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Open;
+            _fileAccess = 0;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentOutOfRangeException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("access", _actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
new file mode 100644
index 000000000..5b553edb2
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Append;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.IsNull(_actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
new file mode 100644
index 000000000..9e641ad22
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
@@ -0,0 +1,164 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private SftpFileAttributes _fileAttributes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Append;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _fileAttributes = new SftpFileAttributesBuilder().WithLastAccessTime(DateTime.Now.AddSeconds(_random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(_random.Next()))
+                                                             .WithSize(_random.Next())
+                                                             .WithUserId(_random.Next())
+                                                             .WithGroupId(_random.Next())
+                                                             .WithPermissions((uint)_random.Next())
+                                                             .Build();
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestFStat(_handle, false))
+                            .Returns(_fileAttributes);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSizeOfFile()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(_fileAttributes.Size, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtEndOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] {5, 4, 3, 2, 1};
+            var expected = new byte[] {0, 5, 4, 3, 2, 1, 0, 0};
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)_fileAttributes.Size, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_fileAttributes.Size, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtEndOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong) _fileAttributes.Size, _readBufferSize)).Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong) _fileAttributes.Size, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtEndOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, (ulong) _fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (ulong) _fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestFStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFStat(_handle, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
new file mode 100644
index 000000000..2461898da
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
@@ -0,0 +1,169 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private SftpFileAttributes _fileAttributes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Append;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _fileAttributes = new SftpFileAttributesBuilder().WithLastAccessTime(DateTime.Now.AddSeconds(_random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(_random.Next()))
+                                                             .WithSize(_random.Next())
+                                                             .WithUserId(_random.Next())
+                                                             .WithGroupId(_random.Next())
+                                                             .WithPermissions((uint) _random.Next())
+                                                             .Build();
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestFStat(_handle, false))
+                            .Returns(_fileAttributes);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSizeOfFile()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(_fileAttributes.Size, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtEndOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, (ulong) _fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (ulong)_fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestFStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFStat(_handle, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
new file mode 100644
index 000000000..2663e113a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.CreateNew;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.IsNull(_actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
new file mode 100644
index 000000000..d2caefe19
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
@@ -0,0 +1,147 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.CreateNew;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
new file mode 100644
index 000000000..cb3eab4ac
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
@@ -0,0 +1,151 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.CreateNew;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
new file mode 100644
index 000000000..244e59fca
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Create;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.IsNull(_actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
new file mode 100644
index 000000000..f57ae4634
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
@@ -0,0 +1,150 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Create;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
+                            .Returns((byte[]) null);
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
new file mode 100644
index 000000000..8952c9ff6
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
@@ -0,0 +1,147 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Create;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
new file mode 100644
index 000000000..8b542690d
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
@@ -0,0 +1,155 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Create;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
+                            .Returns((byte[])null);
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnceWithTruncateAndOnceWithCreateNew()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
new file mode 100644
index 000000000..58cd8b589
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
@@ -0,0 +1,151 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Create;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeInvalid.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeInvalid.cs
new file mode 100644
index 000000000..ee82ec002
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeInvalid.cs
@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeInvalid : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentOutOfRangeException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = 0;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentOutOfRangeException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("mode", _actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
new file mode 100644
index 000000000..060eb2fae
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
@@ -0,0 +1,170 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Write(buffer, 0, buffer.Length);
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Write not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.WriteByte(0x0a);
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Write not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
new file mode 100644
index 000000000..fc65dad35
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
@@ -0,0 +1,147 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNewOrOpen, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNewOrOpen, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
new file mode 100644
index 000000000..e8578e8a1
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
@@ -0,0 +1,151 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNewOrOpen, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNewOrOpen, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
new file mode 100644
index 000000000..63ad26197
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
@@ -0,0 +1,170 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Open;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Write(buffer, 0, buffer.Length);
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Write not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.WriteByte(0x0a);
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Write not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
new file mode 100644
index 000000000..866a4fb30
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
@@ -0,0 +1,147 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Open;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
new file mode 100644
index 000000000..3f7759b1a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
@@ -0,0 +1,151 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Open;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
new file mode 100644
index 000000000..fd0497559
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private ArgumentException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Truncate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+        }
+
+        protected override void SetupMocks()
+        {
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void CtorShouldHaveThrownArgumentException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.IsNull(_actualException.ParamName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
new file mode 100644
index 000000000..2b59c320a
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
@@ -0,0 +1,147 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Truncate;
+            _fileAccess = FileAccess.ReadWrite;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldStartReadingAtBeginningOfFile()
+        {
+            var buffer = new byte[8];
+            var data = new byte[] { 5, 4, 3, 2, 1 };
+            var expected = new byte[] { 0, 5, 4, 3, 2, 1, 0, 0 };
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize)).Returns(data);
+
+            var actual = _target.Read(buffer, 1, data.Length);
+
+            Assert.AreEqual(data.Length, actual);
+            Assert.IsTrue(buffer.IsEqualTo(expected));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void ReadByteShouldStartReadingAtBeginningOfFile()
+        {
+            var data = GenerateRandom(5, _random);
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(data);
+
+            var actual = _target.ReadByte();
+
+            Assert.AreEqual(data[0], actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Once);
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
new file mode 100644
index 000000000..c149d6975
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
@@ -0,0 +1,151 @@
+using System;
+using System.IO;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.Truncate;
+            _fileAccess = FileAccess.Write;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint) _random.Next(5, 1000);
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, false))
+                            .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        [TestMethod]
+        public void CanReadShouldReturnFalse()
+        {
+            Assert.IsFalse(_target.CanRead);
+        }
+
+        [TestMethod]
+        public void CanSeekShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanSeek);
+        }
+
+        [TestMethod]
+        public void CanWriteShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanWrite);
+        }
+
+        [TestMethod]
+        public void CanTimeoutShouldReturnTrue()
+        {
+            Assert.IsTrue(_target.CanTimeout);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var actual = _target.Position;
+
+            Assert.AreEqual(0L, actual);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadShouldThrowNotSupportedException()
+        {
+            var buffer = new byte[_readBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.Read(buffer, 0, buffer.Length);
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void ReadByteShouldThrowNotSupportedException()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            try
+            {
+                _target.ReadByte();
+                Assert.Fail();
+            }
+            catch (NotSupportedException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("Read not supported.", ex.Message);
+            }
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartWritingAtBeginningOfFile()
+        {
+            var buffer = new byte[_writeBufferSize];
+
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
+
+            _target.Write(buffer, 0, buffer.Length);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0UL, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
+        }
+
+        [TestMethod]
+        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, false), Times.Once);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
index 6c2e8bef1..aafe4735c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Dispose_Closed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
index 0e3e7ff23..a5480a763 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Dispose_Disposed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
index e28edf0fc..2738a9a3c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Dispose_SessionNotOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -29,12 +28,11 @@ public void Setup()
         protected void Arrange()
         {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
-            _bufferSize = (uint)random.Next(1, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
index 5db317a83..83c317e56 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Dispose_SessionOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,10 +30,9 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
index dc6b7668a..37b4af9cf 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Finalize_SessionOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -31,10 +30,9 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
@@ -42,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
index 43e461157..70057ca10 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -14,7 +13,6 @@ public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataIn
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -37,12 +35,11 @@ public void TearDown()
         protected void Arrange()
         {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _path = random.Next().ToString();
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
-            _bufferSize = (uint)random.Next(1, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
@@ -51,8 +48,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false))
-                            .Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
index 01648a752..34f04a37d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
@@ -18,7 +18,6 @@ public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataIn
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -44,7 +43,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(5, 1000);
             _readBufferSize = (uint) random.Next(10, 100);
             _writeBufferSize = (uint) random.Next(10, 100);
@@ -58,8 +56,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false))
-                            .Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
index dbaccba9b..5e8cf08c5 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Closed.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_SetLength_Closed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint)random.Next(1, 1000);
             _readBufferSize = (uint)random.Next(0, 1000);
             _writeBufferSize = (uint)random.Next(0, 1000);
@@ -43,7 +41,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
index 9b8d341ad..e49cda8ff 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -14,7 +13,6 @@ public class SftpFileStreamTest_SetLength_Disposed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -30,12 +28,11 @@ public void Setup()
         protected void Arrange()
         {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
-            _bufferSize = (uint)random.Next(1, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
@@ -43,7 +40,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
index 381990f99..c4d85bade 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_SetLength_SessionNotOpen
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -46,7 +44,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
index 4668daf6b..b4c3b297b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccess
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
@@ -46,7 +44,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
index f6d8c3905..0fde319a1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -14,7 +15,6 @@ public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -22,6 +22,15 @@ public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite
         private long _length;
         private long _lengthPassedToRequestFSetStat;
 
+        private DateTime _fileAttributesLastAccessTime;
+        private DateTime _fileAttributesLastWriteTime;
+        private long _fileAttributesSize;
+        private int _fileAttributesUserId;
+        private int _fileAttributesGroupId;
+        private uint _fileAttributesPermissions;
+        private IDictionary<string, string> _fileAttributesExtensions;
+        private SftpFileAttributes _fileAttributes;
+
         [TestInitialize]
         public void Setup()
         {
@@ -34,19 +43,32 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
 
+            _fileAttributesLastAccessTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesLastWriteTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesSize = random.Next();
+            _fileAttributesUserId = random.Next();
+            _fileAttributesGroupId = random.Next();
+            _fileAttributesPermissions = (uint) random.Next();
+            _fileAttributesExtensions = new Dictionary<string, string>();
+            _fileAttributes = new SftpFileAttributes(_fileAttributesLastAccessTime,
+                                                     _fileAttributesLastWriteTime,
+                                                     _fileAttributesSize,
+                                                     _fileAttributesUserId,
+                                                     _fileAttributesGroupId,
+                                                     _fileAttributesPermissions,
+                                                     _fileAttributesExtensions);
+
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _sequence = new MockSequence();
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
@@ -56,6 +78,9 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.IsOpen)
                 .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestFStat(_handle, false))
+                .Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
                 .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _lengthPassedToRequestFSetStat = attributes.Size);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
index d4e1ad067..ce2619a5b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -14,7 +15,6 @@ public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -22,6 +22,15 @@ public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite
         private long _length;
         private long _lengthPassedToRequestFSetStat;
 
+        private DateTime _fileAttributesLastAccessTime;
+        private DateTime _fileAttributesLastWriteTime;
+        private long _fileAttributesSize;
+        private int _fileAttributesUserId;
+        private int _fileAttributesGroupId;
+        private uint _fileAttributesPermissions;
+        private IDictionary<string, string> _fileAttributesExtensions;
+        private SftpFileAttributes _fileAttributes;
+
         [TestInitialize]
         public void Setup()
         {
@@ -34,19 +43,32 @@ protected void Arrange()
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
 
+            _fileAttributesLastAccessTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesLastWriteTime = DateTime.Now.AddSeconds(random.Next());
+            _fileAttributesSize = random.Next();
+            _fileAttributesUserId = random.Next();
+            _fileAttributesGroupId = random.Next();
+            _fileAttributesPermissions = (uint)random.Next();
+            _fileAttributesExtensions = new Dictionary<string, string>();
+            _fileAttributes = new SftpFileAttributes(_fileAttributesLastAccessTime,
+                                                     _fileAttributesLastWriteTime,
+                                                     _fileAttributesSize,
+                                                     _fileAttributesUserId,
+                                                     _fileAttributesGroupId,
+                                                     _fileAttributesPermissions,
+                                                     _fileAttributesExtensions);
+
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _sequence = new MockSequence();
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
@@ -56,11 +78,14 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.IsOpen)
                 .Returns(true);
+            _sftpSessionMock.InSequence(_sequence)
+                .Setup(p => p.RequestFStat(_handle, false))
+                .Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
                 .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _lengthPassedToRequestFSetStat = attributes.Size);
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
+            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int) _bufferSize);
         }
 
         protected void Act()
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
index de3788460..1a9a0e175 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
@@ -16,7 +16,6 @@ public class SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWr
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -57,7 +56,6 @@ protected void Arrange()
             _random = new Random();
             _path = _random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) _random.Next(byte.MinValue, byte.MaxValue)};
-            _fileAttributes = SftpFileAttributes.Empty;
             _bufferSize = (uint) _random.Next(1, 1000);
             _readBufferSize = (uint) _random.Next(0, 1000);
             _writeBufferSize = (uint) _random.Next(500, 1000);
@@ -80,7 +78,6 @@ protected void Arrange()
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
                 .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence).Setup(p => p.RequestFStat(_handle, false)).Returns(_fileAttributes);
             _sftpSessionMock.InSequence(_sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
                 .Returns(_readBufferSize);
diff --git a/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
new file mode 100644
index 000000000..9003fc3d7
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Common
+{
+    public class SftpFileAttributesBuilder
+    {
+        private DateTime? _lastAccessTime;
+        private DateTime? _lastWriteTime;
+        private long? _size;
+        private int? _userId;
+        private int? _groupId;
+        private uint? _permissions;
+        private IDictionary<string, string> _extensions;
+
+        public SftpFileAttributesBuilder WithLastAccessTime(DateTime lastAccessTime)
+        {
+            _lastAccessTime = lastAccessTime;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithLastWriteTime(DateTime lastWriteTime)
+        {
+            _lastWriteTime = lastWriteTime;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithSize(long size)
+        {
+            _size = size;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithUserId(int userId)
+        {
+            _userId = userId;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithGroupId(int groupId)
+        {
+            _groupId = groupId;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithPermissions(uint permissions)
+        {
+            _permissions = permissions;
+            return this;
+        }
+
+        public SftpFileAttributesBuilder WithExtensions(IDictionary<string, string> extensions)
+        {
+            _extensions = extensions;
+            return this;
+        }
+
+        public SftpFileAttributes Build()
+        {
+            if (_lastAccessTime == null)
+                throw new ArgumentException();
+            if (_lastWriteTime == null)
+                throw new ArgumentException();
+            if (_size == null)
+                throw new ArgumentException();
+            if (_userId == null)
+                throw new ArgumentException();
+            if (_groupId == null)
+                throw new ArgumentException();
+            if (_permissions == null)
+                throw new ArgumentException();
+
+            return new SftpFileAttributes(_lastAccessTime.Value,
+                                          _lastWriteTime.Value,
+                                          _size.Value,
+                                          _userId.Value,
+                                          _groupId.Value,
+                                          _permissions.Value,
+                                          _extensions);
+        }
+
+
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index ee56eadad..2bfb02e1b 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -356,6 +356,7 @@
     <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_ChunkAvailable.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTestBase.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs" />
@@ -378,6 +379,26 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_SessionNotOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_SessionOpen.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileAccessInvalid.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeInvalid.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_SessionNotOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_SessionOpen.cs" />
@@ -426,6 +447,8 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileTest.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestRead.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestStatVfs.cs" />
@@ -482,6 +505,7 @@
     <Compile Include="Classes\Common\PipeStream_Close_BlockingWrite.cs" />
     <Compile Include="Classes\Common\PipeStream_Flush_BytesRemainingAfterRead.cs" />
     <Compile Include="Classes\Common\PipeStream_Flush_NoBytesRemainingAfterRead.cs" />
+    <Compile Include="Common\SftpFileAttributesBuilder.cs" />
     <Compile Include="Common\TestBase.cs" />
     <Compile Include="Classes\Compression\CompressorTest.cs" />
     <Compile Include="Classes\Common\DerDataTest.cs" />

From d3635d18fa68b54412df98ebd2199ce7bb63a0d6 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 18:47:01 +0100
Subject: [PATCH 080/128] Added test for recently introduced regression that is
 fixed by PR #186.

---
 .../Classes/Sftp/SftpFileStreamTestBase.cs    |   2 +-
 ...aInWriteBufferAndNoDataInReadBuffer_Eof.cs |   1 +
 ...fer_LessDataThanReadBufferSizeAvailable.cs |   1 +
 ...InReaderBufferAndReadMoreBytesThanCount.cs | 120 ++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                 |   1 +
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
index 6efaeb75d..a77222cfb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
@@ -10,7 +10,7 @@ public abstract class SftpFileStreamTestBase
         internal Mock<ISftpSession> SftpSessionMock;
         protected MockSequence MockSequence;
 
-        private void Arrange()
+        protected virtual void Arrange()
         {
             SetupData();
             CreateMocks();
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
index 70057ca10..b27a45d54 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
@@ -26,6 +26,7 @@ public void Setup()
             Act();
         }
 
+        [TestCleanup]
         public void TearDown()
         {
             _sftpSessionMock.InSequence(_sequence)
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
index 34f04a37d..7130ad2ba 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
@@ -32,6 +32,7 @@ public void Setup()
             Act();
         }
 
+        [TestCleanup]
         public void TearDown()
         {
             _sftpSessionMock.InSequence(_sequence)
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs
new file mode 100644
index 000000000..d1956e654
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs
@@ -0,0 +1,120 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _target;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private int _actual;
+        private byte[] _buffer;
+        private byte[] _serverData;
+        private int _numberOfBytesInReadBuffer;
+        private int _numberOfBytesToRead;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = 500;
+
+            _numberOfBytesToRead = 20;
+            _buffer = new byte[_numberOfBytesToRead];
+            _numberOfBytesInReadBuffer = 10;
+            _serverData = GenerateRandom(_buffer.Length + _numberOfBytesInReadBuffer, random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.IsOpen)
+                .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(_serverData);
+        }
+
+        [TestCleanup]
+        public void TearDown()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Read(_buffer, 0, _numberOfBytesToRead);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveReturnedTheNumberOfBytesWrittenToBuffer()
+        {
+            Assert.AreEqual(_buffer.Length, _actual);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveWrittenBytesToTheCallerSuppliedBuffer()
+        {
+            Assert.IsTrue(_serverData.Take(_buffer.Length).IsEqualTo(_buffer));
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnNumberOfBytesWrittenToBuffer()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_buffer.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumberOfRemainingBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            _buffer = new byte[_numberOfBytesInReadBuffer];
+
+            var actual = _target.Read(_buffer, 0, _numberOfBytesInReadBuffer);
+
+            Assert.AreEqual(_numberOfBytesInReadBuffer, actual);
+            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesInReadBuffer).IsEqualTo(_buffer));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 2bfb02e1b..9c58e2f97 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -439,6 +439,7 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionNotOpen.cs" />

From ff78430ed481550aa744295b960afa6d67391b69 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 18:54:28 +0100
Subject: [PATCH 081/128] Move null check into FEATURE_THREAD_THREADPOOL
 section.

---
 src/Renci.SshNet/Abstractions/ThreadAbstraction.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
index fe6e3e218..471750306 100644
--- a/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/ThreadAbstraction.cs
@@ -36,9 +36,10 @@ public static void ExecuteThreadLongRunning(Action action)
         /// <param name="action">The action to execute.</param>
         public static void ExecuteThread(Action action)
         {
+#if FEATURE_THREAD_THREADPOOL
             if (action == null)
                 throw new ArgumentNullException("action");
-#if FEATURE_THREAD_THREADPOOL
+
             System.Threading.ThreadPool.QueueUserWorkItem(o => action());
 #elif FEATURE_THREAD_TAP
             System.Threading.Tasks.Task.Run(action);

From 14b571fdd4d7020060cf3c502e41f1d19125dbf3 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 5 Mar 2017 21:42:37 +0100
Subject: [PATCH 082/128] Update tests now that we reject invalid combination
 of FileMode and FileAccess. Remove duplicate tests.

---
 ...treamTest_CanRead_Closed_FileAccessRead.cs |  68 ++---
 ...Test_CanRead_Closed_FileAccessReadWrite.cs |  68 ++---
 ...reamTest_CanRead_Closed_FileAccessWrite.cs |  68 ++---
 ...eamTest_CanRead_Disposed_FileAccessRead.cs |  74 +++---
 ...st_CanRead_Disposed_FileAccessReadWrite.cs |  74 +++---
 ...amTest_CanRead_Disposed_FileAccessWrite.cs |  74 +++---
 ...Test_CanRead_SessionOpen_FileAccessRead.cs |  70 -----
 ...CanRead_SessionOpen_FileAccessReadWrite.cs |  70 -----
 ...est_CanRead_SessionOpen_FileAccessWrite.cs |  70 -----
 ...reamTest_CanWrite_Closed_FileAccessRead.cs |  74 +++---
 ...est_CanWrite_Closed_FileAccessReadWrite.cs |  74 +++---
 ...eamTest_CanWrite_Closed_FileAccessWrite.cs |  74 +++---
 ...amTest_CanWrite_Disposed_FileAccessRead.cs |  74 +++---
 ...t_CanWrite_Disposed_FileAccessReadWrite.cs |  74 +++---
 ...mTest_CanWrite_Disposed_FileAccessWrite.cs |  71 +++--
 ...est_CanWrite_SessionOpen_FileAccessRead.cs |  70 -----
 ...anWrite_SessionOpen_FileAccessReadWrite.cs |  70 -----
 ...st_CanWrite_SessionOpen_FileAccessWrite.cs |  70 -----
 .../Sftp/SftpFileStreamTest_Close_Closed.cs   |   5 +-
 .../Sftp/SftpFileStreamTest_Close_Disposed.cs |  75 +++---
 ...SftpFileStreamTest_Close_SessionNotOpen.cs |  72 ++---
 .../SftpFileStreamTest_Close_SessionOpen.cs   |  69 ++---
 ...Ctor_FileModeAppend_FileAccessReadWrite.cs |  14 +-
 ...est_Ctor_FileModeAppend_FileAccessWrite.cs |  14 +-
 ...r_FileModeCreateNew_FileAccessReadWrite.cs |  14 +-
 ..._Ctor_FileModeCreateNew_FileAccessWrite.cs |  10 +-
 ...te_FileAccessReadWrite_FileDoesNotExist.cs |  18 +-
 ...deCreate_FileAccessReadWrite_FileExists.cs |  14 +-
 ...Create_FileAccessWrite_FileDoesNotExist.cs |  18 +-
 ...leModeCreate_FileAccessWrite_FileExists.cs |  10 +-
 ...tor_FileModeOpenOrCreate_FileAccessRead.cs |  10 +-
 ...ileModeOpenOrCreate_FileAccessReadWrite.cs |  10 +-
 ...or_FileModeOpenOrCreate_FileAccessWrite.cs |  14 +-
 ...amTest_Ctor_FileModeOpen_FileAccessRead.cs |  14 +-
 ...t_Ctor_FileModeOpen_FileAccessReadWrite.cs |  10 +-
 ...mTest_Ctor_FileModeOpen_FileAccessWrite.cs |  10 +-
 ...or_FileModeTruncate_FileAccessReadWrite.cs |  10 +-
 ...t_Ctor_FileModeTruncate_FileAccessWrite.cs |  10 +-
 .../Sftp/SftpFileStreamTest_Dispose_Closed.cs |  71 +++--
 .../SftpFileStreamTest_Dispose_Disposed.cs    |  71 +++--
 ...tpFileStreamTest_Dispose_SessionNotOpen.cs |  65 +++--
 .../SftpFileStreamTest_Dispose_SessionOpen.cs |  64 ++---
 ...SftpFileStreamTest_Finalize_SessionOpen.cs |  64 ++---
 ...aInWriteBufferAndNoDataInReadBuffer_Eof.cs |  82 +++---
 ...fer_LessDataThanReadBufferSizeAvailable.cs |  89 +++----
 ...FileStreamTest_SetLength_SessionNotOpen.cs |  66 +++--
 ...st_SetLength_SessionOpen_FIleAccessRead.cs |  66 +++--
 ...tGreatherThanTwoTimesTheWriteBufferSize.cs | 246 ++++++++----------
 .../Renci.SshNet.Tests.csproj                 |   6 -
 49 files changed, 1102 insertions(+), 1496 deletions(-)
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
 delete mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
index 25b8714bc..002b97b03 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Closed_FileAccessRead
+    public class SftpFileStreamTest_CanRead_Closed_FileAccessRead : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(3, random);
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
index 4fd4d45cb..b5b9b8636 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite
+    public class SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(3, random);
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
index 159708709..3817f6bcb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Closed_FileAccessWrite
+    public class SftpFileStreamTest_CanRead_Closed_FileAccessWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(3, random);
             _bufferSize = (uint) random.Next(0, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
index 00b29d0dd..bbbcb6243 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Disposed_FileAccessRead
+    public class SftpFileStreamTest_CanRead_Disposed_FileAccessRead : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
index f3b959664..93736b6fe 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite
+    public class SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
index dc6d3451b..94d6be78f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanRead_Disposed_FileAccessWrite
+    public class SftpFileStreamTest_CanRead_Disposed_FileAccessWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanRead;
+            _actual = _target.CanRead;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
deleted file mode 100644
index b0f26fe36..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanRead;
-        }
-
-        [TestMethod]
-        public void CanReadShouldReturnTrue()
-        {
-            Assert.IsTrue(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
deleted file mode 100644
index 1ab4a8a01..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanRead;
-        }
-
-        [TestMethod]
-        public void CanReadShouldReturnTrue()
-        {
-            Assert.IsTrue(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
deleted file mode 100644
index 86d30e2e0..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanRead;
-        }
-
-        [TestMethod]
-        public void CanReadShouldReturnFalse()
-        {
-            Assert.IsFalse(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
index f2ae4ac3e..932a88ab5 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Closed_FileAccessRead
+    public class SftpFileStreamTest_CanWrite_Closed_FileAccessRead : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
index 8815d01d9..9253bd763 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite
+    public class SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
index 6d435d3a8..0b630d880 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Closed_FileAccessWrite
+    public class SftpFileStreamTest_CanWrite_Closed_FileAccessWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
index b6b09fe1a..f13a072ec 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessRead
+    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessRead : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
index b1481803f..0f70b8750 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,61 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite
+    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read |Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
index 0de568a4c..1d8c3393c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,58 +7,58 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite
+    public class SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private bool _actual;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
+            _bufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.CanWrite;
+            _actual = _target.CanWrite;
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
deleted file mode 100644
index 3aa5e651b..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanWrite;
-        }
-
-        [TestMethod]
-        public void CaWriteShouldReturnFalse()
-        {
-            Assert.IsFalse(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
deleted file mode 100644
index 1aa7a0114..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.ReadWrite, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanWrite;
-        }
-
-        [TestMethod]
-        public void CanWriteShouldReturnTrue()
-        {
-            Assert.IsTrue(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
deleted file mode 100644
index fbea2d753..000000000
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Renci.SshNet.Sftp;
-
-namespace Renci.SshNet.Tests.Classes.Sftp
-{
-    [TestClass]
-    public class SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite
-    {
-        private Mock<ISftpSession> _sftpSessionMock;
-        private string _path;
-        private SftpFileStream _sftpFileStream;
-        private byte[] _handle;
-        private uint _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private bool _actual;
-
-        [TestInitialize]
-        public void Setup()
-        {
-            Arrange();
-            Act();
-        }
-
-        protected void Arrange()
-        {
-            var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(0, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
-
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int)_bufferSize);
-        }
-
-        protected void Act()
-        {
-            _actual = _sftpFileStream.CanWrite;
-        }
-
-        [TestMethod]
-        public void CanWriteShouldReturnTrue()
-        {
-            Assert.IsTrue(_actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
index 80bb277d3..760b65eae 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Closed.cs
@@ -14,7 +14,6 @@ public class SftpFileStreamTest_Close_Closed
         private string _path;
         private SftpFileStream _sftpFileStream;
         private byte[] _handle;
-        private SftpFileAttributes _fileAttributes;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
@@ -39,7 +38,7 @@ protected void Arrange()
 
             var sequence = new MockSequence();
             _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
+                .Setup(p => p.RequestOpen(_path, Flags.Read, false))
                 .Returns(_handle);
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
@@ -53,7 +52,7 @@ protected void Arrange()
             _sftpSessionMock.InSequence(sequence)
                 .Setup(p => p.RequestClose(_handle));
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Open, FileAccess.Read, (int)_bufferSize);
             _sftpFileStream.Close();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
index bc0a0cb93..08a3399ea 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,69 +7,69 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Close_Disposed
+    public class SftpFileStreamTest_Close_Disposed : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(1, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(2, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Close();
+            _target.Close();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
index 71c2d1e01..0d3dc1b22 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,66 +7,69 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Close_SessionNotOpen
+    public class SftpFileStreamTest_Close_SessionNotOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
-            _bufferSize = (uint)random.Next(1, 1000);
-            _readBufferSize = (uint)random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(2, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(false);
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(false);
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Close();
+            _target.Close();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldNeverBeInvoked()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
index 94c2aea1a..c2ec5c4c1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs
@@ -8,68 +8,71 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Close_SessionOpen
+    public class SftpFileStreamTest_Close_SessionOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int) _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Close();
+            _target.Close();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
index 9e641ad22..4af2e540a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
@@ -46,8 +46,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
                            .Returns(_readBufferSize);
@@ -55,13 +55,17 @@ protected override void SetupMocks()
                            .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
                            .Returns(_writeBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestFStat(_handle, false))
-                            .Returns(_fileAttributes);
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
index 2461898da..0a581c4d2 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
@@ -46,8 +46,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -55,13 +55,17 @@ protected override void SetupMocks()
                            .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestFStat(_handle, false))
-                            .Returns(_fileAttributes);
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
index d2caefe19..f6aaa13db 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs
@@ -37,19 +37,23 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
index cb3eab4ac..541fb21ef 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
index f57ae4634..c7800b954 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
@@ -37,22 +37,26 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                            .Returns((byte[]) null);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
+                           .Returns((byte[]) null);
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNew, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
index 8952c9ff6..d4354d840 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs
@@ -37,19 +37,23 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, true))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
index 8b542690d..846cbe7ea 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
@@ -37,22 +37,26 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                            .Returns((byte[])null);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
+                           .Returns((byte[]) null);
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
index 58cd8b589..3fa061f05 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
index 060eb2fae..b69a11dfb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs
@@ -36,8 +36,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -48,7 +48,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
index fc65dad35..033be06a6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNewOrOpen, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
index e8578e8a1..5c30c3764 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs
@@ -37,19 +37,23 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNewOrOpen, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
index 63ad26197..f9445ea8a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs
@@ -36,19 +36,23 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
index 866a4fb30..1ad153c95 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
index 3f7759b1a..f48093acc 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
index 2b59c320a..d7fafaf9a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Truncate, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
index c149d6975..8638b26f8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs
@@ -37,8 +37,8 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                            .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, false))
-                            .Returns(_handle);
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, false))
+                           .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
@@ -49,7 +49,11 @@ protected override void SetupMocks()
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         _fileMode,
+                                         _fileAccess,
+                                         _bufferSize);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
index aafe4735c..2bfe54285 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,69 +7,69 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Dispose_Closed
+    public class SftpFileStreamTest_Dispose_Closed : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(random.Next(1, 5), random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int) _bufferSize);
-            _sftpFileStream.Close();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Close();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Dispose();
+            _target.Dispose();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
index a5480a763..2fccf0483 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,69 +7,69 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Dispose_Disposed
+    public class SftpFileStreamTest_Dispose_Disposed : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(1, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint)random.Next(0, 1000);
+            _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int) _bufferSize);
-            _sftpFileStream.Dispose();
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.OpenOrCreate,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+            _target.Dispose();
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Dispose();
+            _target.Dispose();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
index 2738a9a3c..d340b4034 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,68 +7,68 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Dispose_SessionNotOpen
+    public class SftpFileStreamTest_Dispose_SessionNotOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
             _path = random.Next().ToString();
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.CreateNew, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(false);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(false);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.CreateNew,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Dispose();
+            _target.Dispose();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldNeverBeInvoked()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
index 83c317e56..35563fcc1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs
@@ -8,68 +8,68 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Dispose_SessionOpen
+    public class SftpFileStreamTest_Dispose_SessionOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int) _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Truncate,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _sftpFileStream.Dispose();
+            _target.Dispose();
         }
 
         [TestMethod]
         public void IsOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldBeInvokedOnce()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
index 37b4af9cf..41312f668 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs
@@ -8,55 +8,55 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Finalize_SessionOpen
+    public class SftpFileStreamTest_Finalize_SessionOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _handle = GenerateRandom(7, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            var sequence = new MockSequence();
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(sequence)
-                .Setup(p => p.RequestClose(_handle));
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int) _bufferSize);
-            _sftpFileStream = null;
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.OpenOrCreate,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target = null;
         }
 
-        protected void Act()
+        protected override void Act()
         {
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -65,13 +65,13 @@ protected void Act()
         [TestMethod]
         public void IsOpenOnSftpSessionShouldNeverBeInvoked()
         {
-            _sftpSessionMock.Verify(p => p.IsOpen, Times.Never);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Never);
         }
 
         [TestMethod]
         public void RequestCloseOnSftpSessionShouldNeverBeInvoked()
         {
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Never);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
index b27a45d54..75da00bd7 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs
@@ -7,67 +7,65 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof
+    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private int _actual;
-        private MockSequence _sequence;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void TearDown()
-        {
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestClose(_handle));
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
             _path = random.Next().ToString();
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _handle = GenerateRandom(1, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(new byte[0]);
+        }
 
-            _sequence = new MockSequence();
+        [TestCleanup]
+        public void TearDown()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
-                .Returns(new byte[0]);
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.ReadByte();
+            _actual = _target.ReadByte();
         }
 
         [TestMethod]
@@ -79,11 +77,9 @@ public void ReadByteShouldReturnMinusOne()
         [TestMethod]
         public void PositionShouldReturnZero()
         {
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(0L, _sftpFileStream.Position);
+            Assert.AreEqual(0L, _target.Position);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
index 7130ad2ba..442c7d3d8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using Renci.SshNet.Abstractions;
 using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
@@ -12,70 +10,67 @@ namespace Renci.SshNet.Tests.Classes.Sftp
     /// Test for issue #173.
     /// </summary>
     [TestClass]
-    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable
+    public class SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
         private int _actual;
         private byte[] _data;
-        private MockSequence _sequence;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
-
-        [TestCleanup]
-        public void TearDown()
-        {
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestClose(_handle));
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
             _bufferSize = (uint) random.Next(5, 1000);
             _readBufferSize = (uint) random.Next(10, 100);
             _writeBufferSize = (uint) random.Next(10, 100);
-            _data = new byte[_readBufferSize - 2];
-            CryptoAbstraction.GenerateRandom(_data);
+            _data = GenerateRandom((int) _readBufferSize - 2, random);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_data);
+        }
 
-            _sequence = new MockSequence();
+        [TestCleanup]
+        public void TearDown()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestClose(_handle));
+        }
 
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
-                .Returns(_data);
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Read, (int)_bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
-            _actual = _sftpFileStream.ReadByte();
+            _actual = _target.ReadByte();
         }
 
         [TestMethod]
@@ -87,11 +82,9 @@ public void ReadByteShouldReturnFirstByteThatWasReadFromServer()
         [TestMethod]
         public void PositionShouldReturnOne()
         {
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(1L, _sftpFileStream.Position);
+            Assert.AreEqual(1L, _target.Position);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
index c4d85bade..8304db053 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,65 +7,60 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_SetLength_SessionNotOpen
+    public class SftpFileStreamTest_SetLength_SessionNotOpen : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
-        private MockSequence _sequence;
         private long _length;
         private ObjectDisposedException _actualException;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] { (byte)random.Next(byte.MinValue, byte.MaxValue) };
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(4, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(false);
+        }
 
-            _sequence = new MockSequence();
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(false);
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(
-                _sftpSessionMock.Object,
-                _path,
-                FileMode.Create,
-                FileAccess.Read,
-                (int)_bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
             try
             {
-                _sftpFileStream.SetLength(_length);
+                _target.SetLength(_length);
                 Assert.Fail();
             }
             catch (ObjectDisposedException ex)
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
index b4c3b297b..047beb1eb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -8,65 +7,60 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccess
+    public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccess : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
         private uint _writeBufferSize;
-        private MockSequence _sequence;
         private long _length;
         private NotSupportedException _actualException;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        protected void Arrange()
-        {
             var random = new Random();
-            _path = random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(0, 1000);
             _writeBufferSize = (uint) random.Next(0, 1000);
             _length = random.Next();
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+        }
 
-            _sequence = new MockSequence();
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
+        protected override void Arrange()
+        {
+            base.Arrange();
 
-            _sftpFileStream = new SftpFileStream(
-                _sftpSessionMock.Object,
-                _path,
-                FileMode.Create,
-                FileAccess.Read,
-                (int) _bufferSize);
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
         }
 
-        protected void Act()
+        protected override void Act()
         {
             try
             {
-                _sftpFileStream.SetLength(_length);
+                _target.SetLength(_length);
                 Assert.Fail();
             }
             catch (NotSupportedException ex)
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
index 1a9a0e175..ce4288498 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
@@ -10,11 +10,10 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize
+    public class SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize : SftpFileStreamTestBase
     {
-        private Mock<ISftpSession> _sftpSessionMock;
+        private SftpFileStream _target;
         private string _path;
-        private SftpFileStream _sftpFileStream;
         private byte[] _handle;
         private uint _bufferSize;
         private uint _readBufferSize;
@@ -22,122 +21,126 @@ public class SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWr
         private byte[] _data;
         private int _count;
         private int _offset;
-        private MockSequence _sequence;
         private Random _random;
         private uint _expectedWrittenByteCount;
         private int _expectedBufferedByteCount;
         private byte[] _expectedBufferedBytes;
 
-        [TestInitialize]
-        public void Setup()
+        protected override void SetupData()
         {
-            Arrange();
-            Act();
-        }
+            base.SetupData();
 
-        [TestCleanup]
-        public void TearDown()
-        {
-            if (_sftpSessionMock != null)
-            {
-                // allow Dispose to complete successfully
-                _sftpSessionMock.InSequence(_sequence)
-                    .Setup(p => p.IsOpen)
-                    .Returns(true);
-                _sftpSessionMock.InSequence(_sequence)
-                    .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null));
-                _sftpSessionMock.InSequence(_sequence)
-                    .Setup(p => p.RequestClose(_handle));
-            }
-        }
-
-        protected void Arrange()
-        {
             _random = new Random();
             _path = _random.Next().ToString(CultureInfo.InvariantCulture);
-            _handle = new[] {(byte) _random.Next(byte.MinValue, byte.MaxValue)};
-            _bufferSize = (uint) _random.Next(1, 1000);
+            _handle = GenerateRandom(5, _random);
+            _bufferSize = (uint)_random.Next(1, 1000);
             _readBufferSize = (uint) _random.Next(0, 1000);
             _writeBufferSize = (uint) _random.Next(500, 1000);
-            _data = new byte[(_writeBufferSize  * 2) + 15];
+            _data = new byte[(_writeBufferSize * 2) + 15];
             _random.NextBytes(_data);
             _offset = _random.Next(1, 5);
             // to get multiple SSH_FXP_WRITE messages (and verify the offset is updated correctly), we make sure
             // the number of bytes to write is at least two times the write buffer size; we write a few extra bytes to
             // ensure the buffer is not empty after the writes so we can verify whether Length, Dispose and Flush
             // flush the buffer
-            _count = ((int) _writeBufferSize*2) + _random.Next(1, 5);
+            _count = ((int) _writeBufferSize * 2) + _random.Next(1, 5);
 
             _expectedWrittenByteCount = (2 * _writeBufferSize);
             _expectedBufferedByteCount = (int)(_count - _expectedWrittenByteCount);
             _expectedBufferedBytes = _data.Take(_offset + (int)_expectedWrittenByteCount, _expectedBufferedByteCount);
+        }
 
-            _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
-
-            _sequence = new MockSequence();
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
-                .Returns(_handle);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
-                .Returns(_readBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
-                .Returns(_writeBufferSize);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.IsOpen)
-                .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestWrite(_handle, 0, _data, _offset, (int) _writeBufferSize, It.IsAny<AutoResetEvent>(), null));
-            _sftpSessionMock.InSequence(_sequence)
-                .Setup(p => p.RequestWrite(_handle, _writeBufferSize, _data, _offset + (int) _writeBufferSize, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null));
-
-            _sftpFileStream = new SftpFileStream(_sftpSessionMock.Object, _path, FileMode.Create, FileAccess.Write, (int) _bufferSize);
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Truncate, true))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, 0, _data, _offset, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, _writeBufferSize, _data, _offset + (int)_writeBufferSize, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null));
         }
 
-        protected void Act()
+        [TestCleanup]
+        public void TearDown()
         {
-            _sftpFileStream.Write(_data, _offset, _count);
+            if (SftpSessionMock != null)
+            {
+                // allow Dispose to complete successfully
+                SftpSessionMock.InSequence(MockSequence)
+                               .Setup(p => p.IsOpen)
+                               .Returns(true);
+                SftpSessionMock.InSequence(MockSequence)
+                               .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null));
+                SftpSessionMock.InSequence(MockSequence)
+                               .Setup(p => p.RequestClose(_handle));
+            }
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Create,
+                                         FileAccess.Write,
+                                         (int) _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _target.Write(_data, _offset, _count);
         }
 
         [TestMethod]
         public void RequestWriteOnSftpSessionShouldBeInvokedTwice()
         {
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, 0, _data, _offset, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null), Times.Once);
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _writeBufferSize, _data, _offset + (int)_writeBufferSize, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, 0, _data, _offset, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, _writeBufferSize, _data, _offset + (int)_writeBufferSize, (int)_writeBufferSize, It.IsAny<AutoResetEvent>(), null), Times.Once);
         }
 
         [TestMethod]
         public void PositionShouldBeNumberOfBytesWrittenToFileAndNUmberOfBytesInBuffer()
         {
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(_count, _sftpFileStream.Position);
+            Assert.AreEqual(_count, _target.Position);
         }
 
         [TestMethod]
         public void LengthShouldFlushBufferAndReturnSizeOfFile()
         {
-            var lengthFileAttributes = new SftpFileAttributes(DateTime.Now, DateTime.Now, _random.Next(), _random.Next(),
-                                                        _random.Next(), (uint) _random.Next(0, int.MaxValue), null);
+            var lengthFileAttributes = new SftpFileAttributes(DateTime.Now,
+                                                              DateTime.Now,
+                                                              _random.Next(),
+                                                              _random.Next(),
+                                                              _random.Next(),
+                                                              (uint) _random.Next(0, int.MaxValue),
+                                                              null);
             byte[] actualFlushedData = null;
 
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
-                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestFStat(_handle, true))
-                            .Returns(lengthFileAttributes);
-
-            Assert.AreEqual(lengthFileAttributes.Size, _sftpFileStream.Length);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestFStat(_handle, true))
+                           .Returns(lengthFileAttributes);
+
+            Assert.AreEqual(lengthFileAttributes.Size, _target.Length);
             Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
 
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
         }
 
         [TestMethod]
@@ -146,20 +149,20 @@ public void LengthShouldThrowIOExceptionIfRequestFStatReturnsNull()
             const SftpFileAttributes lengthFileAttributes = null;
             byte[] actualFlushedData = null;
 
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
-                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestFStat(_handle, true))
-                            .Returns(lengthFileAttributes);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestFStat(_handle, true))
+                           .Returns(lengthFileAttributes);
 
             try
             {
-                var length = _sftpFileStream.Length;
-                Assert.Fail();
+                var length = _target.Length;
+                Assert.Fail("Length should have failed, but returned: " + length + ".");
             }
             catch (IOException ex)
             {
@@ -169,62 +172,29 @@ public void LengthShouldThrowIOExceptionIfRequestFStatReturnsNull()
 
             Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
 
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
         }
 
-        [TestMethod]
-        public void LengthShouldThrowIOExceptionIfSizeIsMinusOne()
-        {
-            var lengthFileAttributes = new SftpFileAttributes(DateTime.Now, DateTime.Now, -1, _random.Next(), _random.Next(), (uint)_random.Next(0, int.MaxValue), null);
-            byte[] actualFlushedData = null;
-
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
-                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestFStat(_handle, true))
-                            .Returns(lengthFileAttributes);
-
-            try
-            {
-                var length = _sftpFileStream.Length;
-                Assert.Fail();
-            }
-            catch (IOException ex)
-            {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual("Seek operation failed.", ex.Message);
-            }
-
-            Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
-
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
-        }
-
-
         [TestMethod]
         public void DisposeShouldFlushBufferAndCloseRequest()
         {
             byte[] actualFlushedData = null;
 
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
-                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestClose(_handle));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
 
-            _sftpFileStream.Dispose();
+            _target.Dispose();
 
             Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
 
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
-            _sftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestClose(_handle), Times.Once);
         }
 
         [TestMethod]
@@ -232,18 +202,18 @@ public void FlushShouldFlushBuffer()
         {
             byte[] actualFlushedData = null;
 
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.IsOpen)
-                            .Returns(true);
-            _sftpSessionMock.InSequence(_sequence)
-                            .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
-                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverFileOffset, data, offset, length, wait, writeCompleted) => actualFlushedData = data.Take(offset, length));
 
-            _sftpFileStream.Flush();
+            _target.Flush();
 
             Assert.IsTrue(actualFlushedData.IsEqualTo(_expectedBufferedBytes));
 
-            _sftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, _expectedWrittenByteCount, It.IsAny<byte[]>(), 0, _expectedBufferedByteCount, It.IsAny<AutoResetEvent>(), null), Times.Once);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 9c58e2f97..881e6ab50 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -363,18 +363,12 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Close_SessionNotOpen.cs" />

From b3e704b404f630056faaebb2c585a87cac13bf0b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Sun, 5 Mar 2017 21:56:38 +0100
Subject: [PATCH 083/128] Sync .NET 3.5 test project file, and remove usage of
 string interpolation.

---
 .../Renci.SshNet.Tests.NET35.csproj           | 101 ++++++++++++++----
 ...Test_Ctor_FileModeAppend_FileAccessRead.cs |   2 +-
 ...t_Ctor_FileModeCreateNew_FileAccessRead.cs |   2 +-
 ...Test_Ctor_FileModeCreate_FileAccessRead.cs |   2 +-
 ...st_Ctor_FileModeTruncate_FileAccessRead.cs |   2 +-
 5 files changed, 86 insertions(+), 23 deletions(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 193e98625..2c350023e 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1064,6 +1064,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs">
       <Link>Classes\Sftp\SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTestBase.cs">
+      <Link>Classes\Sftp\SftpFileStreamTestBase.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs</Link>
     </Compile>
@@ -1082,15 +1085,6 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessRead.cs</Link>
-    </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessReadWrite.cs</Link>
-    </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanRead_SessionOpen_FileAccessWrite.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs</Link>
     </Compile>
@@ -1109,15 +1103,6 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessRead.cs</Link>
-    </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessReadWrite.cs</Link>
-    </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_CanWrite_SessionOpen_FileAccessWrite.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Close_Closed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Close_Closed.cs</Link>
     </Compile>
@@ -1130,6 +1115,72 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Close_SessionOpen.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Close_SessionOpen.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileAccessInvalid.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileAccessInvalid.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessReadWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessReadWrite_FileExists.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeCreate_FileAccessWrite_FileExists.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeInvalid.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeInvalid.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessReadWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpenOrCreate_FileAccessWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessReadWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeOpen_FileAccessWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessReadWrite.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessWrite.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Dispose_Closed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Dispose_Closed.cs</Link>
     </Compile>
@@ -1145,6 +1196,15 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs</Link>
     </Compile>
@@ -1313,6 +1373,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Common\HttpRequest.cs">
       <Link>Common\HttpRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Common\SftpFileAttributesBuilder.cs">
+      <Link>Common\SftpFileAttributesBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Common\TestBase.cs">
       <Link>Common\TestBase.cs</Link>
     </Compile>
@@ -1388,7 +1451,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
index 5b553edb2..4da49ac7d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
@@ -48,7 +48,7 @@ public void CtorShouldHaveThrownArgumentException()
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.AreEqual(string.Format("Combining {0}: {1} with {2}: {3} is invalid.", typeof(FileMode).Name, _fileMode, typeof(FileAccess).Name, _fileAccess), _actualException.Message);
             Assert.IsNull(_actualException.ParamName);
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
index 2663e113a..bce4afba1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreateNew_FileAccessRead.cs
@@ -48,7 +48,7 @@ public void CtorShouldHaveThrownArgumentException()
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.AreEqual(string.Format("Combining {0}: {1} with {2}: {3} is invalid.", typeof(FileMode).Name, _fileMode, typeof(FileAccess).Name, _fileAccess), _actualException.Message);
             Assert.IsNull(_actualException.ParamName);
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
index 244e59fca..493e48192 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeCreate_FileAccessRead.cs
@@ -48,7 +48,7 @@ public void CtorShouldHaveThrownArgumentException()
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.AreEqual(string.Format("Combining {0}: {1} with {2}: {3} is invalid.", typeof(FileMode).Name, _fileMode, typeof(FileAccess).Name, _fileAccess), _actualException.Message);
             Assert.IsNull(_actualException.ParamName);
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
index fd0497559..c0a216671 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeTruncate_FileAccessRead.cs
@@ -48,7 +48,7 @@ public void CtorShouldHaveThrownArgumentException()
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual($"Combining {nameof(FileMode)}: {_fileMode} with {nameof(FileAccess)}: {_fileAccess} is invalid.", _actualException.Message);
+            Assert.AreEqual(string.Format("Combining {0}: {1} with {2}: {3} is invalid.", typeof(FileMode).Name, _fileMode, typeof(FileAccess).Name, _fileAccess), _actualException.Message);
             Assert.IsNull(_actualException.ParamName);
         }
     }

From 6cb91f600dec2008dd3b4320f57949a6da6590f3 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 6 Mar 2017 21:52:53 +0100
Subject: [PATCH 084/128] Update README.md

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 21e11db1c..9e37928d0 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,21 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * Windows Phone 8.0
 * Universal Windows Platform 10
 
+##Usage
+Establish an SFTP connection using both password and public-key authentication:
+
+```cs
+var connectionInfo = new ConnectionInfo("sftp.foo.com",
+                                        "guest",
+                                        new PasswordAuthenticationMethod("guest", "pwd"),
+                                        new PrivateKeyAuthenticationMethod("rsa.key"));
+using (var client = new SftpClient(connectionInfo))
+{
+    client.Connect();
+}
+
+```
+
 ##Building SSH.NET
 
 Software                          | net35 | net40 | netstandard1.3 | sl4 | sl5 | wp71 | wp8 | uap10.0 |

From f6daa4dfa6b6c33073ee1342083be67ef74bd155 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 8 Mar 2017 19:44:44 +0100
Subject: [PATCH 085/128] Enable HandleShouldHaveBeenClosed test.

---
 .../SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
index 0c3d7d237..f00b25e29 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -109,6 +109,7 @@ public void ReadAfterDisposeShouldThrowObjectDisposedException()
             }
         }
 
+        [TestMethod]
         public void HandleShouldHaveBeenClosed()
         {
             SftpSessionMock.Verify(p => p.BeginClose(_handle, null, null), Times.Once);

From 5f1494f09e99e8a3473361aaf5cc8f0cc9bd6955 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 8 Mar 2017 20:00:13 +0100
Subject: [PATCH 086/128] Added test to verify that dispose has completed.

---
 ...est_DisposeShouldUnblockReadAndReadAhead.cs | 18 ++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
index f00b25e29..522c10cd7 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -22,6 +22,16 @@ public class SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead : SftpFileR
         private SftpCloseAsyncResult _closeAsyncResult;
         private SftpFileReader _reader;
         private ObjectDisposedException _actualException;
+        private ManualResetEvent _disposeCompleted;
+
+        [TestCleanup]
+        public void TearDown()
+        {
+            if (_disposeCompleted != null)
+            {
+                _disposeCompleted.Dispose();
+            }
+        }
 
         protected override void SetupData()
         {
@@ -32,6 +42,7 @@ protected override void SetupData()
             _waitHandleArray = new WaitHandle[2];
             _operationTimeout = random.Next(10000, 20000);
             _closeAsyncResult = new SftpCloseAsyncResult(null, null);
+            _disposeCompleted = new ManualResetEvent(false);
         }
 
         protected override void SetupMocks()
@@ -74,6 +85,7 @@ protected override void Act()
             {
                 Thread.Sleep(500);
                 _reader.Dispose();
+                _disposeCompleted.Set();
             });
 
             try
@@ -87,6 +99,12 @@ protected override void Act()
             }
         }
 
+        [TestMethod]
+        public void DisposeShouldHaveCompleted()
+        {
+            Assert.IsTrue(_disposeCompleted.WaitOne(0));
+        }
+
         [TestMethod]
         public void ReadShouldHaveThrownObjectDisposedException()
         {
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 881e6ab50..7e3f83cf7 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>TRACE;DEBUG;FEATURE_THREAD_COUNTDOWNEVENT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

From d93f064c0f22b5f4a794bab0832fe0f46acfc072 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 8 Mar 2017 20:13:11 +0100
Subject: [PATCH 087/128] Attempt to harden test.

---
 ...FileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
index 522c10cd7..9ce2eccc0 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs
@@ -97,12 +97,10 @@ protected override void Act()
             {
                 _actualException = ex;
             }
-        }
 
-        [TestMethod]
-        public void DisposeShouldHaveCompleted()
-        {
-            Assert.IsTrue(_disposeCompleted.WaitOne(0));
+            // Dispose may unblock Read() before the dispose has fully completed, so
+            // let's wait until it has completed
+            _disposeCompleted.WaitOne(500);
         }
 
         [TestMethod]

From 0d88ddc79ca2928663a073f468d2925a5cdeab70 Mon Sep 17 00:00:00 2001
From: olegkap <olegkap@gmail.com>
Date: Fri, 10 Mar 2017 22:05:15 -0500
Subject: [PATCH 088/128] Update SftFileStream to work correctly with mixed
 Read, Write and Seek operation, complete rewrite #194

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 1034 +++++++++++++----------
 1 file changed, 593 insertions(+), 441 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index fbc4d4674..175ed7fe4 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -3,34 +3,33 @@
 using System.Threading;
 using System.Diagnostics.CodeAnalysis;
 using Renci.SshNet.Common;
+using System.Diagnostics.Contracts;
 
 namespace Renci.SshNet.Sftp
 {
     /// <summary>
-    /// Exposes a <see cref="Stream"/> around a remote SFTP file, supporting both synchronous and asynchronous read and write operations.
+    /// 
     /// </summary>
+    /// <seealso cref="System.IO.Stream" />
     public class SftpFileStream : Stream
     {
-        //  TODO:   Add security method to set userid, groupid and other permission settings
-        // Internal state.
-        private byte[] _handle;
-        private ISftpSession _session;
+        private ulong _serverPosition;
 
-        // Buffer information.
-        private readonly int _readBufferSize;
-        private readonly byte[] _readBuffer;
-        private readonly int _writeBufferSize;
-        private readonly byte[] _writeBuffer;
-        private int _bufferPosition;
-        private int _bufferLen;
-        private long _position;
-        private bool _bufferOwnedByWrite;
+        private byte[] _buffer;   // Shared read/write buffer.  Alloc on first use.
         private bool _canRead;
-        private bool _canSeek;
         private bool _canWrite;
-        private ulong _serverFilePosition;
+        private bool _canSeek;
+
+        private int _readPos;     // Read pointer within shared buffer.
+        private int _readLen;     // Number of bytes read in buffer from file.
+        private int _writePos;    // Write pointer within shared buffer.
+        private int _bufferSize;  // Length of internal buffer, if it's allocated.
+
+        private byte[] _handle;
+        private ISftpSession _session;
 
-        private readonly object _lock = new object();
+        private long _pos;        // Cache current location in the file.
+        private long _appendStart;// When appending, prevent overwriting file.
 
         /// <summary>
         /// Gets a value indicating whether the current stream supports reading.
@@ -88,29 +87,17 @@ public override long Length
         {
             get
             {
-                // Lock down the file stream while we do this.
-                lock (_lock)
-                {
-                    CheckSessionIsOpen();
+                EnsureSessionIsOpen();
 
-                    if (!CanSeek)
-                        throw new NotSupportedException("Seek operation is not supported.");
-
-                    // Flush the write buffer, because it may
-                    // affect the length of the stream.
-                    if (_bufferOwnedByWrite)
-                    {
-                        FlushWriteBuffer();
-                    }
+                if (!CanSeek)
+                    throw new NotSupportedException("Seek operation is not supported.");
 
-                    // obtain file attributes
-                    var attributes = _session.RequestFStat(_handle, true);
-                    if (attributes != null)
-                    {
-                        return attributes.Size;
-                    }
-                    throw new IOException("Seek operation failed.");
+                var attributes = _session.RequestFStat(_handle, true);
+                if (attributes != null)
+                {
+                    return attributes.Size;
                 }
+                throw new IOException("Seek operation failed.");
             }
         }
 
@@ -125,13 +112,26 @@ public override long Position
         {
             get
             {
-                CheckSessionIsOpen();
+                EnsureSessionIsOpen();
+
                 if (!CanSeek)
-                    throw new NotSupportedException("Seek operation not supported.");
-                return _position;
+                    throw new NotSupportedException("Seek operation is not supported.");
+
+                Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+
+                // Compensate for buffer that we read from the handle (_readLen) Vs what the user
+                // read so far from the internel buffer (_readPos). Of course add any unwrittern  
+                // buffered data
+                return _pos + (_readPos - _readLen + _writePos);
             }
             set
             {
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException("value");
+
+                if (_writePos > 0) FlushWrite(false);
+                _readPos = 0;
+                _readLen = 0;
                 Seek(value, SeekOrigin.Begin);
             }
         }
@@ -155,6 +155,12 @@ public virtual byte[] Handle
             get
             {
                 Flush();
+                // Explicitly dump any buffered data, since the user could move our
+                // position or write to the file.
+                _readPos = 0;
+                _readLen = 0;
+                _writePos = 0;
+                _buffer = null;
                 return _handle;
             }
         }
@@ -167,23 +173,40 @@ public virtual byte[] Handle
         /// </value>
         public TimeSpan Timeout { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SftpFileStream" /> class.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="path">The path.</param>
+        /// <param name="mode">The mode.</param>
+        /// <param name="access">The access.</param>
+        /// <param name="bufferSize">Size of the buffer.</param>
+        /// <exception cref="System.ArgumentException">handle</exception>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// access
+        /// or
+        /// bufferSize
+        /// </exception>
         internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAccess access, int bufferSize)
         {
-            if (session == null)
-                throw new SshConnectionException("Client not connected.");
-            if (path == null)
-                throw new ArgumentNullException("path");
-            if (bufferSize <= 0)
-                throw new ArgumentOutOfRangeException("bufferSize");
-
             Timeout = TimeSpan.FromSeconds(30);
             Name = path;
 
-            // Initialize the object state.
             _session = session;
-            _canRead = (access & FileAccess.Read) != 0;
+
+            // Now validate arguments.
+            if (access < FileAccess.Read || access > FileAccess.ReadWrite)
+                throw new ArgumentOutOfRangeException("access");
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize");
+
+            _canRead = 0 != (access & FileAccess.Read);
+            _canWrite = 0 != (access & FileAccess.Write);
             _canSeek = true;
-            _canWrite = (access & FileAccess.Write) != 0;
+
+            _readPos = 0;
+            _readLen = 0;
+            _writePos = 0;
 
             var flags = Flags.None;
 
@@ -252,17 +275,14 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             // instead of using the specified buffer size as is, we use it to calculate a buffer size
             // that ensures we always receive or send the max. number of bytes in a single SSH_FXP_READ
             // or SSH_FXP_WRITE message
+            _bufferSize = (int)session.CalculateOptimalWriteLength((uint)bufferSize, _handle);
 
-            _readBufferSize = (int) session.CalculateOptimalReadLength((uint) bufferSize);
-            _readBuffer = new byte[_readBufferSize];
-            _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint) bufferSize, _handle);
-            _writeBuffer = new byte[_writeBufferSize];
+            _pos = 0;
+            _appendStart = -1;
 
             if (mode == FileMode.Append)
             {
-                var attributes = _session.RequestFStat(_handle, false);
-                _position = attributes.Size;
-                _serverFilePosition = (ulong) attributes.Size;
+                _appendStart = SeekCore(0, SeekOrigin.End);
             }
         }
 
@@ -272,7 +292,15 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
         /// </summary>
         ~SftpFileStream()
         {
-            Dispose(false);
+            if (_handle != null)
+            {
+                //BCLDebug.Correctness(_handle.IsClosed, "You didn't close a FileStream & it got finalized.  Name: \"" + _fileName + "\"");
+                if (_session.IsOpen)
+                {
+                    throw new InvalidOperationException("You didn't close a SftpFileStream & it got finalized.");
+                }
+                Dispose(false);
+            }
         }
 
         /// <summary>
@@ -282,542 +310,666 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
         /// <exception cref="ObjectDisposedException">Stream is closed.</exception>
         public override void Flush()
         {
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
+            // This code is duplicated in Dispose
+            EnsureSessionIsOpen();
 
-                if (_bufferOwnedByWrite)
-                {
-                    FlushWriteBuffer();
-                }
-                else
-                {
-                    FlushReadBuffer();
-                }
-            }
+            FlushInternalBuffer();
         }
 
         /// <summary>
         /// Reads a sequence of bytes from the current stream and advances the position within the stream by the
         /// number of bytes read.
         /// </summary>
-        /// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset"/> and (<paramref name="offset"/> + <paramref name="count"/> - 1) replaced by the bytes read from the current source.</param>
-        /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin storing the data read from the current stream.</param>
+        /// <param name="array">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset" /> and (<paramref name="offset" /> + <paramref name="count" /> - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="array" /> at which to begin storing the data read from the current stream.</param>
         /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
         /// <returns>
         /// The total number of bytes read into the buffer. This can be less than the number of bytes requested
         /// if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
         /// </returns>
-        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>. </exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
-        /// <exception cref="IOException">An I/O error occurs. </exception>
-        /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
-        public override int Read(byte[] buffer, int offset, int count)
+        /// <exception cref="System.ArgumentNullException">array</exception>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// offset
+        /// or
+        /// count
+        /// </exception>
+        /// <exception cref="System.ArgumentException">Invalid array range.</exception>
+        /// <exception cref="System.NotSupportedException">Read operation is not supported.</exception>
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset" /> and <paramref name="count" /> is larger than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="array" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> or <paramref name="count" /> is negative.</exception>
+        /// <exception cref="IOException">An I/O error occurs.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support reading.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        public override int Read(byte[] array, int offset, int count)
         {
-            var readLen = 0;
-
-            if (buffer == null)
-                throw new ArgumentNullException("buffer");
+            if (array == null)
+                throw new ArgumentNullException("array");
             if (offset < 0)
                 throw new ArgumentOutOfRangeException("offset");
             if (count < 0)
                 throw new ArgumentOutOfRangeException("count");
-            if ((buffer.Length - offset) < count)
+            if (array.Length - offset < count)
                 throw new ArgumentException("Invalid array range.");
 
-            // Lock down the file stream while we do this.
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
+            EnsureSessionIsOpen();
+
+            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
 
-                // Set up for the read operation.
-                SetupRead();
+            bool isBlocked = false;
+            int n = _readLen - _readPos;
+            // if the read buffer is empty, read into either user's array or our
+            // buffer, depending on number of bytes user asked for and buffer size.
+            if (n == 0)
+            {
+                if (!CanRead)
+                    throw new NotSupportedException("Read operation is not supported.");
 
-                // Read data into the caller's buffer.
-                while (count > 0)
+                if (_writePos > 0) FlushWrite(false);
+                if (!CanSeek || (count >= _bufferSize))
                 {
-                    // How much data do we have available in the buffer?
-                    var bytesAvailableInBuffer = _bufferLen - _bufferPosition;
-                    if (bytesAvailableInBuffer <= 0)
-                    {
-                        _bufferPosition = 0;
-                        _bufferLen = 0;
-
-                        var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
-
-                        // TODO: don't we need to take into account the number of bytes read (data.Length) ?
-                        _serverFilePosition = (ulong) _position;
-
-                        if (data.Length == 0)
-                        {
-                            break;
-                        }
-
-                        // determine number of bytes that we can read into caller-provided buffer
-                        var bytesToWriteToCallerBuffer = Math.Min(data.Length, count);
-                        // write bytes to caller-provided buffer
-                        Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
-                        // advance offset to start writing bytes into caller-provided buffer
-                        offset += bytesToWriteToCallerBuffer;
-                        // update number of bytes left to read
-                        count -= bytesToWriteToCallerBuffer;
-                        // record total number of bytes read into caller-provided buffer
-                        readLen += bytesToWriteToCallerBuffer;
-                        // update stream position
-                        _position += bytesToWriteToCallerBuffer;
-
-                        if (data.Length > bytesToWriteToCallerBuffer)
-                        {
-                            // copy remaining bytes to read buffer
-                            _bufferLen = data.Length - bytesToWriteToCallerBuffer;
-                            Buffer.BlockCopy(data, bytesToWriteToCallerBuffer, _readBuffer, 0, _bufferLen);
-                        }
-                    }
-                    else
-                    {
-                        // determine number of bytes that we can write from read buffer to caller-provided buffer
-                        var bytesToWriteToCallerBuffer = Math.Min(bytesAvailableInBuffer, count);
-                        // copy data from read buffer to the caller-provided buffer
-                        Buffer.BlockCopy(_readBuffer, _bufferPosition, buffer, offset, bytesToWriteToCallerBuffer);
-                        // update position in read buffer
-                        _bufferPosition += bytesToWriteToCallerBuffer;
-                        // advance offset to start writing bytes into caller-provided buffer
-                        offset += bytesAvailableInBuffer;
-                        // update number of bytes left to read
-                        count -= bytesToWriteToCallerBuffer;
-                        // record total number of bytes read into caller-provided buffer
-                        readLen += bytesToWriteToCallerBuffer;
-                        // update stream position
-                        _position += bytesToWriteToCallerBuffer;
-                    }
+                    n = ReadCore(array, offset, count);
+                    // Throw away read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
+                    return n;
                 }
+                if (_buffer == null)
+                    _buffer = new byte[_bufferSize];
+                n = ReadCore(_buffer, 0, _bufferSize);
+                if (n == 0) return 0;
+                isBlocked = n < _bufferSize;
+                _readPos = 0;
+                _readLen = n;
             }
+            // Now copy min of count or numBytesAvailable (ie, near EOF) to array.
+            if (n > count) n = count;
+            Buffer.BlockCopy(_buffer, _readPos, array, offset, n);
+
+            _readPos += n;
 
-            // Return the number of bytes that were read to the caller.
-            return readLen;
+            // We may have read less than the number of bytes the user asked 
+            // for, but that is part of the Stream contract.  Reading again for
+            // more data may cause us to block if we're using a device with 
+            // no clear end of file, such as a serial port or pipe.  If we
+            // blocked here & this code was used with redirected pipes for a
+            // process's standard output, this can lead to deadlocks involving
+            // two processes. But leave this here for files to avoid what would
+            // probably be a breaking change.         -- 
+
+
+
+            return n;
         }
 
         /// <summary>
         /// Reads a byte from the stream and advances the position within the stream by one byte, or returns -1 if at the end of the stream.
         /// </summary>
         /// <returns>
-        /// The unsigned byte cast to an <see cref="int"/>, or -1 if at the end of the stream.
+        /// The unsigned byte cast to an <see cref="int" />, or -1 if at the end of the stream.
         /// </returns>
-        /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="System.NotSupportedException">Read is not supported.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support reading.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         /// <exception cref="IOException">Read operation failed.</exception>
         public override int ReadByte()
         {
-            // Lock down the file stream while we do this.
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
-
-                // Setup the object for reading.
-                SetupRead();
-
-                // Read more data into the internal buffer if necessary.
-                if (_bufferPosition >= _bufferLen)
-                {
-                    _bufferPosition = 0;
-
-                    var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
-
-                    _bufferLen = data.Length;
-                    _serverFilePosition = (ulong) _position;
-
-                    if (_bufferLen == 0)
-                    {
-                        // We've reached EOF.
-                        return -1;
-                    }
+            EnsureSessionIsOpen();
 
-                    Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
-                }
-
-                // Extract the next byte from the buffer.
-                ++_position;
-                return _readBuffer[_bufferPosition++];
+            if (_readLen == 0 && !CanRead)
+                throw new NotSupportedException("Read is not supported.");
+            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
+            if (_readPos == _readLen)
+            {
+                if (_writePos > 0) FlushWrite(false);
+                Contract.Assert(_bufferSize > 0, "_bufferSize > 0");
+                if (_buffer == null)
+                    _buffer = new byte[_bufferSize];
+                _readLen = ReadCore(_buffer, 0, _bufferSize);
+                _readPos = 0;
             }
+            if (_readPos == _readLen)
+                return -1;
+
+            int result = _buffer[_readPos];
+            _readPos++;
+            return result;
         }
 
         /// <summary>
         /// Sets the position within the current stream.
         /// </summary>
-        /// <param name="offset">A byte offset relative to the <paramref name="origin"/> parameter.</param>
-        /// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
+        /// <param name="offset">A byte offset relative to the <paramref name="origin" /> parameter.</param>
+        /// <param name="origin">A value of type <see cref="SeekOrigin" /> indicating the reference point used to obtain the new position.</param>
         /// <returns>
         /// The new position within the current stream.
         /// </returns>
-        /// <exception cref="IOException">An I/O error occurs. </exception>
-        /// <exception cref="NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output. </exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="System.ArgumentException">Invalid seek origin.</exception>
+        /// <exception cref="System.NotSupportedException">Seek is not supported.</exception>
+        /// <exception cref="System.IO.IOException">Unable seek backward to overwrite data that previously existed in a file opened in Append mode.</exception>
+        /// <exception cref="IOException">An I/O error occurs.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         public override long Seek(long offset, SeekOrigin origin)
         {
-            long newPosn = -1;
+            if (origin < SeekOrigin.Begin || origin > SeekOrigin.End)
+                throw new ArgumentException("Invalid seek origin.");
 
-            // Lock down the file stream while we do this.
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
+            EnsureSessionIsOpen();
 
-                if (!CanSeek)
-                    throw new NotSupportedException("Seek is not supported.");
+            if (!CanSeek)
+                throw new NotSupportedException("Seek is not supported.");
 
-                // Don't do anything if the position won't be moving.
-                if (origin == SeekOrigin.Begin && offset == _position)
-                {
-                    return offset;
-                }
-                if (origin == SeekOrigin.Current && offset == 0)
-                {
-                    return _position;
-                }
+            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
 
-                // The behaviour depends upon the read/write mode.
-                if (_bufferOwnedByWrite)
-                {
-                    // Flush the write buffer and then seek.
-                    FlushWriteBuffer();
+            // If we've got bytes in our buffer to write, write them out.
+            // If we've read in and consumed some bytes, we'll have to adjust
+            // our seek positions ONLY IF we're seeking relative to the current
+            // position in the stream.  This simulates doing a seek to the new
+            // position, then a read for the number of bytes we have in our buffer.
+            if (_writePos > 0)
+            {
+                FlushWrite(false);
+            }
+            else if (origin == SeekOrigin.Current)
+            {
+                // Don't call FlushRead here, which would have caused an infinite
+                // loop.  Simply adjust the seek origin.  This isn't necessary
+                // if we're seeking relative to the beginning or end of the stream.
+                offset -= (_readLen - _readPos);
+            }
 
-                    switch (origin)
-                    {
-                        case SeekOrigin.Begin:
-                            newPosn = offset;
-                            break;
-                        case SeekOrigin.Current:
-                            newPosn = _position + offset;
-                            break;
-                        case SeekOrigin.End:
-                            var attributes = _session.RequestFStat(_handle, false);
-                            newPosn = attributes.Size - offset;
-                            break;
-                    }
+            long oldPos = _pos + (_readPos - _readLen);
+            long pos = SeekCore(offset, origin);
+
+            // Prevent users from overwriting data in a file that was opened in
+            // append mode.
+            if (_appendStart != -1 && pos < _appendStart)
+            {
+                SeekCore(oldPos, SeekOrigin.Begin);
+                throw new IOException("Unable seek backward to overwrite data that previously existed in a file opened in Append mode.");
+            }
 
-                    if (newPosn == -1)
+            // We now must update the read buffer.  We can in some cases simply
+            // update _readPos within the buffer, copy around the buffer so our 
+            // Position property is still correct, and avoid having to do more 
+            // reads from the disk.  Otherwise, discard the buffer's contents.
+            if (_readLen > 0)
+            {
+                // We can optimize the following condition:
+                // oldPos - _readPos <= pos < oldPos + _readLen - _readPos
+                if (oldPos == pos)
+                {
+                    if (_readPos > 0)
                     {
-                        throw new EndOfStreamException("End of stream.");
+                        //Console.WriteLine("Seek: seeked for 0, adjusting buffer back by: "+_readPos+"  _readLen: "+_readLen);
+                        Buffer.BlockCopy(_buffer, _readPos, _buffer, 0, _readLen - _readPos);
+                        _readLen -= _readPos;
+                        _readPos = 0;
                     }
-                    _position = newPosn;
-                    _serverFilePosition = (ulong)newPosn;
+                    // If we still have buffered data, we must update the stream's 
+                    // position so our Position property is correct.
+                    if (_readLen > 0)
+                        SeekCore(_readLen, SeekOrigin.Current);
+                }
+                else if (oldPos - _readPos < pos && pos < oldPos + _readLen - _readPos)
+                {
+                    int diff = (int)(pos - oldPos);
+                    //Console.WriteLine("Seek: diff was "+diff+", readpos was "+_readPos+"  adjusting buffer - shrinking by "+ (_readPos + diff));
+                    Buffer.BlockCopy(_buffer, _readPos + diff, _buffer, 0, _readLen - (_readPos + diff));
+                    _readLen -= (_readPos + diff);
+                    _readPos = 0;
+                    if (_readLen > 0)
+                        SeekCore(_readLen, SeekOrigin.Current);
                 }
                 else
                 {
-                    // Determine if the seek is to somewhere inside
-                    // the current read buffer bounds.
-                    if (origin == SeekOrigin.Begin)
-                    {
-                        newPosn = _position - _bufferPosition;
-                        if (offset >= newPosn && offset <
-                                (newPosn + _bufferLen))
-                        {
-                            _bufferPosition = (int)(offset - newPosn);
-                            _position = offset;
-                            return _position;
-                        }
-                    }
-                    else if (origin == SeekOrigin.Current)
-                    {
-                        newPosn = _position + offset;
-                        if (newPosn >= (_position - _bufferPosition) &&
-                           newPosn < (_position - _bufferPosition + _bufferLen))
-                        {
-                            _bufferPosition =
-                                (int)(newPosn - (_position - _bufferPosition));
-                            _position = newPosn;
-                            return _position;
-                        }
-                    }
-
-                    // Abandon the read buffer.
-                    _bufferPosition = 0;
-                    _bufferLen = 0;
-
-                    // Seek to the new position.
-                    switch (origin)
-                    {
-                        case SeekOrigin.Begin:
-                            newPosn = offset;
-                            break;
-                        case SeekOrigin.Current:
-                            newPosn = _position + offset;
-                            break;
-                        case SeekOrigin.End:
-                            var attributes = _session.RequestFStat(_handle, false);
-                            newPosn = attributes.Size - offset;
-                            break;
-                    }
-
-                    if (newPosn < 0)
-                    {
-                        throw new EndOfStreamException();
-                    }
-
-                    _position = newPosn;
+                    // Lose the read buffer.
+                    _readPos = 0;
+                    _readLen = 0;
                 }
-                return _position;
+                Contract.Assert(_readLen >= 0 && _readPos <= _readLen, "_readLen should be nonnegative, and _readPos should be less than or equal _readLen");
+                Contract.Assert(pos == Position, "Seek optimization: pos != Position!  Buffer math was mangled.");
             }
+            return pos;
         }
 
         /// <summary>
         /// When overridden in a derived class, sets the length of the current stream.
         /// </summary>
         /// <param name="value">The desired length of the current stream in bytes.</param>
+        /// <exception cref="System.ArgumentOutOfRangeException">value</exception>
+        /// <exception cref="System.NotSupportedException">
+        /// Seek operation is not supported.
+        /// or
+        /// Write operation is not supported.
+        /// </exception>
+        /// <exception cref="System.IO.IOException">Unable to truncate data that previously existed in a file opened in Append mode.</exception>
         /// <exception cref="IOException">An I/O error occurs.</exception>
         /// <exception cref="NotSupportedException">The stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output.</exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="value"/> must be greater than zero.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="value" /> must be greater than zero.</exception>
         public override void SetLength(long value)
         {
             if (value < 0)
                 throw new ArgumentOutOfRangeException("value");
 
-            // Lock down the file stream while we do this.
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
-
-                if (!CanSeek)
-                    throw new NotSupportedException("Seek is not supported.");
+            EnsureSessionIsOpen();
 
-                SetupWrite();
+            if (!CanSeek)
+                throw new NotSupportedException("Seek operation is not supported.");
+            if (!CanWrite)
+                throw new NotSupportedException("Write operation is not supported.");
 
-                var attributes = _session.RequestFStat(_handle, false);
-                attributes.Size = value;
-                _session.RequestFSetStat(_handle, attributes);
+            // Handle buffering updates.
+            if (_writePos > 0)
+            {
+                FlushWrite(false);
             }
+            else if (_readPos < _readLen)
+            {
+                FlushRead();
+            }
+            _readPos = 0;
+            _readLen = 0;
+
+            if (_appendStart != -1 && value < _appendStart)
+                throw new IOException("Unable to truncate data that previously existed in a file opened in Append mode.");
+            SetLengthCore(value);
         }
 
         /// <summary>
         /// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
         /// </summary>
-        /// <param name="buffer">An array of bytes. This method copies <paramref name="count"/> bytes from <paramref name="buffer"/> to the current stream.</param>
-        /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin copying bytes to the current stream.</param>
+        /// <param name="array">An array of bytes. This method copies <paramref name="count" /> bytes from <paramref name="array" /> to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="array" /> at which to begin copying bytes to the current stream.</param>
         /// <param name="count">The number of bytes to be written to the current stream.</param>
-        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is greater than the buffer length.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
+        /// <exception cref="System.ArgumentNullException">array</exception>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// offset
+        /// or
+        /// count
+        /// </exception>
+        /// <exception cref="System.ArgumentException">Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</exception>
+        /// <exception cref="System.NotSupportedException">Write is not supported.</exception>
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset" /> and <paramref name="count" /> is greater than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="array" /> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> or <paramref name="count" /> is negative.</exception>
         /// <exception cref="IOException">An I/O error occurs.</exception>
         /// <exception cref="NotSupportedException">The stream does not support writing.</exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-        public override void Write(byte[] buffer, int offset, int count)
+        public override void Write(byte[] array, int offset, int count)
         {
-            if (buffer == null)
-                throw new ArgumentNullException("buffer");
+            if (array == null)
+                throw new ArgumentNullException("array");
             if (offset < 0)
                 throw new ArgumentOutOfRangeException("offset");
             if (count < 0)
                 throw new ArgumentOutOfRangeException("count");
-            if ((buffer.Length - offset) < count)
-                throw new ArgumentException("Invalid array range.");
+            if (array.Length - offset < count)
+                throw new ArgumentException("Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.");
+
+            EnsureSessionIsOpen();
 
-            // Lock down the file stream while we do this.
-            lock (_lock)
+            if (_writePos == 0)
             {
-                CheckSessionIsOpen();
+                // Ensure we can write to the stream, and ready buffer for writing.
+                if (!CanWrite)
+                    throw new NotSupportedException("Write is not supported.");
 
-                // Setup this object for writing.
-                SetupWrite();
+                if (_readPos < _readLen) FlushRead();
+                _readPos = 0;
+                _readLen = 0;
+            }
 
-                // Write data to the file stream.
-                while (count > 0)
+            // If our buffer has data in it, copy data from the user's array into
+            // the buffer, and if we can fit it all there, return.  Otherwise, write
+            // the buffer to disk and copy any remaining data into our buffer.
+            // The assumption here is memcpy is cheaper than disk (or net) IO.
+            // (10 milliseconds to disk vs. ~20-30 microseconds for a 4K memcpy)
+            // So the extra copying will reduce the total number of writes, in 
+            // non-pathological cases (ie, write 1 byte, then write for the buffer 
+            // size repeatedly)
+            if (_writePos > 0)
+            {
+                int numBytes = _bufferSize - _writePos;   // space left in buffer
+                if (numBytes > 0)
                 {
-                    // Determine how many bytes we can write to the buffer.
-                    var tempLen = _writeBufferSize - _bufferPosition;
-                    if (tempLen <= 0)
-                    {
-                        // flush write buffer, and mark it empty
-                        FlushWriteBuffer();
-                        // we can now write or buffer the full buffer size
-                        tempLen = _writeBufferSize;
-                    }
-
-                    // limit the number of bytes to write to the actual number of bytes requested
-                    if (tempLen > count)
-                    {
-                        tempLen = count;
-                    }
-
-                    // Can we short-cut the internal buffer?
-                    if (_bufferPosition == 0 && tempLen == _writeBufferSize)
-                    {
-                        using (var wait = new AutoResetEvent(false))
-                        {
-                            _session.RequestWrite(_handle, _serverFilePosition, buffer, offset, tempLen, wait);
-                            _serverFilePosition += (ulong) tempLen;
-                        }
-                    }
-                    else
-                    {
-                        // No: copy the data to the write buffer first.
-                        Buffer.BlockCopy(buffer, offset, _writeBuffer, _bufferPosition, tempLen);
-                        _bufferPosition += tempLen;
-                    }
-
-                    // Advance the buffer and stream positions.
-                    _position += tempLen;
-                    offset += tempLen;
-                    count -= tempLen;
+                    if (numBytes > count)
+                        numBytes = count;
+                    Buffer.BlockCopy(array, offset, _buffer, _writePos, numBytes);
+                    _writePos += numBytes;
+                    if (count == numBytes) return;
+                    offset += numBytes;
+                    count -= numBytes;
                 }
+                // Reset our buffer.  We essentially want to call FlushWrite
+                // without calling Flush on the underlying Stream.
 
-                // If the buffer is full, then do a speculative flush now,
-                // rather than waiting for the next call to this method.
-                if (_bufferPosition >= _writeBufferSize)
-                {
-                    using (var wait = new AutoResetEvent(false))
-                    {
-                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                        _serverFilePosition += (ulong) _bufferPosition;
-                    }
-
-                    _bufferPosition = 0;
-                }
+                WriteCore(_buffer, 0, _writePos);
+                _writePos = 0;
+                _buffer = null;
             }
+            // If the buffer would slow writes down, avoid buffer completely.
+            if (count >= _bufferSize)
+            {
+                Contract.Assert(_writePos == 0, "FileStream cannot have buffered data to write here!  Your stream will be corrupted.");
+                WriteCore(array, offset, count);
+                return;
+            }
+            else if (count == 0)
+                return;  // Don't allocate a buffer then call memcpy for 0 bytes.
+            if (_buffer == null)
+                _buffer = new byte[_bufferSize];
+            // Copy remaining bytes into buffer, to write at a later date.
+            Buffer.BlockCopy(array, offset, _buffer, _writePos, count);
+            _writePos = count;
+            return;
         }
 
         /// <summary>
         /// Writes a byte to the current position in the stream and advances the position within the stream by one byte.
         /// </summary>
         /// <param name="value">The byte to write to the stream.</param>
-        /// <exception cref="IOException">An I/O error occurs. </exception>
-        /// <exception cref="NotSupportedException">The stream does not support writing, or the stream is already closed. </exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="System.NotSupportedException">Write operation is not supported.</exception>
+        /// <exception cref="IOException">An I/O error occurs.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support writing, or the stream is already closed.</exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         public override void WriteByte(byte value)
         {
-            // Lock down the file stream while we do this.
-            lock (_lock)
-            {
-                CheckSessionIsOpen();
-
-                // Setup the object for writing.
-                SetupWrite();
-
-                // Flush the current buffer if it is full.
-                if (_bufferPosition >= _writeBufferSize)
-                {
-                    using (var wait = new AutoResetEvent(false))
-                    {
-                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                        _serverFilePosition += (ulong) _bufferPosition;
-                    }
-
-                    _bufferPosition = 0;
-                }
+            EnsureSessionIsOpen();
 
-                // Write the byte into the buffer and advance the posn.
-                _writeBuffer[_bufferPosition++] = value;
-                ++_position;
+            if (_writePos == 0)
+            {
+                if (!CanWrite)
+                    throw new NotSupportedException("Write operation is not supported.");
+
+                if (_readPos < _readLen) FlushRead();
+                _readPos = 0;
+                _readLen = 0;
+                Contract.Assert(_bufferSize > 0, "_bufferSize > 0");
+                if (_buffer == null)
+                    _buffer = new byte[_bufferSize];
             }
+            if (_writePos == _bufferSize)
+                FlushWrite(false);
+
+            _buffer[_writePos] = value;
+            _writePos++;
         }
 
         /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="Stream"/> and optionally releases the managed resources.
+        /// Releases the unmanaged resources used by the <see cref="SftpFileStream" /> and optionally releases the managed resources.
         /// </summary>
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
-
-            if (_session != null)
+            // Nothing will be done differently based on whether we are 
+            // disposing vs. finalizing.  This is taking advantage of the
+            // weak ordering between normal finalizable objects & critical
+            // finalizable objects, which I included in the SafeHandle 
+            // design for FileStream, which would often "just work" when 
+            // finalized.
+            try
             {
-                if (disposing)
+
+                if (_handle != null && _session.IsOpen)
                 {
-                    lock (_lock)
+                    // Flush data to disk iff we were writing.  After 
+                    // thinking about this, we also don't need to flush
+                    // our read position, regardless of whether the handle
+                    // was exposed to the user.  They probably would NOT 
+                    // want us to do this.
+                    if (_writePos > 0)
                     {
-                        if (_session != null)
-                        {
-                            _canRead = false;
-                            _canSeek = false;
-                            _canWrite = false;
-
-                            if (_handle != null)
-                            {
-                                if (_session.IsOpen)
-                                {
-                                    if (_bufferOwnedByWrite)
-                                    {
-                                        FlushWriteBuffer();
-                                    }
-
-                                    _session.RequestClose(_handle);
-                                }
-
-                                _handle = null;
-                            }
-
-                            _session = null;
-                        }
+                        FlushWrite(!disposing);
                     }
                 }
             }
+            finally
+            {
+                if (_handle != null && _session.IsOpen)
+                {
+                    _session.RequestClose(_handle);
+                    _handle = null;
+                }
+
+                _canRead = false;
+                _canWrite = false;
+                _canSeek = false;
+                // Don't set the buffer to null, to avoid a NullReferenceException
+                // when users have a race condition in their code (ie, they call
+                // Close when calling another method on Stream like Read).
+                //_buffer = null;
+                base.Dispose(disposing);
+            }
+        }
+
+        private void FlushInternalBuffer()
+        {
+            if (_writePos > 0)
+            {
+                FlushWrite(false);
+            }
+            else if (_readPos < _readLen && CanSeek)
+            {
+                FlushRead();
+            }
+        }
+
+        // Reading is done by blocks from the file, but someone could read
+        // 1 byte from the buffer then write.  At that point, the OS's file
+        // pointer is out of sync with the stream's position.  All write 
+        // functions should call this function to preserve the position in the file.
+        private void FlushRead()
+        {
+            Contract.Assert(_writePos == 0, "FileStream: Write buffer must be empty in FlushRead!");
+            if (_readPos - _readLen != 0)
+            {
+                Contract.Assert(CanSeek, "FileStream will lose buffered read data now.");
+                SeekCore(_readPos - _readLen, SeekOrigin.Current);
+            }
+            _readPos = 0;
+            _readLen = 0;
+        }
+
+        // Writes are buffered.  Anytime the buffer fills up 
+        // (_writePos + delta > _bufferSize) or the buffer switches to reading
+        // and there is left over data (_writePos > 0), this function must be called.
+        private void FlushWrite(bool calledFromFinalizer)
+        {
+            Contract.Assert(_readPos == 0 && _readLen == 0, "FileStream: Read buffer must be empty in FlushWrite!");
+
+            WriteCore(_buffer, 0, _writePos);
+
+            _writePos = 0;
+            _buffer = null;
+        }
+
+        // We absolutely need this method broken out so that BeginWriteCore can call
+        // a method without having to go through buffering code that might call
+        // FlushWrite.
+        private void SetLengthCore(long value)
+        {
+            Contract.Assert(value >= 0, "value >= 0");
+            long origPos = _pos;
+
+            if (_pos != value)
+                SeekCore(value, SeekOrigin.Begin);
+
+            //  TODO:   Oleg - Check if its needed (Set remote file size to serverPoistion), truncate remote file, perhaps issue set attribute or something to truncate remote file
+            //if (!Win32Native.SetEndOfFile(_handle))
+            //{
+            //    int hr = Marshal.GetLastWin32Error();
+            //    if (hr == __Error.ERROR_INVALID_PARAMETER)
+            //        throw new ArgumentOutOfRangeException("value", Environment.GetResourceString("ArgumentOutOfRange_FileLengthTooBig"));
+            //    __Error.WinIOError(hr, String.Empty);
+            //}
+            // Return file pointer to where it was before setting length
+            if (origPos != value)
+            {
+                if (origPos < value)
+                    SeekCore(origPos, SeekOrigin.Begin);
+                else
+                    SeekCore(0, SeekOrigin.End);
+            }
         }
 
         /// <summary>
-        /// Flushes the read data from the buffer.
+        /// Reads the core.
         /// </summary>
-        private void FlushReadBuffer()
+        /// <param name="buffer">The buffer.</param>
+        /// <param name="offset">The offset.</param>
+        /// <param name="count">The count.</param>
+        /// <returns></returns>
+        private int ReadCore(byte[] buffer, int offset, int count)
         {
-            if (_canSeek)
+            EnsureSessionIsOpen();
+            Contract.Assert(CanRead, "CanRead");
+
+            Contract.Assert(buffer != null, "buffer != null");
+            Contract.Assert(_writePos == 0, "_writePos == 0");
+            Contract.Assert(offset >= 0, "offset is negative");
+            Contract.Assert(count >= 0, "count is negative");
+
+
+            int r = ReadFromServer(buffer, offset, count);
+            Contract.Assert(r >= 0, "FileStream's ReadCore is likely broken.");
+            _pos += r;
+
+            return r;
+        }
+
+        // This doesn't do argument checking.  Necessary for SetLength, which must
+        // set the file pointer beyond the end of the file. This will update the 
+        // internal position
+        private long SeekCore(long offset, SeekOrigin origin)
+        {
+            EnsureSessionIsOpen();
+            Contract.Assert(origin >= SeekOrigin.Begin && origin <= SeekOrigin.End, "origin>=SeekOrigin.Begin && origin<=SeekOrigin.End");
+
+            switch (origin)
             {
-                if (_bufferPosition < _bufferLen)
-                {
-                    _position -= _bufferPosition;
-                }
-                _bufferPosition = 0;
-                _bufferLen = 0;
+                case SeekOrigin.Begin:
+                    _serverPosition = (ulong)offset;
+                    break;
+                case SeekOrigin.Current:
+                    _serverPosition += (ulong)offset;
+                    break;
+                case SeekOrigin.End:
+                    try
+                    {
+                        var attributes = _session.RequestFStat(_handle, false);
+                        _serverPosition = (ulong)attributes.Size - (ulong)offset;
+                    }
+                    finally
+                    {
+                        _session.RequestClose(_handle);
+                    }
+                    break;
+                default:
+                    break;
             }
+
+            _pos = (long)_serverPosition;
+            return (long)_serverPosition;
         }
 
         /// <summary>
-        /// Flush any buffered write data to the file.
+        /// Writes the core.
         /// </summary>
-        private void FlushWriteBuffer()
+        /// <param name="buffer">The buffer.</param>
+        /// <param name="offset">The offset.</param>
+        /// <param name="count">The count.</param>
+        private void WriteCore(byte[] buffer, int offset, int count)
         {
-            if (_bufferPosition > 0)
-            {
-                using (var wait = new AutoResetEvent(false))
-                {
-                    _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                    _serverFilePosition += (ulong) _bufferPosition;
-                }
+            EnsureSessionIsOpen();
 
-                _bufferPosition = 0;
-            }
+            Contract.Assert(CanWrite, "CanWrite");
+
+            Contract.Assert(buffer != null, "buffer != null");
+            Contract.Assert(_readPos == _readLen, "_readPos == _readLen");
+            Contract.Assert(offset >= 0, "offset is negative");
+            Contract.Assert(count >= 0, "count is negative");
+            // Make sure we are writing to the position that we think we are
+
+            int r = WriteToServer(buffer, offset, count);
+            Contract.Assert(r >= 0, "FileStream's WriteCore is likely broken.");
+            _pos += r;
+            return;
         }
 
+        // __ConsoleStream also uses this code. 
         /// <summary>
-        /// Setups the read.
+        /// Reads the file native.
         /// </summary>
-        private void SetupRead()
+        /// <param name="bytes">The bytes.</param>
+        /// <param name="offset">The offset.</param>
+        /// <param name="count">The count.</param>
+        /// <returns></returns>
+        /// <exception cref="System.IndexOutOfRangeException">IndexOutOfRange_IORaceCondition</exception>
+        private int ReadFromServer(byte[] bytes, int offset, int count)
         {
-            if (!CanRead)
-                throw new NotSupportedException("Read not supported.");
+            EnsureSessionIsOpen();
 
-            if (_bufferOwnedByWrite)
+            Contract.Requires(offset >= 0, "offset >= 0");
+            Contract.Requires(count >= 0, "count >= 0");
+            Contract.Requires(bytes != null, "bytes != null");
+
+            // Don't corrupt memory when multiple threads are erroneously writing
+            // to this stream simultaneously.
+            if (bytes.Length - offset < count)
+                throw new IndexOutOfRangeException("Probable I/O race condition detected while copying memory. The I/O package is not thread safe by default. In multithreaded applications, a stream must be accessed in a thread-safe way, such as a thread-safe wrapper returned by TextReader's or TextWriter's Synchronized methods. This also applies to classes like StreamWriter and StreamReader.");
+
+            if (bytes.Length == 0)
             {
-                FlushWriteBuffer();
-                _bufferOwnedByWrite = false;
+                return 0;
             }
+
+            var data = _session.RequestRead(_handle, _serverPosition + (ulong)offset, (uint)count);
+            int numBytesRead = data.Length;
+            _serverPosition += (ulong)offset + (ulong)numBytesRead;
+
+            Buffer.BlockCopy(data, 0, bytes, offset, numBytesRead);
+
+
+            return numBytesRead;
         }
 
         /// <summary>
-        /// Setups the write.
+        /// Writes the file native.
         /// </summary>
-        private void SetupWrite()
+        /// <param name="bytes">The bytes.</param>
+        /// <param name="offset">The offset.</param>
+        /// <param name="count">The count.</param>
+        /// <returns></returns>
+        /// <exception cref="System.IndexOutOfRangeException">IndexOutOfRange_IORaceCondition</exception>
+        private int WriteToServer(byte[] bytes, int offset, int count)
         {
-            if ((!CanWrite))
-                throw new NotSupportedException("Write not supported.");
+            EnsureSessionIsOpen();
 
-            if (!_bufferOwnedByWrite)
+            Contract.Requires(offset >= 0, "offset >= 0");
+            Contract.Requires(count >= 0, "count >= 0");
+            Contract.Requires(bytes != null, "bytes != null");
+            // Don't corrupt memory when multiple threads are erroneously writing
+            // to this stream simultaneously.  (the OS is reading from
+            // the array we pass to WriteFile, but if we read beyond the end and
+            // that memory isn't allocated, we could get an AV.)
+            if (bytes.Length - offset < count)
+                throw new IndexOutOfRangeException("Probable I/O race condition detected while copying memory. The I/O package is not thread safe by default. In multithreaded applications, a stream must be accessed in a thread-safe way, such as a thread-safe wrapper returned by TextReader's or TextWriter's Synchronized methods. This also applies to classes like StreamWriter and StreamReader.");
+
+            // You can't use the fixed statement on an array of length 0.
+
+            using (var wait = new AutoResetEvent(false))
             {
-                FlushReadBuffer();
-                _bufferOwnedByWrite = true;
+                _session.RequestWrite(_handle, _serverPosition, bytes, offset, count, wait);
+                _serverPosition += (ulong)count;
             }
+
+            return count;
         }
 
-        private void CheckSessionIsOpen()
+        private void EnsureSessionIsOpen()
         {
             if (_session == null)
                 throw new ObjectDisposedException(GetType().FullName);

From 30e85138002a30a6aff7ef10b09b1ba02059505f Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 17 Mar 2017 19:59:22 +0100
Subject: [PATCH 089/128] Revert "Update SftFileStream to work correctly with
 mixed Read, Write and Seek operation, complete rewrite #194"

This reverts commit 0d88ddc79ca2928663a073f468d2925a5cdeab70.
---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 1034 ++++++++++-------------
 1 file changed, 441 insertions(+), 593 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 175ed7fe4..fbc4d4674 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -3,33 +3,34 @@
 using System.Threading;
 using System.Diagnostics.CodeAnalysis;
 using Renci.SshNet.Common;
-using System.Diagnostics.Contracts;
 
 namespace Renci.SshNet.Sftp
 {
     /// <summary>
-    /// 
+    /// Exposes a <see cref="Stream"/> around a remote SFTP file, supporting both synchronous and asynchronous read and write operations.
     /// </summary>
-    /// <seealso cref="System.IO.Stream" />
     public class SftpFileStream : Stream
     {
-        private ulong _serverPosition;
+        //  TODO:   Add security method to set userid, groupid and other permission settings
+        // Internal state.
+        private byte[] _handle;
+        private ISftpSession _session;
 
-        private byte[] _buffer;   // Shared read/write buffer.  Alloc on first use.
+        // Buffer information.
+        private readonly int _readBufferSize;
+        private readonly byte[] _readBuffer;
+        private readonly int _writeBufferSize;
+        private readonly byte[] _writeBuffer;
+        private int _bufferPosition;
+        private int _bufferLen;
+        private long _position;
+        private bool _bufferOwnedByWrite;
         private bool _canRead;
-        private bool _canWrite;
         private bool _canSeek;
+        private bool _canWrite;
+        private ulong _serverFilePosition;
 
-        private int _readPos;     // Read pointer within shared buffer.
-        private int _readLen;     // Number of bytes read in buffer from file.
-        private int _writePos;    // Write pointer within shared buffer.
-        private int _bufferSize;  // Length of internal buffer, if it's allocated.
-
-        private byte[] _handle;
-        private ISftpSession _session;
-
-        private long _pos;        // Cache current location in the file.
-        private long _appendStart;// When appending, prevent overwriting file.
+        private readonly object _lock = new object();
 
         /// <summary>
         /// Gets a value indicating whether the current stream supports reading.
@@ -87,17 +88,29 @@ public override long Length
         {
             get
             {
-                EnsureSessionIsOpen();
+                // Lock down the file stream while we do this.
+                lock (_lock)
+                {
+                    CheckSessionIsOpen();
 
-                if (!CanSeek)
-                    throw new NotSupportedException("Seek operation is not supported.");
+                    if (!CanSeek)
+                        throw new NotSupportedException("Seek operation is not supported.");
 
-                var attributes = _session.RequestFStat(_handle, true);
-                if (attributes != null)
-                {
-                    return attributes.Size;
+                    // Flush the write buffer, because it may
+                    // affect the length of the stream.
+                    if (_bufferOwnedByWrite)
+                    {
+                        FlushWriteBuffer();
+                    }
+
+                    // obtain file attributes
+                    var attributes = _session.RequestFStat(_handle, true);
+                    if (attributes != null)
+                    {
+                        return attributes.Size;
+                    }
+                    throw new IOException("Seek operation failed.");
                 }
-                throw new IOException("Seek operation failed.");
             }
         }
 
@@ -112,26 +125,13 @@ public override long Position
         {
             get
             {
-                EnsureSessionIsOpen();
-
+                CheckSessionIsOpen();
                 if (!CanSeek)
-                    throw new NotSupportedException("Seek operation is not supported.");
-
-                Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
-
-                // Compensate for buffer that we read from the handle (_readLen) Vs what the user
-                // read so far from the internel buffer (_readPos). Of course add any unwrittern  
-                // buffered data
-                return _pos + (_readPos - _readLen + _writePos);
+                    throw new NotSupportedException("Seek operation not supported.");
+                return _position;
             }
             set
             {
-                if (value < 0)
-                    throw new ArgumentOutOfRangeException("value");
-
-                if (_writePos > 0) FlushWrite(false);
-                _readPos = 0;
-                _readLen = 0;
                 Seek(value, SeekOrigin.Begin);
             }
         }
@@ -155,12 +155,6 @@ public virtual byte[] Handle
             get
             {
                 Flush();
-                // Explicitly dump any buffered data, since the user could move our
-                // position or write to the file.
-                _readPos = 0;
-                _readLen = 0;
-                _writePos = 0;
-                _buffer = null;
                 return _handle;
             }
         }
@@ -173,40 +167,23 @@ public virtual byte[] Handle
         /// </value>
         public TimeSpan Timeout { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SftpFileStream" /> class.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <param name="path">The path.</param>
-        /// <param name="mode">The mode.</param>
-        /// <param name="access">The access.</param>
-        /// <param name="bufferSize">Size of the buffer.</param>
-        /// <exception cref="System.ArgumentException">handle</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// access
-        /// or
-        /// bufferSize
-        /// </exception>
         internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAccess access, int bufferSize)
         {
+            if (session == null)
+                throw new SshConnectionException("Client not connected.");
+            if (path == null)
+                throw new ArgumentNullException("path");
+            if (bufferSize <= 0)
+                throw new ArgumentOutOfRangeException("bufferSize");
+
             Timeout = TimeSpan.FromSeconds(30);
             Name = path;
 
+            // Initialize the object state.
             _session = session;
-
-            // Now validate arguments.
-            if (access < FileAccess.Read || access > FileAccess.ReadWrite)
-                throw new ArgumentOutOfRangeException("access");
-            if (bufferSize <= 0)
-                throw new ArgumentOutOfRangeException("bufferSize");
-
-            _canRead = 0 != (access & FileAccess.Read);
-            _canWrite = 0 != (access & FileAccess.Write);
+            _canRead = (access & FileAccess.Read) != 0;
             _canSeek = true;
-
-            _readPos = 0;
-            _readLen = 0;
-            _writePos = 0;
+            _canWrite = (access & FileAccess.Write) != 0;
 
             var flags = Flags.None;
 
@@ -275,14 +252,17 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             // instead of using the specified buffer size as is, we use it to calculate a buffer size
             // that ensures we always receive or send the max. number of bytes in a single SSH_FXP_READ
             // or SSH_FXP_WRITE message
-            _bufferSize = (int)session.CalculateOptimalWriteLength((uint)bufferSize, _handle);
 
-            _pos = 0;
-            _appendStart = -1;
+            _readBufferSize = (int) session.CalculateOptimalReadLength((uint) bufferSize);
+            _readBuffer = new byte[_readBufferSize];
+            _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint) bufferSize, _handle);
+            _writeBuffer = new byte[_writeBufferSize];
 
             if (mode == FileMode.Append)
             {
-                _appendStart = SeekCore(0, SeekOrigin.End);
+                var attributes = _session.RequestFStat(_handle, false);
+                _position = attributes.Size;
+                _serverFilePosition = (ulong) attributes.Size;
             }
         }
 
@@ -292,15 +272,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
         /// </summary>
         ~SftpFileStream()
         {
-            if (_handle != null)
-            {
-                //BCLDebug.Correctness(_handle.IsClosed, "You didn't close a FileStream & it got finalized.  Name: \"" + _fileName + "\"");
-                if (_session.IsOpen)
-                {
-                    throw new InvalidOperationException("You didn't close a SftpFileStream & it got finalized.");
-                }
-                Dispose(false);
-            }
+            Dispose(false);
         }
 
         /// <summary>
@@ -310,666 +282,542 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
         /// <exception cref="ObjectDisposedException">Stream is closed.</exception>
         public override void Flush()
         {
-            // This code is duplicated in Dispose
-            EnsureSessionIsOpen();
+            lock (_lock)
+            {
+                CheckSessionIsOpen();
 
-            FlushInternalBuffer();
+                if (_bufferOwnedByWrite)
+                {
+                    FlushWriteBuffer();
+                }
+                else
+                {
+                    FlushReadBuffer();
+                }
+            }
         }
 
         /// <summary>
         /// Reads a sequence of bytes from the current stream and advances the position within the stream by the
         /// number of bytes read.
         /// </summary>
-        /// <param name="array">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset" /> and (<paramref name="offset" /> + <paramref name="count" /> - 1) replaced by the bytes read from the current source.</param>
-        /// <param name="offset">The zero-based byte offset in <paramref name="array" /> at which to begin storing the data read from the current stream.</param>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset"/> and (<paramref name="offset"/> + <paramref name="count"/> - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin storing the data read from the current stream.</param>
         /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
         /// <returns>
         /// The total number of bytes read into the buffer. This can be less than the number of bytes requested
         /// if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
         /// </returns>
-        /// <exception cref="System.ArgumentNullException">array</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// offset
-        /// or
-        /// count
-        /// </exception>
-        /// <exception cref="System.ArgumentException">Invalid array range.</exception>
-        /// <exception cref="System.NotSupportedException">Read operation is not supported.</exception>
-        /// <exception cref="ArgumentException">The sum of <paramref name="offset" /> and <paramref name="count" /> is larger than the buffer length.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="array" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> or <paramref name="count" /> is negative.</exception>
-        /// <exception cref="IOException">An I/O error occurs.</exception>
-        /// <exception cref="NotSupportedException">The stream does not support reading.</exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-        public override int Read(byte[] array, int offset, int count)
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>. </exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        public override int Read(byte[] buffer, int offset, int count)
         {
-            if (array == null)
-                throw new ArgumentNullException("array");
+            var readLen = 0;
+
+            if (buffer == null)
+                throw new ArgumentNullException("buffer");
             if (offset < 0)
                 throw new ArgumentOutOfRangeException("offset");
             if (count < 0)
                 throw new ArgumentOutOfRangeException("count");
-            if (array.Length - offset < count)
+            if ((buffer.Length - offset) < count)
                 throw new ArgumentException("Invalid array range.");
 
-            EnsureSessionIsOpen();
-
-            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
-
-            bool isBlocked = false;
-            int n = _readLen - _readPos;
-            // if the read buffer is empty, read into either user's array or our
-            // buffer, depending on number of bytes user asked for and buffer size.
-            if (n == 0)
+            // Lock down the file stream while we do this.
+            lock (_lock)
             {
-                if (!CanRead)
-                    throw new NotSupportedException("Read operation is not supported.");
+                CheckSessionIsOpen();
+
+                // Set up for the read operation.
+                SetupRead();
 
-                if (_writePos > 0) FlushWrite(false);
-                if (!CanSeek || (count >= _bufferSize))
+                // Read data into the caller's buffer.
+                while (count > 0)
                 {
-                    n = ReadCore(array, offset, count);
-                    // Throw away read buffer.
-                    _readPos = 0;
-                    _readLen = 0;
-                    return n;
+                    // How much data do we have available in the buffer?
+                    var bytesAvailableInBuffer = _bufferLen - _bufferPosition;
+                    if (bytesAvailableInBuffer <= 0)
+                    {
+                        _bufferPosition = 0;
+                        _bufferLen = 0;
+
+                        var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
+
+                        // TODO: don't we need to take into account the number of bytes read (data.Length) ?
+                        _serverFilePosition = (ulong) _position;
+
+                        if (data.Length == 0)
+                        {
+                            break;
+                        }
+
+                        // determine number of bytes that we can read into caller-provided buffer
+                        var bytesToWriteToCallerBuffer = Math.Min(data.Length, count);
+                        // write bytes to caller-provided buffer
+                        Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesToWriteToCallerBuffer;
+                        // update number of bytes left to read
+                        count -= bytesToWriteToCallerBuffer;
+                        // record total number of bytes read into caller-provided buffer
+                        readLen += bytesToWriteToCallerBuffer;
+                        // update stream position
+                        _position += bytesToWriteToCallerBuffer;
+
+                        if (data.Length > bytesToWriteToCallerBuffer)
+                        {
+                            // copy remaining bytes to read buffer
+                            _bufferLen = data.Length - bytesToWriteToCallerBuffer;
+                            Buffer.BlockCopy(data, bytesToWriteToCallerBuffer, _readBuffer, 0, _bufferLen);
+                        }
+                    }
+                    else
+                    {
+                        // determine number of bytes that we can write from read buffer to caller-provided buffer
+                        var bytesToWriteToCallerBuffer = Math.Min(bytesAvailableInBuffer, count);
+                        // copy data from read buffer to the caller-provided buffer
+                        Buffer.BlockCopy(_readBuffer, _bufferPosition, buffer, offset, bytesToWriteToCallerBuffer);
+                        // update position in read buffer
+                        _bufferPosition += bytesToWriteToCallerBuffer;
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesAvailableInBuffer;
+                        // update number of bytes left to read
+                        count -= bytesToWriteToCallerBuffer;
+                        // record total number of bytes read into caller-provided buffer
+                        readLen += bytesToWriteToCallerBuffer;
+                        // update stream position
+                        _position += bytesToWriteToCallerBuffer;
+                    }
                 }
-                if (_buffer == null)
-                    _buffer = new byte[_bufferSize];
-                n = ReadCore(_buffer, 0, _bufferSize);
-                if (n == 0) return 0;
-                isBlocked = n < _bufferSize;
-                _readPos = 0;
-                _readLen = n;
             }
-            // Now copy min of count or numBytesAvailable (ie, near EOF) to array.
-            if (n > count) n = count;
-            Buffer.BlockCopy(_buffer, _readPos, array, offset, n);
-
-            _readPos += n;
 
-            // We may have read less than the number of bytes the user asked 
-            // for, but that is part of the Stream contract.  Reading again for
-            // more data may cause us to block if we're using a device with 
-            // no clear end of file, such as a serial port or pipe.  If we
-            // blocked here & this code was used with redirected pipes for a
-            // process's standard output, this can lead to deadlocks involving
-            // two processes. But leave this here for files to avoid what would
-            // probably be a breaking change.         -- 
-
-
-
-            return n;
+            // Return the number of bytes that were read to the caller.
+            return readLen;
         }
 
         /// <summary>
         /// Reads a byte from the stream and advances the position within the stream by one byte, or returns -1 if at the end of the stream.
         /// </summary>
         /// <returns>
-        /// The unsigned byte cast to an <see cref="int" />, or -1 if at the end of the stream.
+        /// The unsigned byte cast to an <see cref="int"/>, or -1 if at the end of the stream.
         /// </returns>
-        /// <exception cref="System.NotSupportedException">Read is not supported.</exception>
-        /// <exception cref="NotSupportedException">The stream does not support reading.</exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         /// <exception cref="IOException">Read operation failed.</exception>
         public override int ReadByte()
         {
-            EnsureSessionIsOpen();
-
-            if (_readLen == 0 && !CanRead)
-                throw new NotSupportedException("Read is not supported.");
-            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
-            if (_readPos == _readLen)
+            // Lock down the file stream while we do this.
+            lock (_lock)
             {
-                if (_writePos > 0) FlushWrite(false);
-                Contract.Assert(_bufferSize > 0, "_bufferSize > 0");
-                if (_buffer == null)
-                    _buffer = new byte[_bufferSize];
-                _readLen = ReadCore(_buffer, 0, _bufferSize);
-                _readPos = 0;
-            }
-            if (_readPos == _readLen)
-                return -1;
+                CheckSessionIsOpen();
 
-            int result = _buffer[_readPos];
-            _readPos++;
-            return result;
+                // Setup the object for reading.
+                SetupRead();
+
+                // Read more data into the internal buffer if necessary.
+                if (_bufferPosition >= _bufferLen)
+                {
+                    _bufferPosition = 0;
+
+                    var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
+
+                    _bufferLen = data.Length;
+                    _serverFilePosition = (ulong) _position;
+
+                    if (_bufferLen == 0)
+                    {
+                        // We've reached EOF.
+                        return -1;
+                    }
+
+                    Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
+                }
+
+                // Extract the next byte from the buffer.
+                ++_position;
+                return _readBuffer[_bufferPosition++];
+            }
         }
 
         /// <summary>
         /// Sets the position within the current stream.
         /// </summary>
-        /// <param name="offset">A byte offset relative to the <paramref name="origin" /> parameter.</param>
-        /// <param name="origin">A value of type <see cref="SeekOrigin" /> indicating the reference point used to obtain the new position.</param>
+        /// <param name="offset">A byte offset relative to the <paramref name="origin"/> parameter.</param>
+        /// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
         /// <returns>
         /// The new position within the current stream.
         /// </returns>
-        /// <exception cref="System.ArgumentException">Invalid seek origin.</exception>
-        /// <exception cref="System.NotSupportedException">Seek is not supported.</exception>
-        /// <exception cref="System.IO.IOException">Unable seek backward to overwrite data that previously existed in a file opened in Append mode.</exception>
-        /// <exception cref="IOException">An I/O error occurs.</exception>
-        /// <exception cref="NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output.</exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support seeking, such as if the stream is constructed from a pipe or console output. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override long Seek(long offset, SeekOrigin origin)
         {
-            if (origin < SeekOrigin.Begin || origin > SeekOrigin.End)
-                throw new ArgumentException("Invalid seek origin.");
-
-            EnsureSessionIsOpen();
-
-            if (!CanSeek)
-                throw new NotSupportedException("Seek is not supported.");
+            long newPosn = -1;
 
-            Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both.");
-
-            // If we've got bytes in our buffer to write, write them out.
-            // If we've read in and consumed some bytes, we'll have to adjust
-            // our seek positions ONLY IF we're seeking relative to the current
-            // position in the stream.  This simulates doing a seek to the new
-            // position, then a read for the number of bytes we have in our buffer.
-            if (_writePos > 0)
-            {
-                FlushWrite(false);
-            }
-            else if (origin == SeekOrigin.Current)
+            // Lock down the file stream while we do this.
+            lock (_lock)
             {
-                // Don't call FlushRead here, which would have caused an infinite
-                // loop.  Simply adjust the seek origin.  This isn't necessary
-                // if we're seeking relative to the beginning or end of the stream.
-                offset -= (_readLen - _readPos);
-            }
+                CheckSessionIsOpen();
 
-            long oldPos = _pos + (_readPos - _readLen);
-            long pos = SeekCore(offset, origin);
+                if (!CanSeek)
+                    throw new NotSupportedException("Seek is not supported.");
 
-            // Prevent users from overwriting data in a file that was opened in
-            // append mode.
-            if (_appendStart != -1 && pos < _appendStart)
-            {
-                SeekCore(oldPos, SeekOrigin.Begin);
-                throw new IOException("Unable seek backward to overwrite data that previously existed in a file opened in Append mode.");
-            }
+                // Don't do anything if the position won't be moving.
+                if (origin == SeekOrigin.Begin && offset == _position)
+                {
+                    return offset;
+                }
+                if (origin == SeekOrigin.Current && offset == 0)
+                {
+                    return _position;
+                }
 
-            // We now must update the read buffer.  We can in some cases simply
-            // update _readPos within the buffer, copy around the buffer so our 
-            // Position property is still correct, and avoid having to do more 
-            // reads from the disk.  Otherwise, discard the buffer's contents.
-            if (_readLen > 0)
-            {
-                // We can optimize the following condition:
-                // oldPos - _readPos <= pos < oldPos + _readLen - _readPos
-                if (oldPos == pos)
+                // The behaviour depends upon the read/write mode.
+                if (_bufferOwnedByWrite)
                 {
-                    if (_readPos > 0)
+                    // Flush the write buffer and then seek.
+                    FlushWriteBuffer();
+
+                    switch (origin)
                     {
-                        //Console.WriteLine("Seek: seeked for 0, adjusting buffer back by: "+_readPos+"  _readLen: "+_readLen);
-                        Buffer.BlockCopy(_buffer, _readPos, _buffer, 0, _readLen - _readPos);
-                        _readLen -= _readPos;
-                        _readPos = 0;
+                        case SeekOrigin.Begin:
+                            newPosn = offset;
+                            break;
+                        case SeekOrigin.Current:
+                            newPosn = _position + offset;
+                            break;
+                        case SeekOrigin.End:
+                            var attributes = _session.RequestFStat(_handle, false);
+                            newPosn = attributes.Size - offset;
+                            break;
                     }
-                    // If we still have buffered data, we must update the stream's 
-                    // position so our Position property is correct.
-                    if (_readLen > 0)
-                        SeekCore(_readLen, SeekOrigin.Current);
-                }
-                else if (oldPos - _readPos < pos && pos < oldPos + _readLen - _readPos)
-                {
-                    int diff = (int)(pos - oldPos);
-                    //Console.WriteLine("Seek: diff was "+diff+", readpos was "+_readPos+"  adjusting buffer - shrinking by "+ (_readPos + diff));
-                    Buffer.BlockCopy(_buffer, _readPos + diff, _buffer, 0, _readLen - (_readPos + diff));
-                    _readLen -= (_readPos + diff);
-                    _readPos = 0;
-                    if (_readLen > 0)
-                        SeekCore(_readLen, SeekOrigin.Current);
+
+                    if (newPosn == -1)
+                    {
+                        throw new EndOfStreamException("End of stream.");
+                    }
+                    _position = newPosn;
+                    _serverFilePosition = (ulong)newPosn;
                 }
                 else
                 {
-                    // Lose the read buffer.
-                    _readPos = 0;
-                    _readLen = 0;
+                    // Determine if the seek is to somewhere inside
+                    // the current read buffer bounds.
+                    if (origin == SeekOrigin.Begin)
+                    {
+                        newPosn = _position - _bufferPosition;
+                        if (offset >= newPosn && offset <
+                                (newPosn + _bufferLen))
+                        {
+                            _bufferPosition = (int)(offset - newPosn);
+                            _position = offset;
+                            return _position;
+                        }
+                    }
+                    else if (origin == SeekOrigin.Current)
+                    {
+                        newPosn = _position + offset;
+                        if (newPosn >= (_position - _bufferPosition) &&
+                           newPosn < (_position - _bufferPosition + _bufferLen))
+                        {
+                            _bufferPosition =
+                                (int)(newPosn - (_position - _bufferPosition));
+                            _position = newPosn;
+                            return _position;
+                        }
+                    }
+
+                    // Abandon the read buffer.
+                    _bufferPosition = 0;
+                    _bufferLen = 0;
+
+                    // Seek to the new position.
+                    switch (origin)
+                    {
+                        case SeekOrigin.Begin:
+                            newPosn = offset;
+                            break;
+                        case SeekOrigin.Current:
+                            newPosn = _position + offset;
+                            break;
+                        case SeekOrigin.End:
+                            var attributes = _session.RequestFStat(_handle, false);
+                            newPosn = attributes.Size - offset;
+                            break;
+                    }
+
+                    if (newPosn < 0)
+                    {
+                        throw new EndOfStreamException();
+                    }
+
+                    _position = newPosn;
                 }
-                Contract.Assert(_readLen >= 0 && _readPos <= _readLen, "_readLen should be nonnegative, and _readPos should be less than or equal _readLen");
-                Contract.Assert(pos == Position, "Seek optimization: pos != Position!  Buffer math was mangled.");
+                return _position;
             }
-            return pos;
         }
 
         /// <summary>
         /// When overridden in a derived class, sets the length of the current stream.
         /// </summary>
         /// <param name="value">The desired length of the current stream in bytes.</param>
-        /// <exception cref="System.ArgumentOutOfRangeException">value</exception>
-        /// <exception cref="System.NotSupportedException">
-        /// Seek operation is not supported.
-        /// or
-        /// Write operation is not supported.
-        /// </exception>
-        /// <exception cref="System.IO.IOException">Unable to truncate data that previously existed in a file opened in Append mode.</exception>
         /// <exception cref="IOException">An I/O error occurs.</exception>
         /// <exception cref="NotSupportedException">The stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output.</exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="value" /> must be greater than zero.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="value"/> must be greater than zero.</exception>
         public override void SetLength(long value)
         {
             if (value < 0)
                 throw new ArgumentOutOfRangeException("value");
 
-            EnsureSessionIsOpen();
+            // Lock down the file stream while we do this.
+            lock (_lock)
+            {
+                CheckSessionIsOpen();
 
-            if (!CanSeek)
-                throw new NotSupportedException("Seek operation is not supported.");
-            if (!CanWrite)
-                throw new NotSupportedException("Write operation is not supported.");
+                if (!CanSeek)
+                    throw new NotSupportedException("Seek is not supported.");
 
-            // Handle buffering updates.
-            if (_writePos > 0)
-            {
-                FlushWrite(false);
-            }
-            else if (_readPos < _readLen)
-            {
-                FlushRead();
-            }
-            _readPos = 0;
-            _readLen = 0;
+                SetupWrite();
 
-            if (_appendStart != -1 && value < _appendStart)
-                throw new IOException("Unable to truncate data that previously existed in a file opened in Append mode.");
-            SetLengthCore(value);
+                var attributes = _session.RequestFStat(_handle, false);
+                attributes.Size = value;
+                _session.RequestFSetStat(_handle, attributes);
+            }
         }
 
         /// <summary>
         /// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
         /// </summary>
-        /// <param name="array">An array of bytes. This method copies <paramref name="count" /> bytes from <paramref name="array" /> to the current stream.</param>
-        /// <param name="offset">The zero-based byte offset in <paramref name="array" /> at which to begin copying bytes to the current stream.</param>
+        /// <param name="buffer">An array of bytes. This method copies <paramref name="count"/> bytes from <paramref name="buffer"/> to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin copying bytes to the current stream.</param>
         /// <param name="count">The number of bytes to be written to the current stream.</param>
-        /// <exception cref="System.ArgumentNullException">array</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// offset
-        /// or
-        /// count
-        /// </exception>
-        /// <exception cref="System.ArgumentException">Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</exception>
-        /// <exception cref="System.NotSupportedException">Write is not supported.</exception>
-        /// <exception cref="ArgumentException">The sum of <paramref name="offset" /> and <paramref name="count" /> is greater than the buffer length.</exception>
-        /// <exception cref="ArgumentNullException"><paramref name="array" /> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> or <paramref name="count" /> is negative.</exception>
+        /// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is greater than the buffer length.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="buffer"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
         /// <exception cref="IOException">An I/O error occurs.</exception>
         /// <exception cref="NotSupportedException">The stream does not support writing.</exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-        public override void Write(byte[] array, int offset, int count)
+        public override void Write(byte[] buffer, int offset, int count)
         {
-            if (array == null)
-                throw new ArgumentNullException("array");
+            if (buffer == null)
+                throw new ArgumentNullException("buffer");
             if (offset < 0)
                 throw new ArgumentOutOfRangeException("offset");
             if (count < 0)
                 throw new ArgumentOutOfRangeException("count");
-            if (array.Length - offset < count)
-                throw new ArgumentException("Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.");
-
-            EnsureSessionIsOpen();
+            if ((buffer.Length - offset) < count)
+                throw new ArgumentException("Invalid array range.");
 
-            if (_writePos == 0)
+            // Lock down the file stream while we do this.
+            lock (_lock)
             {
-                // Ensure we can write to the stream, and ready buffer for writing.
-                if (!CanWrite)
-                    throw new NotSupportedException("Write is not supported.");
+                CheckSessionIsOpen();
 
-                if (_readPos < _readLen) FlushRead();
-                _readPos = 0;
-                _readLen = 0;
-            }
+                // Setup this object for writing.
+                SetupWrite();
 
-            // If our buffer has data in it, copy data from the user's array into
-            // the buffer, and if we can fit it all there, return.  Otherwise, write
-            // the buffer to disk and copy any remaining data into our buffer.
-            // The assumption here is memcpy is cheaper than disk (or net) IO.
-            // (10 milliseconds to disk vs. ~20-30 microseconds for a 4K memcpy)
-            // So the extra copying will reduce the total number of writes, in 
-            // non-pathological cases (ie, write 1 byte, then write for the buffer 
-            // size repeatedly)
-            if (_writePos > 0)
-            {
-                int numBytes = _bufferSize - _writePos;   // space left in buffer
-                if (numBytes > 0)
+                // Write data to the file stream.
+                while (count > 0)
                 {
-                    if (numBytes > count)
-                        numBytes = count;
-                    Buffer.BlockCopy(array, offset, _buffer, _writePos, numBytes);
-                    _writePos += numBytes;
-                    if (count == numBytes) return;
-                    offset += numBytes;
-                    count -= numBytes;
+                    // Determine how many bytes we can write to the buffer.
+                    var tempLen = _writeBufferSize - _bufferPosition;
+                    if (tempLen <= 0)
+                    {
+                        // flush write buffer, and mark it empty
+                        FlushWriteBuffer();
+                        // we can now write or buffer the full buffer size
+                        tempLen = _writeBufferSize;
+                    }
+
+                    // limit the number of bytes to write to the actual number of bytes requested
+                    if (tempLen > count)
+                    {
+                        tempLen = count;
+                    }
+
+                    // Can we short-cut the internal buffer?
+                    if (_bufferPosition == 0 && tempLen == _writeBufferSize)
+                    {
+                        using (var wait = new AutoResetEvent(false))
+                        {
+                            _session.RequestWrite(_handle, _serverFilePosition, buffer, offset, tempLen, wait);
+                            _serverFilePosition += (ulong) tempLen;
+                        }
+                    }
+                    else
+                    {
+                        // No: copy the data to the write buffer first.
+                        Buffer.BlockCopy(buffer, offset, _writeBuffer, _bufferPosition, tempLen);
+                        _bufferPosition += tempLen;
+                    }
+
+                    // Advance the buffer and stream positions.
+                    _position += tempLen;
+                    offset += tempLen;
+                    count -= tempLen;
                 }
-                // Reset our buffer.  We essentially want to call FlushWrite
-                // without calling Flush on the underlying Stream.
 
-                WriteCore(_buffer, 0, _writePos);
-                _writePos = 0;
-                _buffer = null;
-            }
-            // If the buffer would slow writes down, avoid buffer completely.
-            if (count >= _bufferSize)
-            {
-                Contract.Assert(_writePos == 0, "FileStream cannot have buffered data to write here!  Your stream will be corrupted.");
-                WriteCore(array, offset, count);
-                return;
+                // If the buffer is full, then do a speculative flush now,
+                // rather than waiting for the next call to this method.
+                if (_bufferPosition >= _writeBufferSize)
+                {
+                    using (var wait = new AutoResetEvent(false))
+                    {
+                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
+                        _serverFilePosition += (ulong) _bufferPosition;
+                    }
+
+                    _bufferPosition = 0;
+                }
             }
-            else if (count == 0)
-                return;  // Don't allocate a buffer then call memcpy for 0 bytes.
-            if (_buffer == null)
-                _buffer = new byte[_bufferSize];
-            // Copy remaining bytes into buffer, to write at a later date.
-            Buffer.BlockCopy(array, offset, _buffer, _writePos, count);
-            _writePos = count;
-            return;
         }
 
         /// <summary>
         /// Writes a byte to the current position in the stream and advances the position within the stream by one byte.
         /// </summary>
         /// <param name="value">The byte to write to the stream.</param>
-        /// <exception cref="System.NotSupportedException">Write operation is not supported.</exception>
-        /// <exception cref="IOException">An I/O error occurs.</exception>
-        /// <exception cref="NotSupportedException">The stream does not support writing, or the stream is already closed.</exception>
-        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+        /// <exception cref="IOException">An I/O error occurs. </exception>
+        /// <exception cref="NotSupportedException">The stream does not support writing, or the stream is already closed. </exception>
+        /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
         public override void WriteByte(byte value)
         {
-            EnsureSessionIsOpen();
-
-            if (_writePos == 0)
+            // Lock down the file stream while we do this.
+            lock (_lock)
             {
-                if (!CanWrite)
-                    throw new NotSupportedException("Write operation is not supported.");
-
-                if (_readPos < _readLen) FlushRead();
-                _readPos = 0;
-                _readLen = 0;
-                Contract.Assert(_bufferSize > 0, "_bufferSize > 0");
-                if (_buffer == null)
-                    _buffer = new byte[_bufferSize];
-            }
-            if (_writePos == _bufferSize)
-                FlushWrite(false);
+                CheckSessionIsOpen();
 
-            _buffer[_writePos] = value;
-            _writePos++;
-        }
+                // Setup the object for writing.
+                SetupWrite();
 
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="SftpFileStream" /> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected override void Dispose(bool disposing)
-        {
-            // Nothing will be done differently based on whether we are 
-            // disposing vs. finalizing.  This is taking advantage of the
-            // weak ordering between normal finalizable objects & critical
-            // finalizable objects, which I included in the SafeHandle 
-            // design for FileStream, which would often "just work" when 
-            // finalized.
-            try
-            {
-
-                if (_handle != null && _session.IsOpen)
+                // Flush the current buffer if it is full.
+                if (_bufferPosition >= _writeBufferSize)
                 {
-                    // Flush data to disk iff we were writing.  After 
-                    // thinking about this, we also don't need to flush
-                    // our read position, regardless of whether the handle
-                    // was exposed to the user.  They probably would NOT 
-                    // want us to do this.
-                    if (_writePos > 0)
+                    using (var wait = new AutoResetEvent(false))
                     {
-                        FlushWrite(!disposing);
+                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
+                        _serverFilePosition += (ulong) _bufferPosition;
                     }
-                }
-            }
-            finally
-            {
-                if (_handle != null && _session.IsOpen)
-                {
-                    _session.RequestClose(_handle);
-                    _handle = null;
-                }
 
-                _canRead = false;
-                _canWrite = false;
-                _canSeek = false;
-                // Don't set the buffer to null, to avoid a NullReferenceException
-                // when users have a race condition in their code (ie, they call
-                // Close when calling another method on Stream like Read).
-                //_buffer = null;
-                base.Dispose(disposing);
-            }
-        }
-
-        private void FlushInternalBuffer()
-        {
-            if (_writePos > 0)
-            {
-                FlushWrite(false);
-            }
-            else if (_readPos < _readLen && CanSeek)
-            {
-                FlushRead();
-            }
-        }
+                    _bufferPosition = 0;
+                }
 
-        // Reading is done by blocks from the file, but someone could read
-        // 1 byte from the buffer then write.  At that point, the OS's file
-        // pointer is out of sync with the stream's position.  All write 
-        // functions should call this function to preserve the position in the file.
-        private void FlushRead()
-        {
-            Contract.Assert(_writePos == 0, "FileStream: Write buffer must be empty in FlushRead!");
-            if (_readPos - _readLen != 0)
-            {
-                Contract.Assert(CanSeek, "FileStream will lose buffered read data now.");
-                SeekCore(_readPos - _readLen, SeekOrigin.Current);
+                // Write the byte into the buffer and advance the posn.
+                _writeBuffer[_bufferPosition++] = value;
+                ++_position;
             }
-            _readPos = 0;
-            _readLen = 0;
         }
 
-        // Writes are buffered.  Anytime the buffer fills up 
-        // (_writePos + delta > _bufferSize) or the buffer switches to reading
-        // and there is left over data (_writePos > 0), this function must be called.
-        private void FlushWrite(bool calledFromFinalizer)
+        /// <summary>
+        /// Releases the unmanaged resources used by the <see cref="Stream"/> and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected override void Dispose(bool disposing)
         {
-            Contract.Assert(_readPos == 0 && _readLen == 0, "FileStream: Read buffer must be empty in FlushWrite!");
-
-            WriteCore(_buffer, 0, _writePos);
+            base.Dispose(disposing);
 
-            _writePos = 0;
-            _buffer = null;
-        }
-
-        // We absolutely need this method broken out so that BeginWriteCore can call
-        // a method without having to go through buffering code that might call
-        // FlushWrite.
-        private void SetLengthCore(long value)
-        {
-            Contract.Assert(value >= 0, "value >= 0");
-            long origPos = _pos;
-
-            if (_pos != value)
-                SeekCore(value, SeekOrigin.Begin);
-
-            //  TODO:   Oleg - Check if its needed (Set remote file size to serverPoistion), truncate remote file, perhaps issue set attribute or something to truncate remote file
-            //if (!Win32Native.SetEndOfFile(_handle))
-            //{
-            //    int hr = Marshal.GetLastWin32Error();
-            //    if (hr == __Error.ERROR_INVALID_PARAMETER)
-            //        throw new ArgumentOutOfRangeException("value", Environment.GetResourceString("ArgumentOutOfRange_FileLengthTooBig"));
-            //    __Error.WinIOError(hr, String.Empty);
-            //}
-            // Return file pointer to where it was before setting length
-            if (origPos != value)
+            if (_session != null)
             {
-                if (origPos < value)
-                    SeekCore(origPos, SeekOrigin.Begin);
-                else
-                    SeekCore(0, SeekOrigin.End);
+                if (disposing)
+                {
+                    lock (_lock)
+                    {
+                        if (_session != null)
+                        {
+                            _canRead = false;
+                            _canSeek = false;
+                            _canWrite = false;
+
+                            if (_handle != null)
+                            {
+                                if (_session.IsOpen)
+                                {
+                                    if (_bufferOwnedByWrite)
+                                    {
+                                        FlushWriteBuffer();
+                                    }
+
+                                    _session.RequestClose(_handle);
+                                }
+
+                                _handle = null;
+                            }
+
+                            _session = null;
+                        }
+                    }
+                }
             }
         }
 
         /// <summary>
-        /// Reads the core.
+        /// Flushes the read data from the buffer.
         /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="count">The count.</param>
-        /// <returns></returns>
-        private int ReadCore(byte[] buffer, int offset, int count)
+        private void FlushReadBuffer()
         {
-            EnsureSessionIsOpen();
-            Contract.Assert(CanRead, "CanRead");
-
-            Contract.Assert(buffer != null, "buffer != null");
-            Contract.Assert(_writePos == 0, "_writePos == 0");
-            Contract.Assert(offset >= 0, "offset is negative");
-            Contract.Assert(count >= 0, "count is negative");
-
-
-            int r = ReadFromServer(buffer, offset, count);
-            Contract.Assert(r >= 0, "FileStream's ReadCore is likely broken.");
-            _pos += r;
-
-            return r;
-        }
-
-        // This doesn't do argument checking.  Necessary for SetLength, which must
-        // set the file pointer beyond the end of the file. This will update the 
-        // internal position
-        private long SeekCore(long offset, SeekOrigin origin)
-        {
-            EnsureSessionIsOpen();
-            Contract.Assert(origin >= SeekOrigin.Begin && origin <= SeekOrigin.End, "origin>=SeekOrigin.Begin && origin<=SeekOrigin.End");
-
-            switch (origin)
+            if (_canSeek)
             {
-                case SeekOrigin.Begin:
-                    _serverPosition = (ulong)offset;
-                    break;
-                case SeekOrigin.Current:
-                    _serverPosition += (ulong)offset;
-                    break;
-                case SeekOrigin.End:
-                    try
-                    {
-                        var attributes = _session.RequestFStat(_handle, false);
-                        _serverPosition = (ulong)attributes.Size - (ulong)offset;
-                    }
-                    finally
-                    {
-                        _session.RequestClose(_handle);
-                    }
-                    break;
-                default:
-                    break;
+                if (_bufferPosition < _bufferLen)
+                {
+                    _position -= _bufferPosition;
+                }
+                _bufferPosition = 0;
+                _bufferLen = 0;
             }
-
-            _pos = (long)_serverPosition;
-            return (long)_serverPosition;
         }
 
         /// <summary>
-        /// Writes the core.
+        /// Flush any buffered write data to the file.
         /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="count">The count.</param>
-        private void WriteCore(byte[] buffer, int offset, int count)
+        private void FlushWriteBuffer()
         {
-            EnsureSessionIsOpen();
-
-            Contract.Assert(CanWrite, "CanWrite");
-
-            Contract.Assert(buffer != null, "buffer != null");
-            Contract.Assert(_readPos == _readLen, "_readPos == _readLen");
-            Contract.Assert(offset >= 0, "offset is negative");
-            Contract.Assert(count >= 0, "count is negative");
-            // Make sure we are writing to the position that we think we are
+            if (_bufferPosition > 0)
+            {
+                using (var wait = new AutoResetEvent(false))
+                {
+                    _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
+                    _serverFilePosition += (ulong) _bufferPosition;
+                }
 
-            int r = WriteToServer(buffer, offset, count);
-            Contract.Assert(r >= 0, "FileStream's WriteCore is likely broken.");
-            _pos += r;
-            return;
+                _bufferPosition = 0;
+            }
         }
 
-        // __ConsoleStream also uses this code. 
         /// <summary>
-        /// Reads the file native.
+        /// Setups the read.
         /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="count">The count.</param>
-        /// <returns></returns>
-        /// <exception cref="System.IndexOutOfRangeException">IndexOutOfRange_IORaceCondition</exception>
-        private int ReadFromServer(byte[] bytes, int offset, int count)
+        private void SetupRead()
         {
-            EnsureSessionIsOpen();
+            if (!CanRead)
+                throw new NotSupportedException("Read not supported.");
 
-            Contract.Requires(offset >= 0, "offset >= 0");
-            Contract.Requires(count >= 0, "count >= 0");
-            Contract.Requires(bytes != null, "bytes != null");
-
-            // Don't corrupt memory when multiple threads are erroneously writing
-            // to this stream simultaneously.
-            if (bytes.Length - offset < count)
-                throw new IndexOutOfRangeException("Probable I/O race condition detected while copying memory. The I/O package is not thread safe by default. In multithreaded applications, a stream must be accessed in a thread-safe way, such as a thread-safe wrapper returned by TextReader's or TextWriter's Synchronized methods. This also applies to classes like StreamWriter and StreamReader.");
-
-            if (bytes.Length == 0)
+            if (_bufferOwnedByWrite)
             {
-                return 0;
+                FlushWriteBuffer();
+                _bufferOwnedByWrite = false;
             }
-
-            var data = _session.RequestRead(_handle, _serverPosition + (ulong)offset, (uint)count);
-            int numBytesRead = data.Length;
-            _serverPosition += (ulong)offset + (ulong)numBytesRead;
-
-            Buffer.BlockCopy(data, 0, bytes, offset, numBytesRead);
-
-
-            return numBytesRead;
         }
 
         /// <summary>
-        /// Writes the file native.
+        /// Setups the write.
         /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="count">The count.</param>
-        /// <returns></returns>
-        /// <exception cref="System.IndexOutOfRangeException">IndexOutOfRange_IORaceCondition</exception>
-        private int WriteToServer(byte[] bytes, int offset, int count)
+        private void SetupWrite()
         {
-            EnsureSessionIsOpen();
+            if ((!CanWrite))
+                throw new NotSupportedException("Write not supported.");
 
-            Contract.Requires(offset >= 0, "offset >= 0");
-            Contract.Requires(count >= 0, "count >= 0");
-            Contract.Requires(bytes != null, "bytes != null");
-            // Don't corrupt memory when multiple threads are erroneously writing
-            // to this stream simultaneously.  (the OS is reading from
-            // the array we pass to WriteFile, but if we read beyond the end and
-            // that memory isn't allocated, we could get an AV.)
-            if (bytes.Length - offset < count)
-                throw new IndexOutOfRangeException("Probable I/O race condition detected while copying memory. The I/O package is not thread safe by default. In multithreaded applications, a stream must be accessed in a thread-safe way, such as a thread-safe wrapper returned by TextReader's or TextWriter's Synchronized methods. This also applies to classes like StreamWriter and StreamReader.");
-
-            // You can't use the fixed statement on an array of length 0.
-
-            using (var wait = new AutoResetEvent(false))
+            if (!_bufferOwnedByWrite)
             {
-                _session.RequestWrite(_handle, _serverPosition, bytes, offset, count, wait);
-                _serverPosition += (ulong)count;
+                FlushReadBuffer();
+                _bufferOwnedByWrite = true;
             }
-
-            return count;
         }
 
-        private void EnsureSessionIsOpen()
+        private void CheckSessionIsOpen()
         {
             if (_session == null)
                 throw new ObjectDisposedException(GetType().FullName);

From 99fd7b460f11cd483e2b1956e294f5f2aa880a6b Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 19 Mar 2017 16:42:46 +0100
Subject: [PATCH 090/128] Add tests for SftpFileStream.Seek(...).

---
 ...inningOfStream_OriginBeginAndOffsetZero.cs |  69 +++++++++++
 ...iginBeginAndOffsetZero_WithinReadBuffer.cs | 110 ++++++++++++++++++
 .../Renci.SshNet.Tests.csproj                 |   2 +
 3 files changed, 181 insertions(+)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
new file mode 100644
index 000000000..98ae83bf8
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private long _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Seek(0L, SeekOrigin.Begin);
+        }
+
+        [TestMethod]
+        public void SeekShouldHaveReturnedZero()
+        {
+            Assert.AreEqual(0L, _actual);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
new file mode 100644
index 000000000..50b3172af
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
@@ -0,0 +1,110 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    [Ignore]
+    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private long _actual;
+        private byte[] _buffer;
+        private byte[] _serverData;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _buffer = new byte[_readBufferSize - 5];
+            _serverData = GenerateRandom((int) _readBufferSize, _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverData);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target.Read(_buffer, 0, _buffer.Length);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Seek(0L, SeekOrigin.Begin);
+        }
+
+        [TestMethod]
+        public void SeekShouldHaveReturnedZero()
+        {
+            Assert.AreEqual(0L, _actual);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(0L, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void ReadUpToReadBufferSizeShouldReturnBytesFromReadBuffer()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            var buffer = new byte[_readBufferSize];
+
+            var bytesRead = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(buffer.Length, bytesRead);
+            Assert.IsTrue(_serverData.IsEqualTo(buffer));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 7e3f83cf7..fa976e89c 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -435,6 +435,8 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionNotOpen.cs" />

From bcc8def223653d6c8718c180a43b79bd75eed7a6 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 19 Mar 2017 20:37:14 +0100
Subject: [PATCH 091/128] No longer track write position separately. Reading
 from the SftpFileStream will not also affect the position at which a
 subsequent write will be performed. The position at which a write is
 performed in the server file is now always the current position minus the
 position in the buffer.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index fbc4d4674..13ba18cb0 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -28,7 +28,6 @@ public class SftpFileStream : Stream
         private bool _canRead;
         private bool _canSeek;
         private bool _canWrite;
-        private ulong _serverFilePosition;
 
         private readonly object _lock = new object();
 
@@ -262,7 +261,6 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             {
                 var attributes = _session.RequestFStat(_handle, false);
                 _position = attributes.Size;
-                _serverFilePosition = (ulong) attributes.Size;
             }
         }
 
@@ -347,9 +345,6 @@ public override int Read(byte[] buffer, int offset, int count)
 
                         var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
-                        // TODO: don't we need to take into account the number of bytes read (data.Length) ?
-                        _serverFilePosition = (ulong) _position;
-
                         if (data.Length == 0)
                         {
                             break;
@@ -422,11 +417,11 @@ public override int ReadByte()
                 if (_bufferPosition >= _bufferLen)
                 {
                     _bufferPosition = 0;
+                    _bufferLen = 0;
 
                     var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
                     _bufferLen = data.Length;
-                    _serverFilePosition = (ulong) _position;
 
                     if (_bufferLen == 0)
                     {
@@ -501,7 +496,6 @@ public override long Seek(long offset, SeekOrigin origin)
                         throw new EndOfStreamException("End of stream.");
                     }
                     _position = newPosn;
-                    _serverFilePosition = (ulong)newPosn;
                 }
                 else
                 {
@@ -645,8 +639,7 @@ public override void Write(byte[] buffer, int offset, int count)
                     {
                         using (var wait = new AutoResetEvent(false))
                         {
-                            _session.RequestWrite(_handle, _serverFilePosition, buffer, offset, tempLen, wait);
-                            _serverFilePosition += (ulong) tempLen;
+                            _session.RequestWrite(_handle, (ulong) _position, buffer, offset, tempLen, wait);
                         }
                     }
                     else
@@ -668,8 +661,7 @@ public override void Write(byte[] buffer, int offset, int count)
                 {
                     using (var wait = new AutoResetEvent(false))
                     {
-                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                        _serverFilePosition += (ulong) _bufferPosition;
+                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), _writeBuffer, 0, _bufferPosition, wait);
                     }
 
                     _bufferPosition = 0;
@@ -699,8 +691,7 @@ public override void WriteByte(byte value)
                 {
                     using (var wait = new AutoResetEvent(false))
                     {
-                        _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                        _serverFilePosition += (ulong) _bufferPosition;
+                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), _writeBuffer, 0, _bufferPosition, wait);
                     }
 
                     _bufferPosition = 0;
@@ -779,8 +770,7 @@ private void FlushWriteBuffer()
             {
                 using (var wait = new AutoResetEvent(false))
                 {
-                    _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, 0, _bufferPosition, wait);
-                    _serverFilePosition += (ulong) _bufferPosition;
+                    _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), _writeBuffer, 0, _bufferPosition, wait);
                 }
 
                 _bufferPosition = 0;

From bdec2d22f9a40a51edee26ffd303cef09786dff2 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 20 Mar 2017 22:16:35 +0100
Subject: [PATCH 092/128] Update markdown after recent Github changes

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 9e37928d0..39e602520 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.
 [![Version](https://img.shields.io/nuget/vpre/SSH.NET.svg)](https://www.nuget.org/packages/SSH.NET)
 [![Build status](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop?svg=true)](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop)
 
-##Introduction
+## Introduction
 This project was inspired by **Sharp.SSH** library which was ported from java and it seems like was not supported for quite some time. This library is a complete rewrite, without any third party dependencies, using parallelism to achieve the best performance possible.
 
-##Features
+## Features
 * Execution of SSH command using both synchronous and asynchronous methods
 * Return command execution exit status and other information 
 * Provide SFTP functionality for both synchronous and asynchronous operations
@@ -25,7 +25,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * Supports two-factor or higher authentication
 * Supports SOCKS4, SOCKS5 and HTTP Proxy
 
-##Key Exchange Method
+## Key Exchange Method
 
 **SSH.NET** supports the following key exchange methods:
 * diffie-hellman-group-exchange-sha256
@@ -33,7 +33,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * diffie-hellman-group14-sha1
 * diffie-hellman-group1-sha1
 
-##Message Authentication Code
+## Message Authentication Code
 
 **SSH.NET** supports the following MAC algorithms:
 * hmac-md5
@@ -47,7 +47,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * hmac-ripemd160
 * hmac-ripemd160@openssh.com
 
-##Framework Support
+## Framework Support
 **SSH.NET** supports the following target frameworks:
 * .NET Framework 3.5
 * .NET Framework 4.0 (and higher)
@@ -58,7 +58,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * Windows Phone 8.0
 * Universal Windows Platform 10
 
-##Usage
+## Usage
 Establish an SFTP connection using both password and public-key authentication:
 
 ```cs
@@ -73,7 +73,7 @@ using (var client = new SftpClient(connectionInfo))
 
 ```
 
-##Building SSH.NET
+## Building SSH.NET
 
 Software                          | net35 | net40 | netstandard1.3 | sl4 | sl5 | wp71 | wp8 | uap10.0 |
 --------------------------------- | :---: | :---: | :------------: | :-: | :-: | :--: | :-: | :-----: |

From 40efaa6e5a4c4712968b1360b7a0dba8d84ad6a7 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 5 Jun 2017 19:10:49 +0200
Subject: [PATCH 093/128] Move back to writing all read bytes to read buffer,
 not only those that exceed the user supplied buffer.

---
 ...fferAndReadLessBytesFromServerThanCount.cs | 153 ++++++++++++++++++
 ...ferAndReadMoreBytesFromServerThanCount.cs} |  20 +--
 ...ngOfStream_OriginBeginAndOffsetNegative.cs |  97 +++++++++++
 ...ngOfStream_OriginBeginAndOffsetPositive.cs |  88 ++++++++++
 ...inningOfStream_OriginBeginAndOffsetZero.cs |  16 ++
 ...nBeginAndOffsetZero_OutsideOfReadBuffer.cs | 124 ++++++++++++++
 ...iginBeginAndOffsetZero_WithinReadBuffer.cs |  46 +++++-
 .../Renci.SshNet.Tests.csproj                 |   6 +-
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  23 ++-
 9 files changed, 547 insertions(+), 26 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs
 rename src/Renci.SshNet.Tests/Classes/Sftp/{SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs => SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs} (84%)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs
new file mode 100644
index 000000000..d519ab4e7
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs
@@ -0,0 +1,153 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _target;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private int _actual;
+        private byte[] _buffer;
+        private byte[] _serverData1;
+        private byte[] _serverData2;
+        private int _serverData1Length;
+        private int _serverData2Length;
+        private int _numberOfBytesToRead;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = 500;
+
+            _numberOfBytesToRead = 20;
+            _buffer = new byte[_numberOfBytesToRead];
+            _serverData1Length = _numberOfBytesToRead - 5;
+            _serverData1 = GenerateRandom(_serverData1Length, random);
+            _serverData2Length = _numberOfBytesToRead - _serverData1Length + 3;
+            _serverData2 = GenerateRandom(_serverData2Length, random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.IsOpen)
+                .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(_serverData1);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, (ulong) _serverData1.Length, _readBufferSize))
+                .Returns(_serverData2);
+        }
+
+        [TestCleanup]
+        public void TearDown()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Read(_buffer, 0, _numberOfBytesToRead);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveReturnedTheNumberOfBytesRequested()
+        {
+            Assert.AreEqual(_buffer.Length, _actual);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveWrittenBytesToTheCallerSuppliedBuffer()
+        {
+            Assert.IsTrue(_serverData1.IsEqualTo(_buffer.Take(_serverData1Length)));
+
+            var bytesWrittenFromSecondRead = _numberOfBytesToRead - _serverData1Length;
+            Assert.IsTrue(_serverData2.Take(bytesWrittenFromSecondRead).IsEqualTo(_buffer.Take(_serverData1Length, bytesWrittenFromSecondRead)));
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnNumberOfBytesWrittenToBuffer()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_buffer.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumberOfRemainingBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
+
+            _buffer = new byte[numberOfBytesRemainingInReadBuffer];
+
+            var actual = _target.Read(_buffer, 0, _buffer.Length);
+
+            Assert.AreEqual(_buffer.Length, actual);
+            Assert.IsTrue(_serverData2.Take(_numberOfBytesToRead - _serverData1Length, _buffer.Length).IsEqualTo(_buffer));
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong) (_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array<byte>.Empty);
+
+            var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
+
+            _buffer = new byte[numberOfBytesRemainingInReadBuffer + 1];
+
+            var actual = _target.Read(_buffer, 0, _buffer.Length);
+
+            Assert.AreEqual(numberOfBytesRemainingInReadBuffer, actual);
+            Assert.IsTrue(_serverData2.Take(_numberOfBytesToRead - _serverData1Length, numberOfBytesRemainingInReadBuffer).IsEqualTo(_buffer.Take(numberOfBytesRemainingInReadBuffer)));
+            Assert.AreEqual(0, _buffer[numberOfBytesRemainingInReadBuffer]);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong) (_serverData1Length + _serverData2Length), _readBufferSize));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
similarity index 84%
rename from src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs
rename to src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
index d1956e654..aaa31dbb8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
@@ -7,7 +7,7 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount : SftpFileStreamTestBase
+    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount : SftpFileStreamTestBase
     {
         private string _path;
         private SftpFileStream _target;
@@ -18,7 +18,7 @@ public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreByt
         private int _actual;
         private byte[] _buffer;
         private byte[] _serverData;
-        private int _numberOfBytesInReadBuffer;
+        private int _numberOfBytesToWriteToReadBuffer;
         private int _numberOfBytesToRead;
 
         protected override void SetupData()
@@ -34,8 +34,8 @@ protected override void SetupData()
 
             _numberOfBytesToRead = 20;
             _buffer = new byte[_numberOfBytesToRead];
-            _numberOfBytesInReadBuffer = 10;
-            _serverData = GenerateRandom(_buffer.Length + _numberOfBytesInReadBuffer, random);
+            _numberOfBytesToWriteToReadBuffer = 10; // should be less than _readBufferSize
+            _serverData = GenerateRandom(_numberOfBytesToRead + _numberOfBytesToWriteToReadBuffer, random);
         }
 
         protected override void SetupMocks()
@@ -81,9 +81,9 @@ protected override void Act()
         }
 
         [TestMethod]
-        public void ReadShouldHaveReturnedTheNumberOfBytesWrittenToBuffer()
+        public void ReadShouldHaveReturnedTheNumberOfBytesRequested()
         {
-            Assert.AreEqual(_buffer.Length, _actual);
+            Assert.AreEqual(_numberOfBytesToRead, _actual);
         }
 
         [TestMethod]
@@ -107,12 +107,12 @@ public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumb
         {
             SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            _buffer = new byte[_numberOfBytesInReadBuffer];
+            _buffer = new byte[_numberOfBytesToWriteToReadBuffer];
 
-            var actual = _target.Read(_buffer, 0, _numberOfBytesInReadBuffer);
+            var actual = _target.Read(_buffer, 0, _numberOfBytesToWriteToReadBuffer);
 
-            Assert.AreEqual(_numberOfBytesInReadBuffer, actual);
-            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesInReadBuffer).IsEqualTo(_buffer));
+            Assert.AreEqual(_numberOfBytesToWriteToReadBuffer, actual);
+            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesToWriteToReadBuffer).IsEqualTo(_buffer));
 
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
         }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs
new file mode 100644
index 000000000..712880d85
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs
@@ -0,0 +1,97 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private int _offset;
+        private EndOfStreamException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _offset = _random.Next(int.MinValue, -1);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                _target.Seek(_offset, SeekOrigin.Begin);
+                Assert.Fail();
+            }
+            catch (EndOfStreamException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void SeekShouldHaveThrownEndOfStreamException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual("Attempted to read past the end of the stream.", _actualException.Message);
+        }
+
+        [TestMethod]
+        public void IsOpenOnSftpSessionShouldHaveBeenInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(0L, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs
new file mode 100644
index 000000000..c0f368b8c
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs
@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private int _offset;
+        private EndOfStreamException _actualException;
+        private long _actual;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = (uint)_random.Next(5, 1000);
+            _writeBufferSize = (uint)_random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _offset = _random.Next(1, int.MaxValue);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Seek(_offset, SeekOrigin.Begin);
+        }
+
+        [TestMethod]
+        public void SeekShouldHaveReturnedOffset()
+        {
+            Assert.AreEqual(_offset, _actual);
+        }
+
+        [TestMethod]
+        public void IsOpenOnSftpSessionShouldHaveBeenInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnOffset()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_offset, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
index 98ae83bf8..27e8d96fc 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs
@@ -65,5 +65,21 @@ public void SeekShouldHaveReturnedZero()
         {
             Assert.AreEqual(0L, _actual);
         }
+
+        [TestMethod]
+        public void IsOpenOnSftpSessionShouldHaveBeenInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Once);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(0L, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs
new file mode 100644
index 000000000..f30a64109
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs
@@ -0,0 +1,124 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    //[Ignore]
+    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer : SftpFileStreamTestBase
+    {
+        private Random _random;
+        private string _path;
+        private FileMode _fileMode;
+        private FileAccess _fileAccess;
+        private int _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _handle;
+        private SftpFileStream _target;
+        private long _actual;
+        private byte[] _buffer;
+        private byte[] _serverData1;
+        private byte[] _serverData2;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            _random = new Random();
+            _path = _random.Next().ToString();
+            _fileMode = FileMode.OpenOrCreate;
+            _fileAccess = FileAccess.Read;
+            _bufferSize = _random.Next(5, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = (uint) _random.Next(5, 1000);
+            _handle = GenerateRandom(_random.Next(1, 10), _random);
+            _buffer = new byte[_readBufferSize + 1];
+            _serverData1 = GenerateRandom((int)  _readBufferSize, _random);
+            _serverData2 = GenerateRandom(10, _random);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverData1);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, _readBufferSize, _readBufferSize))
+                           .Returns(_serverData2);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+            _target.Read(_buffer, 0, _buffer.Length);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Seek(0L, SeekOrigin.Begin);
+        }
+
+        [TestMethod]
+        public void SeekShouldHaveReturnedZero()
+        {
+            Assert.AreEqual(0L, _actual);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnZero()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(0L, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void IsOpenOnSftpSessionShouldHaveBeenInvokedTwice()
+        {
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
+                           .Returns(new byte[] {0x04});
+
+            var buffer = new byte[1];
+
+            var bytesRead = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(buffer.Length, bytesRead);
+            Assert.AreEqual(0x04, buffer[0]);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
index 50b3172af..0a5afba4e 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
@@ -7,7 +7,7 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    [Ignore]
+    //[Ignore]
     public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer : SftpFileStreamTestBase
     {
         private Random _random;
@@ -93,7 +93,28 @@ public void PositionShouldReturnZero()
         }
 
         [TestMethod]
-        public void ReadUpToReadBufferSizeShouldReturnBytesFromReadBuffer()
+        public void IsOpenOnSftpSessionShouldHaveBeenInvokedTwice()
+        {
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void ReadLessThanReadBufferSizeShouldReturnBytesFromReadBuffer()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            var buffer = new byte[_readBufferSize - 3];
+
+            var bytesRead = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(buffer.Length, bytesRead);
+            Assert.IsTrue(_serverData.Take(buffer.Length).IsEqualTo(buffer));
+        }
+
+        [TestMethod]
+        public void ReadReadBufferSizeShouldReturnBytesFromReadBuffer()
         {
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
@@ -106,5 +127,26 @@ public void ReadUpToReadBufferSizeShouldReturnBytesFromReadBuffer()
             Assert.AreEqual(buffer.Length, bytesRead);
             Assert.IsTrue(_serverData.IsEqualTo(buffer));
         }
+
+        [TestMethod]
+        public void ReadMoreThanReadBufferSizeShouldReturnBytesFromReadBufferAndReadRemaningBytesFromServer()
+        {
+            var serverData2 = GenerateRandom(6, _random);
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, _readBufferSize, _readBufferSize))
+                           .Returns(serverData2);
+
+            var buffer = new byte[_readBufferSize + 4];
+
+            var bytesRead = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(buffer.Length, bytesRead);
+            Assert.IsTrue(_serverData.Take((int) _readBufferSize).IsEqualTo(buffer.Take((int) _readBufferSize)));
+            Assert.IsTrue(serverData2.Take(4).IsEqualTo(buffer.Take((int) _readBufferSize, 4)));
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index fa976e89c..439f8d9e2 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -434,8 +434,12 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 13ba18cb0..db7e2b9e6 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -340,18 +340,18 @@ public override int Read(byte[] buffer, int offset, int count)
                     var bytesAvailableInBuffer = _bufferLen - _bufferPosition;
                     if (bytesAvailableInBuffer <= 0)
                     {
-                        _bufferPosition = 0;
-                        _bufferLen = 0;
-
                         var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
-                        if (data.Length == 0)
+                        _bufferPosition = 0;
+                        _bufferLen = data.Length;
+
+                        if (_bufferLen == 0)
                         {
                             break;
                         }
 
-                        // determine number of bytes that we can read into caller-provided buffer
-                        var bytesToWriteToCallerBuffer = Math.Min(data.Length, count);
+                        // determine number of bytes that we can write into caller-provided buffer
+                        var bytesToWriteToCallerBuffer = Math.Min(_bufferLen, count);
                         // write bytes to caller-provided buffer
                         Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
                         // advance offset to start writing bytes into caller-provided buffer
@@ -362,13 +362,10 @@ public override int Read(byte[] buffer, int offset, int count)
                         readLen += bytesToWriteToCallerBuffer;
                         // update stream position
                         _position += bytesToWriteToCallerBuffer;
-
-                        if (data.Length > bytesToWriteToCallerBuffer)
-                        {
-                            // copy remaining bytes to read buffer
-                            _bufferLen = data.Length - bytesToWriteToCallerBuffer;
-                            Buffer.BlockCopy(data, bytesToWriteToCallerBuffer, _readBuffer, 0, _bufferLen);
-                        }
+                        // update position in read buffer
+                        _bufferPosition = bytesToWriteToCallerBuffer;
+                        // write read bytes to read buffer
+                        Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
                     }
                     else
                     {

From 6fd1cc78c390dce8d502477f1825bf9dc19dafd4 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 12 Jun 2017 21:15:23 +0200
Subject: [PATCH 094/128] Update Read(byte[] buffer, int offset, int count) to
 not write bytes to read buffer when the read buffer is empty and count is
 greater than the number of bytes read from the server. Lazily initialize read
 and write buffer.

---
 ...m_OriginBeginAndOffsetZero_NoBuffering.cs} |  30 +++--
 ...am_OriginBeginAndOffsetZero_ReadBuffer.cs} |  57 ++++-----
 .../Renci.SshNet.Tests.csproj                 |   4 +-
 src/Renci.SshNet/Sftp/SftpFileStream.cs       | 111 +++++++++++-------
 4 files changed, 109 insertions(+), 93 deletions(-)
 rename src/Renci.SshNet.Tests/Classes/Sftp/{SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs => SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs} (80%)
 rename src/Renci.SshNet.Tests/Classes/Sftp/{SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs => SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs} (69%)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs
similarity index 80%
rename from src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs
rename to src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs
index f30a64109..29b683375 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs
@@ -8,7 +8,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
     //[Ignore]
-    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer : SftpFileStreamTestBase
+    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering : SftpFileStreamTestBase
     {
         private Random _random;
         private string _path;
@@ -21,8 +21,7 @@ public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOf
         private SftpFileStream _target;
         private long _actual;
         private byte[] _buffer;
-        private byte[] _serverData1;
-        private byte[] _serverData2;
+        private byte[] _serverData;
 
         protected override void SetupData()
         {
@@ -36,9 +35,8 @@ protected override void SetupData()
             _readBufferSize = 20;
             _writeBufferSize = (uint) _random.Next(5, 1000);
             _handle = GenerateRandom(_random.Next(1, 10), _random);
-            _buffer = new byte[_readBufferSize + 1];
-            _serverData1 = GenerateRandom((int)  _readBufferSize, _random);
-            _serverData2 = GenerateRandom(10, _random);
+            _buffer = new byte[_readBufferSize];
+            _serverData = GenerateRandom(_buffer.Length, _random);
         }
 
         protected override void SetupMocks()
@@ -47,20 +45,17 @@ protected override void SetupMocks()
                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
                            .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
                            .Returns(_writeBufferSize);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
-                           .Returns(_serverData1);
-            SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestRead(_handle, _readBufferSize, _readBufferSize))
-                           .Returns(_serverData2);
+                           .Returns(_serverData);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
@@ -104,21 +99,24 @@ public void IsOpenOnSftpSessionShouldHaveBeenInvokedTwice()
         }
 
         [TestMethod]
-        public void ReadShouldReadFromServer()
+        public void ReadShouldReturnReadBytesFromServer()
         {
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
-                           .Returns(new byte[] {0x04});
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(new byte[] { 0x05, 0x04 });
 
             var buffer = new byte[1];
 
             var bytesRead = _target.Read(buffer, 0, buffer.Length);
 
             Assert.AreEqual(buffer.Length, bytesRead);
-            Assert.AreEqual(0x04, buffer[0]);
+            Assert.AreEqual(0x05, buffer[0]);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Exactly(2));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs
similarity index 69%
rename from src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
rename to src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs
index 0a5afba4e..624a9759f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs
@@ -8,7 +8,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
     //[Ignore]
-    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer : SftpFileStreamTestBase
+    public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer : SftpFileStreamTestBase
     {
         private Random _random;
         private string _path;
@@ -21,7 +21,8 @@ public class SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOf
         private SftpFileStream _target;
         private long _actual;
         private byte[] _buffer;
-        private byte[] _serverData;
+        private byte[] _serverData1;
+        private byte[] _serverData2;
 
         protected override void SetupData()
         {
@@ -35,8 +36,9 @@ protected override void SetupData()
             _readBufferSize = 20;
             _writeBufferSize = (uint) _random.Next(5, 1000);
             _handle = GenerateRandom(_random.Next(1, 10), _random);
-            _buffer = new byte[_readBufferSize - 5];
-            _serverData = GenerateRandom((int) _readBufferSize, _random);
+            _buffer = new byte[2]; // should be less than size of read buffer
+            _serverData1 = GenerateRandom((int) _readBufferSize, _random);
+            _serverData2 = GenerateRandom((int) _readBufferSize, _random);
         }
 
         protected override void SetupMocks()
@@ -45,17 +47,17 @@ protected override void SetupMocks()
                            .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.CreateNewOrOpen, false))
                            .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
+                           .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
                            .Returns(_readBufferSize);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
+                           .Setup(p => p.CalculateOptimalWriteLength((uint) _bufferSize, _handle))
                            .Returns(_writeBufferSize);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
-                           .Returns(_serverData);
+                           .Returns(_serverData1);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
@@ -99,54 +101,39 @@ public void IsOpenOnSftpSessionShouldHaveBeenInvokedTwice()
         }
 
         [TestMethod]
-        public void ReadLessThanReadBufferSizeShouldReturnBytesFromReadBuffer()
+        public void ReadBytesThatWereNotBufferedBeforeSeekShouldReadBytesFromServer()
         {
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
-
-            var buffer = new byte[_readBufferSize - 3];
-
-            var bytesRead = _target.Read(buffer, 0, buffer.Length);
-
-            Assert.AreEqual(buffer.Length, bytesRead);
-            Assert.IsTrue(_serverData.Take(buffer.Length).IsEqualTo(buffer));
-        }
-
-        [TestMethod]
-        public void ReadReadBufferSizeShouldReturnBytesFromReadBuffer()
-        {
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.IsOpen)
-                           .Returns(true);
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverData2);
 
-            var buffer = new byte[_readBufferSize];
+            var bytesRead = _target.Read(_buffer, 0, _buffer.Length);
 
-            var bytesRead = _target.Read(buffer, 0, buffer.Length);
+            Assert.AreEqual(_buffer.Length, bytesRead);
+            Assert.IsTrue(_serverData2.Take(_buffer.Length).IsEqualTo(_buffer));
 
-            Assert.AreEqual(buffer.Length, bytesRead);
-            Assert.IsTrue(_serverData.IsEqualTo(buffer));
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, 0UL, _readBufferSize), Times.Exactly(2));
         }
 
         [TestMethod]
-        public void ReadMoreThanReadBufferSizeShouldReturnBytesFromReadBufferAndReadRemaningBytesFromServer()
+        public void ReadBytesThatWereBufferedBeforeSeekShouldReadBytesFromServer()
         {
-            var serverData2 = GenerateRandom(6, _random);
-
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestRead(_handle, _readBufferSize, _readBufferSize))
-                           .Returns(serverData2);
-
-            var buffer = new byte[_readBufferSize + 4];
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverData2);
 
+            var buffer = new byte[_buffer.Length + 1]; // we read one byte that was previously buffered
             var bytesRead = _target.Read(buffer, 0, buffer.Length);
 
             Assert.AreEqual(buffer.Length, bytesRead);
-            Assert.IsTrue(_serverData.Take((int) _readBufferSize).IsEqualTo(buffer.Take((int) _readBufferSize)));
-            Assert.IsTrue(serverData2.Take(4).IsEqualTo(buffer.Take((int) _readBufferSize, 4)));
+            Assert.IsTrue(_serverData2.Take(buffer.Length).IsEqualTo(buffer));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 439f8d9e2..9944f5c97 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -439,8 +439,8 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_OutsideOfReadBuffer.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_WithinReadBuffer.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionNotOpen.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index db7e2b9e6..fbb718ee3 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -18,9 +18,9 @@ public class SftpFileStream : Stream
 
         // Buffer information.
         private readonly int _readBufferSize;
-        private readonly byte[] _readBuffer;
+        private byte[] _readBuffer;
         private readonly int _writeBufferSize;
-        private readonly byte[] _writeBuffer;
+        private byte[] _writeBuffer;
         private int _bufferPosition;
         private int _bufferLen;
         private long _position;
@@ -253,9 +253,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             // or SSH_FXP_WRITE message
 
             _readBufferSize = (int) session.CalculateOptimalReadLength((uint) bufferSize);
-            _readBuffer = new byte[_readBufferSize];
             _writeBufferSize = (int) session.CalculateOptimalWriteLength((uint) bufferSize, _handle);
-            _writeBuffer = new byte[_writeBufferSize];
 
             if (mode == FileMode.Append)
             {
@@ -342,52 +340,69 @@ public override int Read(byte[] buffer, int offset, int count)
                     {
                         var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
 
-                        _bufferPosition = 0;
-                        _bufferLen = data.Length;
-
-                        if (_bufferLen == 0)
+                        if (data.Length == 0)
                         {
+                            _bufferPosition = 0;
+                            _bufferLen = 0;
+
                             break;
                         }
 
-                        // determine number of bytes that we can write into caller-provided buffer
-                        var bytesToWriteToCallerBuffer = Math.Min(_bufferLen, count);
+                        var bytesToWriteToCallerBuffer = count;
+                        if (bytesToWriteToCallerBuffer >= data.Length)
+                        {
+                            // write all data read to caller-provided buffer
+                            bytesToWriteToCallerBuffer = data.Length;
+                            // reset buffer since we will skip buffering
+                            _bufferPosition = 0;
+                            _bufferLen = 0;
+                        }
+                        else
+                        {
+                            // determine number of bytes that we should write into read buffer
+                            var bytesToWriteToReadBuffer = data.Length - bytesToWriteToCallerBuffer;
+                            // write remaining bytes to read buffer
+                            Buffer.BlockCopy(data, count, GetOrCreateReadBuffer(), 0, bytesToWriteToReadBuffer);
+                            // update position in read buffer
+                            _bufferPosition = 0;
+                            // update number of bytes in read buffer
+                            _bufferLen = bytesToWriteToReadBuffer;
+                        }
+
                         // write bytes to caller-provided buffer
                         Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
                         // advance offset to start writing bytes into caller-provided buffer
                         offset += bytesToWriteToCallerBuffer;
-                        // update number of bytes left to read
-                        count -= bytesToWriteToCallerBuffer;
                         // record total number of bytes read into caller-provided buffer
                         readLen += bytesToWriteToCallerBuffer;
+                        // signal that all caller-requested bytes are read
+                        count -= bytesToWriteToCallerBuffer;
                         // update stream position
                         _position += bytesToWriteToCallerBuffer;
-                        // update position in read buffer
-                        _bufferPosition = bytesToWriteToCallerBuffer;
-                        // write read bytes to read buffer
-                        Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
                     }
                     else
                     {
-                        // determine number of bytes that we can write from read buffer to caller-provided buffer
-                        var bytesToWriteToCallerBuffer = Math.Min(bytesAvailableInBuffer, count);
+                        // limit the number of bytes to use from read buffer to the caller-request number of bytes
+                        if (bytesAvailableInBuffer > count)
+                            bytesAvailableInBuffer = count;
+
                         // copy data from read buffer to the caller-provided buffer
-                        Buffer.BlockCopy(_readBuffer, _bufferPosition, buffer, offset, bytesToWriteToCallerBuffer);
+                        Buffer.BlockCopy(GetOrCreateReadBuffer(), _bufferPosition, buffer, offset, bytesAvailableInBuffer);
                         // update position in read buffer
-                        _bufferPosition += bytesToWriteToCallerBuffer;
+                        _bufferPosition += bytesAvailableInBuffer;
                         // advance offset to start writing bytes into caller-provided buffer
                         offset += bytesAvailableInBuffer;
-                        // update number of bytes left to read
-                        count -= bytesToWriteToCallerBuffer;
                         // record total number of bytes read into caller-provided buffer
-                        readLen += bytesToWriteToCallerBuffer;
+                        readLen += bytesAvailableInBuffer;
+                        // update number of bytes left to read
+                        count -= bytesAvailableInBuffer;
                         // update stream position
-                        _position += bytesToWriteToCallerBuffer;
+                        _position += bytesAvailableInBuffer;
                     }
                 }
             }
 
-            // Return the number of bytes that were read to the caller.
+            // return the number of bytes that were read to the caller.
             return readLen;
         }
 
@@ -410,28 +425,32 @@ public override int ReadByte()
                 // Setup the object for reading.
                 SetupRead();
 
+                byte[] readBuffer;
+
                 // Read more data into the internal buffer if necessary.
                 if (_bufferPosition >= _bufferLen)
                 {
-                    _bufferPosition = 0;
-                    _bufferLen = 0;
-
                     var data = _session.RequestRead(_handle, (ulong) _position, (uint) _readBufferSize);
-
-                    _bufferLen = data.Length;
-
-                    if (_bufferLen == 0)
+                    if (data.Length == 0)
                     {
                         // We've reached EOF.
                         return -1;
                     }
 
-                    Buffer.BlockCopy(data, 0, _readBuffer, 0, _bufferLen);
+                    readBuffer = GetOrCreateReadBuffer();
+                    Buffer.BlockCopy(data, 0, readBuffer, 0, data.Length);
+
+                    _bufferPosition = 0;
+                    _bufferLen = data.Length;
+                }
+                else
+                {
+                    readBuffer = GetOrCreateReadBuffer();
                 }
 
                 // Extract the next byte from the buffer.
                 ++_position;
-                return _readBuffer[_bufferPosition++];
+                return readBuffer[_bufferPosition++];
             }
         }
 
@@ -501,8 +520,7 @@ public override long Seek(long offset, SeekOrigin origin)
                     if (origin == SeekOrigin.Begin)
                     {
                         newPosn = _position - _bufferPosition;
-                        if (offset >= newPosn && offset <
-                                (newPosn + _bufferLen))
+                        if (offset >= newPosn && offset < (newPosn + _bufferLen))
                         {
                             _bufferPosition = (int)(offset - newPosn);
                             _position = offset;
@@ -515,8 +533,7 @@ public override long Seek(long offset, SeekOrigin origin)
                         if (newPosn >= (_position - _bufferPosition) &&
                            newPosn < (_position - _bufferPosition + _bufferLen))
                         {
-                            _bufferPosition =
-                                (int)(newPosn - (_position - _bufferPosition));
+                            _bufferPosition = (int) (newPosn - (_position - _bufferPosition));
                             _position = newPosn;
                             return _position;
                         }
@@ -642,7 +659,7 @@ public override void Write(byte[] buffer, int offset, int count)
                     else
                     {
                         // No: copy the data to the write buffer first.
-                        Buffer.BlockCopy(buffer, offset, _writeBuffer, _bufferPosition, tempLen);
+                        Buffer.BlockCopy(buffer, offset, GetOrCreateWriteBuffer(), _bufferPosition, tempLen);
                         _bufferPosition += tempLen;
                     }
 
@@ -658,7 +675,7 @@ public override void Write(byte[] buffer, int offset, int count)
                 {
                     using (var wait = new AutoResetEvent(false))
                     {
-                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), _writeBuffer, 0, _bufferPosition, wait);
+                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), GetOrCreateWriteBuffer(), 0, _bufferPosition, wait);
                     }
 
                     _bufferPosition = 0;
@@ -742,6 +759,20 @@ protected override void Dispose(bool disposing)
             }
         }
 
+        private byte[] GetOrCreateReadBuffer()
+        {
+            if (_readBuffer == null)
+                _readBuffer = new byte[_readBufferSize];
+            return _readBuffer;
+        }
+
+        private byte[] GetOrCreateWriteBuffer()
+        {
+            if (_writeBuffer == null)
+                _writeBuffer = new byte[_writeBufferSize];
+            return _writeBuffer;
+        }
+
         /// <summary>
         /// Flushes the read data from the buffer.
         /// </summary>

From 50ea405d5a65985ed4909b551852516f7c2f601c Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Mon, 12 Jun 2017 21:35:13 +0200
Subject: [PATCH 095/128] Sync project file.

---
 .../Renci.SshNet.Tests.NET35.csproj           | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 2c350023e..5e4891fa8 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1202,8 +1202,26 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesThanCount.cs</Link>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetZero.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs</Link>
@@ -1223,6 +1241,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileSystemInformationTest.cs">
       <Link>Classes\Sftp\SftpFileSystemInformationTest.cs</Link>
     </Compile>
@@ -1451,7 +1472,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From c83188a5a991b7e41c323326772262ed662c01c2 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 12 Jun 2017 22:29:16 +0200
Subject: [PATCH 096/128] Harden test.

---
 ...Connected_KeepAlivesNotSentConcurrently.cs | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
index ff6038744..262668d7e 100644
--- a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
+++ b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAlivesNotSentConcurrently.cs
@@ -11,8 +11,10 @@ public class BaseClientTest_Connected_KeepAlivesNotSentConcurrently
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private MockSequence _mockSequence;
         private BaseClient _client;
         private ConnectionInfo _connectionInfo;
+        private ManualResetEvent _keepAliveSent;
 
         [TestInitialize]
         public void Setup()
@@ -24,20 +26,33 @@ public void Setup()
         [TestCleanup]
         public void Cleanup()
         {
+            if (_client != null)
+            {
+                _sessionMock.InSequence(_mockSequence).Setup(p => p.OnDisconnecting());
+                _sessionMock.InSequence(_mockSequence).Setup(p => p.Dispose());
+                _client.Dispose();
+            }
         }
 
         protected void Arrange()
         {
             _connectionInfo = new ConnectionInfo("host", "user", new PasswordAuthenticationMethod("user", "pwd"));
+            _keepAliveSent = new ManualResetEvent(false);
 
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
 
-            _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
-            _sessionMock.Setup(p => p.Connect());
-            _sessionMock.Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
+            _mockSequence = new MockSequence();
+
+            _serviceFactoryMock.InSequence(_mockSequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
+            _sessionMock.InSequence(_mockSequence).Setup(p => p.Connect());
+            _sessionMock.InSequence(_mockSequence).Setup(p => p.TrySendMessage(It.IsAny<IgnoreMessage>()))
                 .Returns(true)
-                .Callback(() => Thread.Sleep(300));
+                .Callback(() =>
+                    {
+                        Thread.Sleep(300);
+                        _keepAliveSent.Set();
+                    });
 
             _client = new MyClient(_connectionInfo, false, _serviceFactoryMock.Object)
                 {
@@ -51,6 +66,12 @@ protected void Act()
             // should keep-alive message be sent concurrently, then multiple keep-alive
             // message would be sent during this sleep period
             Thread.Sleep(200);
+
+            // disable further keep-alives
+            _client.KeepAliveInterval = Session.InfiniteTimeSpan;
+
+            // wait until keep-alive has been sent at least once
+            Assert.IsTrue(_keepAliveSent.WaitOne(500));
         }
 
         [TestMethod]

From 416f7be804e58c3ebf598fd8360c57b5ec87a10f Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 17 Jun 2017 12:33:04 +0200
Subject: [PATCH 097/128] Ensure write buffer is initialized before attempting
 to use it.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index fbb718ee3..fb22968af 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -700,19 +700,21 @@ public override void WriteByte(byte value)
                 // Setup the object for writing.
                 SetupWrite();
 
+                var writeBuffer = GetOrCreateWriteBuffer();
+
                 // Flush the current buffer if it is full.
                 if (_bufferPosition >= _writeBufferSize)
                 {
                     using (var wait = new AutoResetEvent(false))
                     {
-                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), _writeBuffer, 0, _bufferPosition, wait);
+                        _session.RequestWrite(_handle, (ulong) (_position - _bufferPosition), writeBuffer, 0, _bufferPosition, wait);
                     }
 
                     _bufferPosition = 0;
                 }
 
                 // Write the byte into the buffer and advance the posn.
-                _writeBuffer[_bufferPosition++] = value;
+                writeBuffer[_bufferPosition++] = value;
                 ++_position;
             }
         }

From 5408aace90b3e3a30a4e0a7348def3a59ac8ab40 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 16 Jul 2017 20:04:58 +0200
Subject: [PATCH 098/128] Avoid reading from the server twice to determine EOF.

When a server returns less number of bytes than the read buffer size, this *may* indicate that EOF has been reached. A subsequent (SSH_FXP_READ) server request is necessary to make sure EOF has effectively been reached.
Breaking out of the read loop avoids reading from the server twice to determine EOF: once in the read loop,
and once upon the next Read or ReadByte invocation.
---
 ...romServerThanCountAndEqualToBufferSize.cs} |  22 +--
 ...romServerThanCountAndLessThanBufferSize.cs | 148 ++++++++++++++++++
 ...fferAndReadMoreBytesFromServerThanCount.cs |  35 ++++-
 src/Renci.SshNet.Tests/Common/Extensions.cs   |   8 +
 .../Renci.SshNet.Tests.csproj                 |   3 +-
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  45 ++++--
 6 files changed, 233 insertions(+), 28 deletions(-)
 rename src/Renci.SshNet.Tests/Classes/Sftp/{SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs => SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs} (85%)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
similarity index 85%
rename from src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs
rename to src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
index d519ab4e7..5f6f24be9 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
@@ -8,7 +8,7 @@
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
-    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount : SftpFileStreamTestBase
+    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize : SftpFileStreamTestBase
     {
         private string _path;
         private SftpFileStream _target;
@@ -35,12 +35,14 @@ protected override void SetupData()
             _readBufferSize = 20;
             _writeBufferSize = 500;
 
-            _numberOfBytesToRead = 20;
+            _numberOfBytesToRead = (int) _readBufferSize + 5; // greather than read buffer size
             _buffer = new byte[_numberOfBytesToRead];
-            _serverData1Length = _numberOfBytesToRead - 5;
+            _serverData1Length = (int) _readBufferSize; // equal to read buffer size
             _serverData1 = GenerateRandom(_serverData1Length, random);
-            _serverData2Length = _numberOfBytesToRead - _serverData1Length + 3;
+            _serverData2Length = (int) _readBufferSize; // equal to read buffer size
             _serverData2 = GenerateRandom(_serverData2Length, random);
+
+            Assert.IsTrue(_serverData1Length < _numberOfBytesToRead && _serverData1Length == _readBufferSize);
         }
 
         protected override void SetupMocks()
@@ -61,7 +63,7 @@ protected override void SetupMocks()
                 .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
                 .Returns(_serverData1);
             SftpSessionMock.InSequence(MockSequence)
-                .Setup(p => p.RequestRead(_handle, (ulong) _serverData1.Length, _readBufferSize))
+                .Setup(p => p.RequestRead(_handle, (ulong)_serverData1.Length, _readBufferSize))
                 .Returns(_serverData2);
         }
 
@@ -91,7 +93,7 @@ protected override void Act()
         [TestMethod]
         public void ReadShouldHaveReturnedTheNumberOfBytesRequested()
         {
-            Assert.AreEqual(_buffer.Length, _actual);
+            Assert.AreEqual(_numberOfBytesToRead, _actual);
         }
 
         [TestMethod]
@@ -104,11 +106,11 @@ public void ReadShouldHaveWrittenBytesToTheCallerSuppliedBuffer()
         }
 
         [TestMethod]
-        public void PositionShouldReturnNumberOfBytesWrittenToBuffer()
+        public void PositionShouldReturnNumberOfBytesWrittenToCallerProvidedBuffer()
         {
             SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(_buffer.Length, _target.Position);
+            Assert.AreEqual(_actual, _target.Position);
 
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
         }
@@ -134,7 +136,7 @@ public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumb
         public void ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
         {
             SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong) (_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array<byte>.Empty);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array<byte>.Empty);
 
             var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
 
@@ -147,7 +149,7 @@ public void ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountI
             Assert.AreEqual(0, _buffer[numberOfBytesRemainingInReadBuffer]);
 
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
-            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong) (_serverData1Length + _serverData2Length), _readBufferSize));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs
new file mode 100644
index 000000000..85a6679b8
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs
@@ -0,0 +1,148 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _target;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private int _actual;
+        private byte[] _buffer;
+        private byte[] _serverData;
+        private int _serverDataLength;
+        private int _numberOfBytesToRead;
+        private byte[] _originalBuffer;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = 500;
+
+            _numberOfBytesToRead = (int) _readBufferSize + 2; // greater than read buffer size
+            _originalBuffer = GenerateRandom(_numberOfBytesToRead, random);
+            _buffer = _originalBuffer.Copy();
+
+            _serverDataLength = (int) _readBufferSize - 1; // less than read buffer size
+            _serverData = GenerateRandom(_serverDataLength, random);
+
+            Assert.IsTrue(_serverDataLength < _numberOfBytesToRead && _serverDataLength < _readBufferSize);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.IsOpen)
+                .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                .Returns(_serverData);
+        }
+
+        [TestCleanup]
+        public void TearDown()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestClose(_handle));
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
+        }
+
+        protected override void Act()
+        {
+            _actual = _target.Read(_buffer, 0, _numberOfBytesToRead);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveReturnedTheNumberOfBytesReturnedByTheReadFromTheServer()
+        {
+            Assert.AreEqual(_serverDataLength, _actual);
+        }
+
+        [TestMethod]
+        public void ReadShouldHaveWrittenBytesToTheCallerSuppliedBufferAndRemainingBytesShouldRemainUntouched()
+        {
+            Assert.IsTrue(_serverData.IsEqualTo(_buffer.Take(_serverDataLength)));
+            Assert.IsTrue(_originalBuffer.Take(_serverDataLength, _originalBuffer.Length - _serverDataLength).IsEqualTo(_buffer.Take(_serverDataLength, _buffer.Length - _serverDataLength)));
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnNumberOfBytesWrittenToCallerProvidedBuffer()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_actual, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndReturnZeroWhenServerReturnsZeroBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, (ulong) _actual, _readBufferSize))
+                .Returns(Array<byte>.Empty);
+
+            var buffer = _originalBuffer.Copy();
+            var actual = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(0, actual);
+            Assert.IsTrue(_originalBuffer.IsEqualTo(buffer));
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_actual, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+        }
+
+        [TestMethod]
+        public void SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndNotUpdatePositionWhenServerReturnsZeroBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                .Setup(p => p.RequestRead(_handle, (ulong)_actual, _readBufferSize))
+                .Returns(Array<byte>.Empty);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+
+            _target.Read(new byte[10], 0, 10);
+
+            Assert.AreEqual(_actual, _target.Position);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_actual, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
index aaa31dbb8..97c66422b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
@@ -3,6 +3,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Sftp;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
@@ -81,7 +82,7 @@ protected override void Act()
         }
 
         [TestMethod]
-        public void ReadShouldHaveReturnedTheNumberOfBytesRequested()
+        public void ReadShouldHaveReturnedTheNumberOfBytesWrittenToCallerSuppliedBuffer()
         {
             Assert.AreEqual(_numberOfBytesToRead, _actual);
         }
@@ -89,32 +90,50 @@ public void ReadShouldHaveReturnedTheNumberOfBytesRequested()
         [TestMethod]
         public void ReadShouldHaveWrittenBytesToTheCallerSuppliedBuffer()
         {
-            Assert.IsTrue(_serverData.Take(_buffer.Length).IsEqualTo(_buffer));
+            Assert.IsTrue(_serverData.Take(_actual).IsEqualTo(_buffer));
         }
 
         [TestMethod]
-        public void PositionShouldReturnNumberOfBytesWrittenToBuffer()
+        public void PositionShouldReturnNumberOfBytesWrittenToCallerProvidedBuffer()
         {
             SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(_buffer.Length, _target.Position);
+            Assert.AreEqual(_actual, _target.Position);
 
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
         }
 
         [TestMethod]
-        public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumberOfRemainingBytes()
+        public void SubsequentReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumberOfRemainingBytes()
         {
             SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
 
-            _buffer = new byte[_numberOfBytesToWriteToReadBuffer];
+            var buffer = new byte[_numberOfBytesToWriteToReadBuffer];
 
-            var actual = _target.Read(_buffer, 0, _numberOfBytesToWriteToReadBuffer);
+            var actual = _target.Read(buffer, 0, _numberOfBytesToWriteToReadBuffer);
 
             Assert.AreEqual(_numberOfBytesToWriteToReadBuffer, actual);
-            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesToWriteToReadBuffer).IsEqualTo(_buffer));
+            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesToWriteToReadBuffer).IsEqualTo(buffer));
 
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
         }
+
+        [TestMethod]
+        public void SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
+        {
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize)).Returns(Array<byte>.Empty);
+
+            var buffer = new byte[_numberOfBytesToWriteToReadBuffer + 1];
+
+            var actual = _target.Read(buffer, 0, buffer.Length);
+
+            Assert.AreEqual(_numberOfBytesToWriteToReadBuffer, actual);
+            Assert.IsTrue(_serverData.Take(_numberOfBytesToRead, _numberOfBytesToWriteToReadBuffer).IsEqualTo(buffer.Take(_numberOfBytesToWriteToReadBuffer)));
+            Assert.AreEqual(0, buffer[_numberOfBytesToWriteToReadBuffer]);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(2));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize));
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Common/Extensions.cs b/src/Renci.SshNet.Tests/Common/Extensions.cs
index 68a2923ff..6bb1e45ea 100644
--- a/src/Renci.SshNet.Tests/Common/Extensions.cs
+++ b/src/Renci.SshNet.Tests/Common/Extensions.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Renci.SshNet.Common;
+using System;
 
 namespace Renci.SshNet.Tests.Common
 {
@@ -16,5 +17,12 @@ public static string AsString(this IList<ExceptionEventArgs> exceptionEvents)
 
             return reportedExceptions;
         }
+
+        public static byte[] Copy(this byte[] buffer)
+        {
+            var copy = new byte[buffer.Length];
+            Buffer.BlockCopy(buffer, 0, copy, 0, buffer.Length);
+            return copy;
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 9944f5c97..9bf0c4cd4 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -434,7 +434,8 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
-    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetNegative.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index fb22968af..500e1ba9c 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -310,6 +310,22 @@ public override void Flush()
         /// <exception cref="IOException">An I/O error occurs. </exception>
         /// <exception cref="NotSupportedException">The stream does not support reading. </exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <remarks>
+        /// <para>
+        /// This method attempts to read up to <paramref name="count"/> bytes. This either from the buffer, from the
+        /// server (using one or more <c>SSH_FXP_READ</c> requests) or using a combination of both.
+        /// </para>
+        /// <para>
+        /// The read loop is interrupted when either <paramref name="count"/> bytes are read, the server returns zero
+        /// bytes (EOF) or less bytes than the read buffer size.
+        /// </para>
+        /// <para>
+        /// When a server returns less number of bytes than the read buffer size, this <c>may</c> indicate that EOF has
+        /// been reached. A subsequent (<c>SSH_FXP_READ</c>) server request is necessary to make sure EOF has effectively
+        /// been reached.  Breaking out of the read loop avoids reading from the server twice to determine EOF: once in
+        /// the read loop, and once upon the next <see cref="Read"/> or <see cref="ReadByte"/> invocation.
+        /// </para>
+        /// </remarks>
         public override int Read(byte[] buffer, int offset, int count)
         {
             var readLen = 0;
@@ -371,14 +387,25 @@ public override int Read(byte[] buffer, int offset, int count)
 
                         // write bytes to caller-provided buffer
                         Buffer.BlockCopy(data, 0, buffer, offset, bytesToWriteToCallerBuffer);
-                        // advance offset to start writing bytes into caller-provided buffer
-                        offset += bytesToWriteToCallerBuffer;
+                        // update stream position
+                        _position += bytesToWriteToCallerBuffer;
                         // record total number of bytes read into caller-provided buffer
                         readLen += bytesToWriteToCallerBuffer;
-                        // signal that all caller-requested bytes are read
+
+                        // break out of the read loop when the server returned less than the request number of bytes
+                        // as that *may* indicate that we've reached EOF
+                        //
+                        // doing this avoids reading from server twice to determine EOF: once in the read loop, and
+                        // once upon the next Read or ReadByte invocation by the caller
+                        if (data.Length < _readBufferSize)
+                        {
+                            break;
+                        }
+
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesToWriteToCallerBuffer;
+                        // update number of bytes left to read into caller-provided buffer
                         count -= bytesToWriteToCallerBuffer;
-                        // update stream position
-                        _position += bytesToWriteToCallerBuffer;
                     }
                     else
                     {
@@ -390,14 +417,14 @@ public override int Read(byte[] buffer, int offset, int count)
                         Buffer.BlockCopy(GetOrCreateReadBuffer(), _bufferPosition, buffer, offset, bytesAvailableInBuffer);
                         // update position in read buffer
                         _bufferPosition += bytesAvailableInBuffer;
-                        // advance offset to start writing bytes into caller-provided buffer
-                        offset += bytesAvailableInBuffer;
+                        // update stream position
+                        _position += bytesAvailableInBuffer;
                         // record total number of bytes read into caller-provided buffer
                         readLen += bytesAvailableInBuffer;
+                        // advance offset to start writing bytes into caller-provided buffer
+                        offset += bytesAvailableInBuffer;
                         // update number of bytes left to read
                         count -= bytesAvailableInBuffer;
-                        // update stream position
-                        _position += bytesAvailableInBuffer;
                     }
                 }
             }

From b6807656927da5925fd0579dd89dc460195363bf Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 16 Jul 2017 20:06:12 +0200
Subject: [PATCH 099/128] Add comment to clarify that StreamReader uses a
 buffer size of 1024 bytes.

---
 src/Renci.SshNet/SftpClient.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 59d222bb9..3bde01ad3 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1,5 +1,4 @@
 using System;
-
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -1425,6 +1424,9 @@ public string[] ReadAllLines(string path)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public string[] ReadAllLines(string path, Encoding encoding)
         {
+            // we use the default buffer size for StreamReader - which is 1024 bytes - and the configured buffer size
+            // for the SftpFileStream; may want to revisit this later
+
             var lines = new List<string>();
             using (var stream = new StreamReader(OpenRead(path), encoding))
             {
@@ -1464,6 +1466,9 @@ public string ReadAllText(string path)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public string ReadAllText(string path, Encoding encoding)
         {
+            // we use the default buffer size for StreamReader - which is 1024 bytes - and the configured buffer size
+            // for the SftpFileStream; may want to revisit this later
+
             using (var stream = new StreamReader(OpenRead(path), encoding))
             {
                 return stream.ReadToEnd();

From 17a9c61464f52e97bd9187e4640d191f65b620b0 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 16 Jul 2017 20:06:53 +0200
Subject: [PATCH 100/128] Use langversion 5 for .NET Core project.

---
 src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
index c06afc025..6f2178443 100644
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -6,6 +6,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Renci.SshNet</AssemblyName>
     <AssemblyOriginatorKeyFile>../Renci.SshNet.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>5</LangVersion>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

From 55e31b1e7b6cc3c690fa32a4c6a7e395e3a349c4 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Sun, 16 Jul 2017 22:03:06 +0200
Subject: [PATCH 101/128] Sync project file

---
 .../Renci.SshNet.Tests.NET35.csproj                      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 5e4891fa8..928789069 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1202,8 +1202,11 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs">
-      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCount.cs</Link>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs</Link>
@@ -1472,7 +1475,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 46966d37cb7b856820d780c816956e29651d2554 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Fri, 21 Jul 2017 14:23:30 +0200
Subject: [PATCH 102/128] Precise that we only support SSH-2.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39e602520..cb5332b7d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 SSH.NET
 =======
-SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.
+SSH.NET is a Secure Shell (SSH-2) library for .NET, optimized for parallelism.
 
 [![Version](https://img.shields.io/nuget/vpre/SSH.NET.svg)](https://www.nuget.org/packages/SSH.NET)
 [![Build status](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop?svg=true)](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop)

From fa640e12a5ebdf08b7e6adacb0b14849826fa101 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 23 Jul 2017 20:41:54 +0200
Subject: [PATCH 103/128] Improve documentation of LocalPacketSize.

---
 src/Renci.SshNet/Channels/Channel.cs  | 10 +++++++++-
 src/Renci.SshNet/Channels/IChannel.cs | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Channels/Channel.cs b/src/Renci.SshNet/Channels/Channel.cs
index 8ced6516b..8ea7df54f 100644
--- a/src/Renci.SshNet/Channels/Channel.cs
+++ b/src/Renci.SshNet/Channels/Channel.cs
@@ -120,11 +120,19 @@ protected ISession Session
         public uint LocalChannelNumber { get; private set; }
 
         /// <summary>
-        /// Gets the maximum size of a packet.
+        /// Gets the maximum size of a data packet that we can receive using the channel.
         /// </summary>
         /// <value>
         /// The maximum size of a packet.
         /// </value>
+        /// <remarks>
+        /// <para>
+        /// This is the maximum size (in bytes) we support for the data (payload) of a
+        /// <c>SSH_MSG_CHANNEL_DATA</c> message we receive.
+        /// </para>
+        /// <para>
+        /// We currently do not enforce this limit.
+        /// </para>
         public uint LocalPacketSize { get; private set; }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Channels/IChannel.cs b/src/Renci.SshNet/Channels/IChannel.cs
index c3fb67d81..4b4df01df 100644
--- a/src/Renci.SshNet/Channels/IChannel.cs
+++ b/src/Renci.SshNet/Channels/IChannel.cs
@@ -43,11 +43,19 @@ internal interface IChannel : IDisposable
         uint LocalChannelNumber { get; }
 
         /// <summary>
-        /// Gets the maximum size of a packet.
+        /// Gets the maximum size of a data packet that we can receive using the channel.
         /// </summary>
         /// <value>
         /// The maximum size of a packet.
         /// </value>
+        /// <remarks>
+        /// <para>
+        /// This is the maximum size (in bytes) we support for the data (payload) of a
+        /// <c>SSH_MSG_CHANNEL_DATA</c> message we receive.
+        /// </para>
+        /// <para>
+        /// We currently do not enforce this limit.
+        /// </para>
         uint LocalPacketSize { get; }
 
         /// <summary>

From e86fd18b21fe6b22ca885c94989bfcf791cca5bb Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 23 Jul 2017 20:43:11 +0200
Subject: [PATCH 104/128] Limit size of SSH packet to 35.000 bytes. Improve
 documentation of LocalChannelDataPacketSize.

---
 src/Renci.SshNet/Session.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 831353da8..2a8b94def 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -49,7 +49,10 @@ public class Session : ISession
         /// <summary>
         /// Specifies maximum packet size defined by the protocol.
         /// </summary>
-        private const int MaximumSshPacketSize = LocalChannelDataPacketSize + 3000;
+        /// <value>
+        /// 35000.
+        /// </value>
+        private const int MaximumSshPacketSize = 35000;
 
         /// <summary>
         /// Holds the initial local window size for the channels.
@@ -65,6 +68,15 @@ public class Session : ISession
         /// <value>
         /// 64 KB.
         /// </value>
+        /// <remarks>
+        /// <para>
+        /// This is the maximum size (in bytes) we support for the data (payload) of a
+        /// <c>SSH_MSG_CHANNEL_DATA</c> message we receive.
+        /// </para>
+        /// <para>
+        /// We currently do not enforce this limit.
+        /// </para>
+        /// </remarks>
         private const int LocalChannelDataPacketSize = 1024*64;
 
 #if FEATURE_REGEX_COMPILE

From ea47d9db98e0fa00efc632522b5d3c76f055cbf9 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 23 Jul 2017 20:45:23 +0200
Subject: [PATCH 105/128] Fix xml doc.

---
 src/Renci.SshNet/Channels/Channel.cs  | 1 +
 src/Renci.SshNet/Channels/IChannel.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Renci.SshNet/Channels/Channel.cs b/src/Renci.SshNet/Channels/Channel.cs
index 8ea7df54f..40a331c45 100644
--- a/src/Renci.SshNet/Channels/Channel.cs
+++ b/src/Renci.SshNet/Channels/Channel.cs
@@ -133,6 +133,7 @@ protected ISession Session
         /// <para>
         /// We currently do not enforce this limit.
         /// </para>
+        /// </remarks>
         public uint LocalPacketSize { get; private set; }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Channels/IChannel.cs b/src/Renci.SshNet/Channels/IChannel.cs
index 4b4df01df..005a8754c 100644
--- a/src/Renci.SshNet/Channels/IChannel.cs
+++ b/src/Renci.SshNet/Channels/IChannel.cs
@@ -56,6 +56,7 @@ internal interface IChannel : IDisposable
         /// <para>
         /// We currently do not enforce this limit.
         /// </para>
+        /// </remarks>
         uint LocalPacketSize { get; }
 
         /// <summary>

From 7c05bd19bab68e37ac08ea544320f32d314cf497 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 23 Jul 2017 21:54:58 +0200
Subject: [PATCH 106/128] Increase max. SSH packet size back to 68536 (64 KB +
 3000).

---
 src/Renci.SshNet/Session.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 2a8b94def..69dea163e 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -50,9 +50,9 @@ public class Session : ISession
         /// Specifies maximum packet size defined by the protocol.
         /// </summary>
         /// <value>
-        /// 35000.
+        /// 68536 (64 KB + 3000).
         /// </value>
-        private const int MaximumSshPacketSize = 35000;
+        private const int MaximumSshPacketSize = LocalChannelDataPacketSize + 3000;
 
         /// <summary>
         /// Holds the initial local window size for the channels.

From cc04517efd56f11c114bc4d76d3f1a46757e4d9e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 29 Jul 2017 11:04:37 +0200
Subject: [PATCH 107/128] Use BE methods on Pack.

---
 src/Renci.SshNet/Common/SshData.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Renci.SshNet/Common/SshData.cs b/src/Renci.SshNet/Common/SshData.cs
index d4b293cbd..63cfcb23f 100644
--- a/src/Renci.SshNet/Common/SshData.cs
+++ b/src/Renci.SshNet/Common/SshData.cs
@@ -209,8 +209,7 @@ protected bool ReadBoolean()
         /// <returns>uint16 read</returns>
         protected ushort ReadUInt16()
         {
-            var data = ReadBytes(2);
-            return (ushort)(data[0] << 8 | data[1]);
+            return Pack.BigEndianToUInt16(ReadBytes(2));
         }
 
         /// <summary>
@@ -219,8 +218,7 @@ protected ushort ReadUInt16()
         /// <returns>uint32 read</returns>
         protected uint ReadUInt32()
         {
-            var data = ReadBytes(4);
-            return (uint)(data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]);
+            return Pack.BigEndianToUInt32(ReadBytes(4));
         }
 
         /// <summary>
@@ -229,8 +227,7 @@ protected uint ReadUInt32()
         /// <returns>uint64 read</returns>
         protected ulong ReadUInt64()
         {
-            var data = ReadBytes(8);
-            return ((ulong)data[0] << 56 | (ulong)data[1] << 48 | (ulong)data[2] << 40 | (ulong)data[3] << 32 | (ulong)data[4] << 24 | (ulong)data[5] << 16 | (ulong)data[6] << 8 | data[7]);
+            return Pack.BigEndianToUInt64(ReadBytes(8));
         }
 
         /// <summary>

From 385b8a6c2807617f70fd050339019fb4bef3c867 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sat, 29 Jul 2017 15:29:47 +0200
Subject: [PATCH 108/128] Increase initial window size for SSH channels from 2
 MB to 2147483647 (2^31 - 1) bytes.

---
 src/Renci.SshNet/Session.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 69dea163e..ac929685c 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -50,7 +50,7 @@ public class Session : ISession
         /// Specifies maximum packet size defined by the protocol.
         /// </summary>
         /// <value>
-        /// 68536 (64 KB + 3000).
+        /// 68536 (64 KB + 3000 bytes).
         /// </value>
         private const int MaximumSshPacketSize = LocalChannelDataPacketSize + 3000;
 
@@ -58,9 +58,12 @@ public class Session : ISession
         /// Holds the initial local window size for the channels.
         /// </summary>
         /// <value>
-        /// 2 MB.
+        /// 2147483647 (2^31 - 1) bytes.
         /// </value>
-        private const int InitialLocalWindowSize = LocalChannelDataPacketSize * 32;
+        /// <remarks>
+        /// We currently do not define a maximum (remote) window size.
+        /// </remarks>
+        private const int InitialLocalWindowSize = 0x7FFFFFFF;
 
         /// <summary>
         /// Holds the maximum size of channel data packets that we receive.

From 216f36458796932de7ff0cdb8cdc26aca049c325 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 30 Jul 2017 13:55:54 +0200
Subject: [PATCH 109/128] Update comments.

---
 src/Renci.SshNet/Sftp/SftpFileReader.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileReader.cs b/src/Renci.SshNet/Sftp/SftpFileReader.cs
index 35dcf5c75..69dc74da0 100644
--- a/src/Renci.SshNet/Sftp/SftpFileReader.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileReader.cs
@@ -129,18 +129,19 @@ public byte[] Read()
                 }
             }
 
-            // when the server returned less bytes than requested (for the previous chunk)
-            // we'll synchronously request the remaining data
+            // When the server returned less bytes than requested (for the previous chunk)
+            // we'll synchronously request the remaining data.
             //
-            // due to the optimization above, we'll only get here in one of the following cases:
+            // Due to the optimization above, we'll only get here in one of the following cases:
             // - an EOF situation for files for which we were unable to obtain the file size
             // - fewer bytes that requested were returned
             // 
-            // according to the SSH specification, this last case should never happen for normal
-            // disk files (but can happen for device files).
+            // According to the SSH specification, this last case should never happen for normal
+            // disk files (but can happen for device files). In practice, OpenSSH - for example -
+            // returns less bytes than requested when requesting more than 64 KB.
             //
             // Important:
-            // to avoid a deadlock, this read must be done outside of the read lock
+            // To avoid a deadlock, this read must be done outside of the read lock
 
             var bytesToCatchUp = nextChunk.Offset - _offset;
 

From f90131229ad40afe58c02a9114a43a408bdafca2 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 30 Jul 2017 13:56:48 +0200
Subject: [PATCH 110/128] Fix doc.

---
 src/Renci.SshNet/SftpClient.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 3bde01ad3..d6b83aa23 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -77,9 +77,12 @@ public TimeSpan OperationTimeout
         /// </para>
         /// <para>
         /// For read operations, this controls the size of the payload which
-        /// is requested from the peer in each SSH_FXP_READ message. The peer
-        /// will send the requested number of bytes in one or more SSH_FXP_DATA
-        /// messages. To optimize the size of the SSH packets sent by the peer,
+        /// is requested from the peer in a SSH_FXP_READ message. The peer
+        /// will send the requested number of bytes in a SSH_FXP_DATA message,
+        /// possibly split over multiple SSH_MSG_CHANNEL_DATA messages.
+        /// </para>
+        /// <para>
+        /// To optimize the size of the SSH packets sent by the peer,
         /// the actual requested size will take into account the size of the
         /// SSH_FXP_DATA protocol fields.
         /// </para>

From 3e1dd2d345e9be2cb38bf039348abf4ff4f721e5 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 6 Aug 2017 17:54:47 +0200
Subject: [PATCH 111/128] Added CryptoAbstraction.GenerateRandom(int length)
 method.

---
 src/Renci.SshNet/Abstractions/CryptoAbstraction.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs b/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs
index e96bff9c8..ff9e50a52 100644
--- a/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs
@@ -9,6 +9,18 @@ internal static class CryptoAbstraction
         private static readonly System.Security.Cryptography.RandomNumberGenerator Randomizer = CreateRandomNumberGenerator();
 #endif
 
+        /// <summary>
+        /// Generates a <see cref="Byte"/> array of the specified length, and fills it with a
+        /// cryptographically strong random sequence of values.
+        /// </summary>
+        /// <param name="length">The length of the array generate.</param>
+        public static byte[] GenerateRandom(int length)
+        {
+            var random = new byte[length];
+            GenerateRandom(random);
+            return random;
+        }
+
         /// <summary>
         /// Fills an array of bytes with a cryptographically strong random sequence of values.
         /// </summary>

From 9ecfa0d38cddba51dcefb191094892cd4887c1eb Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 6 Aug 2017 18:22:44 +0200
Subject: [PATCH 112/128] Refactor loading of a response to an extended request
 (SSH_FXP_EXTENDED): Continue reading from SshDataStream instead of creating
 new instance for type specific part.

---
 .../Classes/Common/SshDataTest.cs             | 60 -------------------
 .../ExtendedReplies/StatVfsReplyInfoTest.cs   |  9 ++-
 src/Renci.SshNet/Common/SshData.cs            | 34 ++---------
 .../ExtendedReplies/ExtendedReplyInfo.cs      | 14 +----
 .../ExtendedReplies/StatVfsReplyInfo.cs       | 36 +++++------
 .../Responses/SftpExtendedReplyResponse.cs    | 10 ++--
 6 files changed, 34 insertions(+), 129 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Common/SshDataTest.cs b/src/Renci.SshNet.Tests/Classes/Common/SshDataTest.cs
index 330ff50fd..629910937 100644
--- a/src/Renci.SshNet.Tests/Classes/Common/SshDataTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Common/SshDataTest.cs
@@ -86,66 +86,6 @@ public void Load_DataAndOffsetAndCount()
             Assert.AreEqual(two, request.ValueTwo);
         }
 
-
-        [TestMethod]
-        public void OfType()
-        {
-            const uint one = 123456u;
-            const uint two = 456789u;
-
-            var sshDataStream = new SshDataStream(8);
-            sshDataStream.Write(one);
-            sshDataStream.Write(two);
-
-            var sshData = sshDataStream.ToArray();
-
-            var request = new RequestSshData();
-            request.Load(sshData);
-
-            var reply = request.OfType<ReplySshData>();
-            Assert.IsNotNull(reply);
-            Assert.AreEqual(one, reply.ValueOne);
-        }
-
-        [TestMethod]
-        public void OfType_LoadWithOffset()
-        {
-            const uint one = 123456u;
-            const uint two = 456789u;
-
-            var sshDataStream = new SshDataStream(11);
-            sshDataStream.WriteByte(0x05);
-            sshDataStream.WriteByte(0x07);
-            sshDataStream.WriteByte(0x0f);
-            sshDataStream.Write(one);
-            sshDataStream.Write(two);
-
-            var sshData = sshDataStream.ToArray();
-
-            var request = new RequestSshData();
-            request.Load(sshData, 3, sshData.Length - 3);
-            var reply = request.OfType<ReplySshData>();
-            Assert.IsNotNull(reply);
-            Assert.AreEqual(one, reply.ValueOne);
-        }
-
-        [TestMethod]
-        public void OfType_ShouldThrowArgumentNullExceptionWhenNoDataIsLoaded()
-        {
-            var request = new RequestSshData();
-
-            try
-            {
-                request.OfType<ReplySshData>();
-                Assert.Fail();
-            }
-            catch (ArgumentNullException ex)
-            {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual("data", ex.ParamName);
-            }
-        }
-
         private class BoolSshData : SshData
         {
             private readonly bool _value;
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
index b1cc9a4e3..d2b4f6c83 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
@@ -50,8 +50,6 @@ public void Constructor()
         [TestMethod]
         public void Load()
         {
-            var target = new StatVfsReplyInfo();
-
             var sshDataStream = new SshDataStream(4 + 1 + 4 + 88);
             sshDataStream.Write(_responseId);
             sshDataStream.Write(_bsize);
@@ -66,7 +64,12 @@ public void Load()
             sshDataStream.Write((ulong) 0x1);
             sshDataStream.Write(_namemax);
 
-            target.Load(sshDataStream.ToArray());
+            var extendedReplyResponse = new SftpExtendedReplyResponse(SftpSession.MaximumSupportedVersion);
+            extendedReplyResponse.Load(sshDataStream.ToArray());
+
+            Assert.AreEqual(_responseId, extendedReplyResponse.ResponseId);
+
+            var target = extendedReplyResponse.GetReply<StatVfsReplyInfo>();
 
             Assert.IsNotNull(target.Information);
 
diff --git a/src/Renci.SshNet/Common/SshData.cs b/src/Renci.SshNet/Common/SshData.cs
index 63cfcb23f..8e4eca406 100644
--- a/src/Renci.SshNet/Common/SshData.cs
+++ b/src/Renci.SshNet/Common/SshData.cs
@@ -45,10 +45,6 @@ protected bool IsEndOfData
             }
         }
 
-        private byte[] _loadedData;
-        private int _offset;
-        private int _count;
-
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -61,9 +57,11 @@ protected virtual int BufferCapacity
         }
 
         /// <summary>
-        /// Gets data bytes array
+        /// Gets data bytes array.
         /// </summary>
-        /// <returns>Byte array representation of data structure.</returns>
+        /// <returns>
+        /// A <see cref="Byte"/> array representation of data structure.
+        /// </returns>
         public byte[] GetBytes()
         {
             var messageLength = BufferCapacity;
@@ -83,13 +81,6 @@ protected virtual void WriteBytes(SshDataStream stream)
             SaveData();
         }
 
-        internal T OfType<T>() where T : SshData, new()
-        {
-            var result = new T();
-            result.Load(_loadedData, _offset, _count);
-            return result;
-        }
-
         /// <summary>
         /// Loads data from specified bytes.
         /// </summary>
@@ -120,7 +111,7 @@ public void Load(byte[] data, int offset, int count)
 
         private void LoadInternal(byte[] value, int offset, int count)
         {
-            LoadBytes(value, offset, count);
+            _stream = new SshDataStream(value, offset, count);
             LoadData();
         }
 
@@ -134,21 +125,6 @@ private void LoadInternal(byte[] value, int offset, int count)
         /// </summary>
         protected abstract void SaveData();
 
-        /// <summary>
-        /// Loads data bytes into internal buffer.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="offset">The zero-based offset in <paramref name="bytes"/> at which to begin reading SSH data.</param>
-        /// <param name="count">The number of bytes to load.</param>
-        private void LoadBytes(byte[] bytes, int offset, int count)
-        {
-            _loadedData = bytes;
-            _offset = offset;
-            _count = count;
-
-            _stream = new SshDataStream(bytes, _offset, count);
-        }
-
         /// <summary>
         /// Reads all data left in internal buffer at current position.
         /// </summary>
diff --git a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
index a705fc422..3f98a9861 100644
--- a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
+++ b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
@@ -1,19 +1,9 @@
 using Renci.SshNet.Common;
-using System;
 
 namespace Renci.SshNet.Sftp.Responses
 {
-    internal abstract class ExtendedReplyInfo : SshData
+    internal abstract class ExtendedReplyInfo
     {
-        protected override void LoadData()
-        {
-            //  skip response id
-            ReadUInt32();
-        }
-
-        protected override void SaveData()
-        {
-            throw new NotImplementedException();
-        }
+        public abstract void LoadData(SshDataStream stream);
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs
index a87731902..71c45dc15 100644
--- a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs
+++ b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs
@@ -1,29 +1,25 @@
-namespace Renci.SshNet.Sftp.Responses
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Sftp.Responses
 {
     internal class StatVfsReplyInfo : ExtendedReplyInfo
     {
         public SftpFileSytemInformation Information { get; private set; }
 
-        protected override void LoadData()
-        {
-            base.LoadData();
-
-            Information = new SftpFileSytemInformation(ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64(),
-                                                       ReadUInt64());
-        }
-
-        protected override void SaveData()
+        public override void LoadData(SshDataStream stream)
         {
-            throw new System.NotImplementedException();
+            Information = new SftpFileSytemInformation(stream.ReadUInt64(), // FileSystemBlockSize
+                                                       stream.ReadUInt64(), // BlockSize
+                                                       stream.ReadUInt64(), // TotalBlocks
+                                                       stream.ReadUInt64(), // FreeBlocks
+                                                       stream.ReadUInt64(), // AvailableBlocks
+                                                       stream.ReadUInt64(), // TotalNodes
+                                                       stream.ReadUInt64(), // FreeNodes
+                                                       stream.ReadUInt64(), // AvailableNodes
+                                                       stream.ReadUInt64(), // Sid
+                                                       stream.ReadUInt64(), // Flags
+                                                       stream.ReadUInt64()  // MaxNameLenght
+                                                       );
         }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpExtendedReplyResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpExtendedReplyResponse.cs
index 86b6a6620..1a7048ec5 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpExtendedReplyResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpExtendedReplyResponse.cs
@@ -1,6 +1,4 @@
-using Renci.SshNet.Common;
-
-namespace Renci.SshNet.Sftp.Responses
+namespace Renci.SshNet.Sftp.Responses
 {
     internal class SftpExtendedReplyResponse : SftpResponse
     {
@@ -14,9 +12,11 @@ public SftpExtendedReplyResponse(uint protocolVersion)
         {
         }
 
-        public T GetReply<T>() where T : SshData, new()
+        public T GetReply<T>() where T : ExtendedReplyInfo, new()
         {
-            return OfType<T>();
+            var result = new T();
+            result.LoadData(DataStream);
+            return result;
         }
     }
 }

From e2cf28a28d95ebb754ec60e0cbeaa6bd9594f4ac Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 6 Aug 2017 18:33:28 +0200
Subject: [PATCH 113/128] Remove Encoding from SubsystemSession and
 NetConfSession, and move it to SftpSession (as it is only used there).
 Refactor creation of SFTP response messages to a SftpResponseFactory.
 Implement SaveData for a few SFTP response messages.

---
 .../Renci.SshNet.NETCore.csproj               |   4 +
 .../Classes/Sftp/SftpDataResponseBuilder.cs   |  38 +++
 .../Classes/Sftp/SftpHandleResponseBuilder.cs |  42 +++
 .../Classes/Sftp/SftpInitRequestBuilder.cs    |  20 ++
 .../Classes/Sftp/SftpNameResponseBuilder.cs   |  61 ++++
 .../Classes/Sftp/SftpOpenRequestBuilder.cs    |  71 +++++
 .../Classes/Sftp/SftpReadRequestBuilder.cs    |  67 +++++
 .../Sftp/SftpRealPathRequestBuilder.cs        |  61 ++++
 .../SftpSessionTest_Connected_RequestRead.cs  | 167 ++++++-----
 ...ftpSessionTest_Connected_RequestStatVfs.cs | 271 ++++++------------
 ...tipleSftpMessagesInSingleSshDataMessage.cs | 200 +++++++++++++
 ...essagesSplitOverMultipleSshDataMessages.cs | 207 +++++++++++++
 ...eived_SingleSftpMessageInSshDataMessage.cs | 165 +++++++++++
 .../Classes/Sftp/SftpStatVfsRequestBuilder.cs |  61 ++++
 .../Sftp/SftpStatVfsResponseBuilder.cs        | 135 +++++++++
 .../Sftp/SftpVersionResponseBuilder.cs        |  47 ++-
 .../SftpClientTest_Dispose_Connected.cs       |  19 +-
 .../SftpClientTest_Dispose_Disconnected.cs    |  23 +-
 .../SftpClientTest_Dispose_Disposed.cs        |  17 +-
 .../SftpClientTest_Finalize_Connected.cs      |  15 +-
 .../Classes/SubsystemSessionStub.cs           |   4 +-
 .../SubsystemSession_Connect_Connected.cs     |   5 +-
 .../SubsystemSession_Connect_Disconnected.cs  |   5 +-
 .../SubsystemSession_Connect_Disposed.cs      |   5 +-
 .../SubsystemSession_Disconnect_Connected.cs  |   5 +-
 .../SubsystemSession_Disconnect_Disposed.cs   |   5 +-
 ...systemSession_Disconnect_NeverConnected.cs |   5 +-
 .../SubsystemSession_Dispose_Connected.cs     |   5 +-
 .../SubsystemSession_Dispose_Disconnected.cs  |   5 +-
 .../SubsystemSession_Dispose_Disposed.cs      |   5 +-
 ...SubsystemSession_Dispose_NeverConnected.cs |   5 +-
 ...Session_OnChannelDataReceived_Connected.cs |   6 +-
 ...mSession_OnChannelDataReceived_Disposed.cs |   6 +-
 ...elDataReceived_OnDataReceived_Exception.cs |   6 +-
 ...temSession_OnChannelException_Connected.cs |   6 +-
 ...stemSession_OnChannelException_Disposed.cs |   5 +-
 ...Session_OnSessionDisconnected_Connected.cs |   5 +-
 ...mSession_OnSessionDisconnected_Disposed.cs |   5 +-
 ...ession_OnSessionErrorOccurred_Connected.cs |   6 +-
 ...Session_OnSessionErrorOccurred_Disposed.cs |   6 +-
 .../SubsystemSession_SendData_Connected.cs    |   6 +-
 .../SubsystemSession_SendData_Disposed.cs     |   6 +-
 ...ubsystemSession_SendData_NeverConnected.cs |   6 +-
 .../Renci.SshNet.Tests.csproj                 |  12 +
 src/Renci.SshNet/IServiceFactory.cs           |   5 +-
 src/Renci.SshNet/Netconf/NetConfSession.cs    |   2 +-
 src/Renci.SshNet/Renci.SshNet.csproj          |   3 +
 src/Renci.SshNet/ServiceFactory.cs            |  10 +-
 src/Renci.SshNet/Sftp/ISftpMessageFactory.cs  |   9 +
 .../Sftp/Responses/SftpDataResponse.cs        |   9 +-
 .../Sftp/Responses/SftpHandleResponse.cs      |   9 +-
 .../Sftp/Responses/SftpNameResponse.cs        |  43 ++-
 .../Sftp/Responses/SftpResponse.cs            |  10 +-
 .../Sftp/Responses/SftpVersionResponse.cs     |   4 +-
 .../Sftp/Responses/StatVfsResponse.cs         |  31 +-
 .../Sftp/SftpFileSystemInformation.cs         |  19 +-
 src/Renci.SshNet/Sftp/SftpMessage.cs          |  48 +---
 src/Renci.SshNet/Sftp/SftpMessageFactory.cs   |  48 ++++
 src/Renci.SshNet/Sftp/SftpSession.cs          |  28 +-
 src/Renci.SshNet/SftpClient.cs                |   7 +-
 src/Renci.SshNet/SubsystemSession.cs          |  14 +-
 61 files changed, 1616 insertions(+), 509 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpDataResponseBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpHandleResponseBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpInitRequestBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpNameResponseBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpOpenRequestBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpReadRequestBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpRealPathRequestBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsRequestBuilder.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
 create mode 100644 src/Renci.SshNet/Sftp/ISftpMessageFactory.cs
 create mode 100644 src/Renci.SshNet/Sftp/SftpMessageFactory.cs

diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
index 6f2178443..f68f35c6f 100644
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -97,6 +97,10 @@
       <Version>4.0.1</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="..\Renci.SshNet\Sftp\ISftpMessageFactory.cs" Link="Sftp\ISftpResponseFactory.cs" />
+    <Compile Update="..\Renci.SshNet\Sftp\SftpMessageFactory.cs" Link="Sftp\SftpResponseFactory.cs" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <DefineConstants>TRACE;DEBUG;FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
   </PropertyGroup>
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpDataResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpDataResponseBuilder.cs
new file mode 100644
index 000000000..71cfbb676
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpDataResponseBuilder.cs
@@ -0,0 +1,38 @@
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpDataResponseBuilder
+    {
+        private uint _protocolVersion;
+        private uint _responseId;
+        private byte[] _data;
+
+        public SftpDataResponseBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpDataResponseBuilder WithResponseId(uint responseId)
+        {
+            _responseId = responseId;
+            return this;
+        }
+
+        public SftpDataResponseBuilder WithData(byte[] data)
+        {
+            _data = data;
+            return this;
+        }
+
+        public SftpDataResponse Build()
+        {
+            return new SftpDataResponse(_protocolVersion)
+                {
+                    ResponseId = _responseId,
+                    Data = _data
+                };
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpHandleResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpHandleResponseBuilder.cs
new file mode 100644
index 000000000..4477e2fb0
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpHandleResponseBuilder.cs
@@ -0,0 +1,42 @@
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpHandleResponseBuilder
+    {
+        private uint _protocolVersion;
+        private uint _responseId;
+        private byte[] _handle;
+
+        public SftpHandleResponseBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpHandleResponseBuilder WithResponseId(uint responseId)
+        {
+            _responseId = responseId;
+            return this;
+        }
+
+        public SftpHandleResponseBuilder WithHandle(byte[] handle)
+        {
+            _handle = handle;
+            return this;
+        }
+
+        public SftpHandleResponse Build()
+        {
+            var sftpHandleResponse = new SftpHandleResponse(_protocolVersion)
+            {
+                ResponseId = _responseId,
+                Handle = _handle
+            };
+            return sftpHandleResponse;
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpInitRequestBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpInitRequestBuilder.cs
new file mode 100644
index 000000000..f0f5f6c60
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpInitRequestBuilder.cs
@@ -0,0 +1,20 @@
+using Renci.SshNet.Sftp.Requests;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpInitRequestBuilder
+    {
+        private uint _version;
+
+        public SftpInitRequestBuilder WithVersion(uint version)
+        {
+            _version = version;
+            return this;
+        }
+
+        public SftpInitRequest Build()
+        {
+            return new SftpInitRequest(_version);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpNameResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpNameResponseBuilder.cs
new file mode 100644
index 000000000..e0dc9ae5d
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpNameResponseBuilder.cs
@@ -0,0 +1,61 @@
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpNameResponseBuilder
+    {
+        private uint _responseId;
+        private uint _protocolVersion;
+        private Encoding _encoding;
+        private List<KeyValuePair<string, SftpFileAttributes>> _files;
+
+        public SftpNameResponseBuilder()
+        {
+            _files = new List<KeyValuePair<string, SftpFileAttributes>>();
+        }
+
+        public SftpNameResponseBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpNameResponseBuilder WithResponseId(uint responseId)
+        {
+            _responseId = responseId;
+            return this;
+        }
+
+        public SftpNameResponseBuilder WithFiles(params KeyValuePair<string, SftpFileAttributes>[] files)
+        {
+            for (var i = 0; i < files.Length; i++)
+                _files.Add(files[i]);
+            return this;
+        }
+
+        public SftpNameResponseBuilder WithFile(string filename, SftpFileAttributes attributes)
+        {
+            _files.Add(new KeyValuePair<string, SftpFileAttributes>(filename, attributes));
+            return this;
+        }
+
+        public SftpNameResponseBuilder WithEncoding(Encoding encoding)
+        {
+            _encoding = encoding;
+            return this;
+        }
+
+        public SftpNameResponse Build()
+        {
+            var sftpNameResponse = new SftpNameResponse(_protocolVersion, _encoding)
+                {
+                    ResponseId = _responseId,
+                    Files = _files.ToArray()
+                };
+            return sftpNameResponse;
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpOpenRequestBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpOpenRequestBuilder.cs
new file mode 100644
index 000000000..00c0efa36
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpOpenRequestBuilder.cs
@@ -0,0 +1,71 @@
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Requests;
+using Renci.SshNet.Sftp.Responses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpOpenRequestBuilder
+    {
+        private uint _protocolVersion;
+        private uint _requestId;
+        private string _fileName;
+        private Encoding _encoding;
+        private Flags _flags;
+        private Action<SftpHandleResponse> _handleAction;
+        private Action<SftpStatusResponse> _statusAction;
+
+        public SftpOpenRequestBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithRequestId(uint requestId)
+        {
+            _requestId = requestId;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithFileName(string fileName)
+        {
+            _fileName = fileName;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithEncoding(Encoding encoding)
+        {
+            _encoding = encoding;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithFlags(Flags flags)
+        {
+            _flags = flags;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithDataAction(Action<SftpHandleResponse> handleAction)
+        {
+            _handleAction = handleAction;
+            return this;
+        }
+
+        public SftpOpenRequestBuilder WithStatusAction(Action<SftpStatusResponse> statusAction)
+        {
+            _statusAction = statusAction;
+            return this;
+        }
+
+        public SftpOpenRequest Build()
+        {
+            var handleAction = _handleAction ?? ((handleResponse) => { });
+            var statusAction = _statusAction ?? ((statusResponse) => { });
+
+            return new SftpOpenRequest(_protocolVersion, _requestId, _fileName, _encoding, _flags, handleAction, statusAction);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpReadRequestBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpReadRequestBuilder.cs
new file mode 100644
index 000000000..2dc995c02
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpReadRequestBuilder.cs
@@ -0,0 +1,67 @@
+using Renci.SshNet.Sftp.Requests;
+using Renci.SshNet.Sftp.Responses;
+using System;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpReadRequestBuilder
+    {
+        private uint _protocolVersion;
+        private uint _requestId;
+        private byte[] _handle;
+        private uint _offset;
+        private uint _length;
+        private Action<SftpDataResponse> _dataAction;
+        private Action<SftpStatusResponse> _statusAction;
+
+        public SftpReadRequestBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithRequestId(uint requestId)
+        {
+            _requestId = requestId;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithHandle(byte[] handle)
+        {
+            _handle = handle;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithOffset(uint offset)
+        {
+            _offset = offset;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithLength(uint length)
+        {
+            _length = length;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithDataAction(Action<SftpDataResponse> dataAction)
+        {
+            _dataAction = dataAction;
+            return this;
+        }
+
+        public SftpReadRequestBuilder WithStatusAction(Action<SftpStatusResponse> statusAction)
+        {
+            _statusAction = statusAction;
+            return this;
+        }
+
+        public SftpReadRequest Build()
+        {
+            var dataAction = _dataAction ?? ((dataResponse) => { });
+            var statusAction = _statusAction ?? ((statusResponse) => { });
+
+            return new SftpReadRequest(_protocolVersion, _requestId, _handle, _offset, _length, dataAction, statusAction);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpRealPathRequestBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpRealPathRequestBuilder.cs
new file mode 100644
index 000000000..536e07e2c
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpRealPathRequestBuilder.cs
@@ -0,0 +1,61 @@
+using Renci.SshNet.Sftp.Requests;
+using Renci.SshNet.Sftp.Responses;
+using System;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpRealPathRequestBuilder
+    {
+        private uint _protocolVersion;
+        private uint _requestId;
+        private string _path;
+        private Encoding _encoding;
+        private Action<SftpNameResponse> _nameAction;
+        private Action<SftpStatusResponse> _statusAction;
+
+        public SftpRealPathRequestBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpRealPathRequestBuilder WithRequestId(uint requestId)
+        {
+            _requestId = requestId;
+            return this;
+        }
+
+        public SftpRealPathRequestBuilder WithPath(string path)
+        {
+            _path = path;
+            return this;
+        }
+
+        public SftpRealPathRequestBuilder WithEncoding(Encoding encoding)
+        {
+            _encoding = encoding;
+            return this;
+        }
+
+        public SftpRealPathRequestBuilder WithNameAction(Action<SftpNameResponse> nameAction)
+        {
+            _nameAction = nameAction;
+            return this;
+        }
+
+        public SftpRealPathRequestBuilder WithStatusAction(Action<SftpStatusResponse> statusAction)
+        {
+            _statusAction = statusAction;
+            return this;
+        }
+
+        public SftpRealPathRequest Build()
+        {
+            var nameAction = _nameAction ?? ((nameResponse) => { });
+            var statusAction = _statusAction ?? ((statusResponse) => { });
+
+            return new SftpRealPathRequest(_protocolVersion, _requestId, _path, _encoding, nameAction, statusAction);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index ef2a428c2..4aec52175 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -7,19 +6,37 @@
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
 using Renci.SshNet.Sftp;
+using Renci.SshNet.Abstractions;
+using Renci.SshNet.Sftp.Responses;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
     public class SftpSessionTest_Connected_RequestRead
     {
+        #region SftpSession.Connect()
+
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
+        private ISftpResponseFactory _sftpMessageFactory;
         private SftpSession _sftpSession;
         private int _operationTimeout;
-        private byte[] _actual;
-        private byte[] _expected;
         private Encoding _encoding;
+        private uint _protocolVersion;
+        private byte[] _sftpInitRequestBytes;
+        private SftpVersionResponse _sftpVersionResponse;
+        private byte[] _sftpRealPathRequestBytes;
+        private SftpNameResponse _sftpNameResponse;
+
+        #endregion SftpSession.Connect()
+
+        private byte[] _sftpReadRequestBytes;
+        private byte[] _sftpDataResponseBytes;
+        private byte[] _handle;
+        private uint _offset;
+        private uint _length;
+        private byte[] _data;
+        private byte[] _actual;
 
         [TestInitialize]
         public void Setup()
@@ -28,111 +45,119 @@ public void Setup()
             Act();
         }
 
-        protected void Arrange()
+        private void SetupData()
         {
             var random = new Random();
 
+            #region SftpSession.Connect()
+
             _operationTimeout = random.Next(100, 500);
-            _expected = new byte[random.Next(30, 50)];
+            _protocolVersion = (uint) random.Next(0, 3);
             _encoding = Encoding.UTF8;
-            random.NextBytes(_expected);
+            _sftpMessageFactory = new SftpResponseFactory();
+            _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpVersionResponse = new SftpVersionResponseBuilder().WithVersion(_protocolVersion)
+                                                                   .Build();
+            _sftpRealPathRequestBytes = new SftpRealPathRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                        .WithRequestId(1)
+                                                                        .WithPath(".")
+                                                                        .WithEncoding(_encoding)
+                                                                        .Build()
+                                                                        .GetBytes();
+            _sftpNameResponse = new SftpNameResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                             .WithResponseId(1)
+                                                             .WithEncoding(_encoding)
+                                                             .WithFile("XYZ", SftpFileAttributes.Empty)
+                                                             .Build();
+
+            #endregion SftpSession.Connect()
+
+            _handle = CryptoAbstraction.GenerateRandom(random.Next(1, 10));
+            _offset = (uint) random.Next(1, 5);
+            _length = (uint) random.Next(30, 50);
+            _data = CryptoAbstraction.GenerateRandom((int) _length);
+            _sftpReadRequestBytes = new SftpReadRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(2)
+                                                                .WithHandle(_handle)
+                                                                .WithOffset(_offset)
+                                                                .WithLength(_length)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpDataResponseBytes = new SftpDataResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                  .WithResponseId(2)
+                                                                  .WithData(_data)
+                                                                  .Build()
+                                                                  .GetBytes();
+        }
 
+        private void CreateMocks()
+        {
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+        }
 
+        private void SetupMocks()
+        {
             var sequence = new MockSequence();
 
+            #region SftpSession.Connect()
+
             _sessionMock.InSequence(sequence).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Open());
             _channelSessionMock.InSequence(sequence).Setup(p => p.SendSubsystemRequest("sftp")).Returns(true);
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
-                () =>
-                    {
-                        // generate response for SftpInitRequest
-                        var versionInfoResponse = SftpVersionResponseBuilder.Create(3)
-                                                                            .Build();
-                        _channelSessionMock.Raise(
-                            c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, versionInfoResponse));
-                    });
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpInitRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
+                                                    });
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
-                () =>
-                    {
-                        var sftpNameResponse = CreateSftpNameResponse(1, _encoding, "ABC");
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpRealPathRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
+                                                    });
+
+            #endregion SftpSession.Connect()
 
-                        _channelSessionMock.Raise(
-                            c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, sftpNameResponse));
-                    }
-                );
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
-                () =>
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpReadRequestBytes))
+                                                    .Callback(() =>
                     {
-                        var sftpDataResponse = CreateSftpDataResponse(2, _expected);
-
                         _channelSessionMock.Raise(
                             c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, sftpDataResponse.Take(0, 20)));
+                            new ChannelDataEventArgs(0, _sftpDataResponseBytes.Take(0, 20)));
                         _channelSessionMock.Raise(
                             c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, sftpDataResponse.Take(20, sftpDataResponse.Length - 20)));
+                            new ChannelDataEventArgs(0, _sftpDataResponseBytes.Take(20, _sftpDataResponseBytes.Length - 20)));
                     }
                 );
+        }
+
+        private void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactory);
             _sftpSession.Connect();
         }
 
         protected void Act()
         {
-            _actual = _sftpSession.RequestRead(new byte[0], 0, 200);
+            _actual = _sftpSession.RequestRead(_handle, _offset, _length);
         }
 
         [TestMethod]
         public void ReturnedValueShouldBeDataOfSftpDataResponse()
         {
             Assert.IsNotNull(_actual);
-            Assert.IsTrue(_expected.SequenceEqual(_actual));
-        }
-
-        private static byte[] CreateSftpDataResponse(uint responseId, byte[] data)
-        {
-            var sshDataStream = new SshDataStream(4 + 1 + 4 + 4 + data.Length + 1);
-            sshDataStream.Write((uint) sshDataStream.Capacity - 4);
-            sshDataStream.WriteByte((byte) SftpMessageTypes.Data);
-            sshDataStream.Write(responseId);
-            sshDataStream.Write((uint) data.Length);
-            sshDataStream.Write(data, 0, data.Length);
-            sshDataStream.WriteByte(1); // EOF
-            return sshDataStream.ToArray();
-        }
-
-        private static byte[] CreateSftpNameResponse(uint responseId, Encoding encoding, params string[] names)
-        {
-            var namesAndAttributes = new List<byte>();
-            foreach (var name in names)
-            {
-                var nameBytes = encoding.GetBytes(name);
-                var attributesBytes = SftpFileAttributes.Empty.GetBytes();
-
-                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian((uint) nameBytes.Length)); // filename length
-                namesAndAttributes.AddRange(nameBytes); // filename
-                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian(0U)); // longname length
-                namesAndAttributes.AddRange(attributesBytes); // attributes
-            }
-
-            var namesAndAttributesBytes = namesAndAttributes.ToArray();
-
-            var sshDataStream = new SshDataStream(4 + 1 + 4 + 4 + namesAndAttributesBytes.Length);
-            sshDataStream.Write((uint) sshDataStream.Capacity - 4);
-            sshDataStream.WriteByte((byte) SftpMessageTypes.Name);
-            sshDataStream.Write(responseId);
-            sshDataStream.Write((uint) names.Length);
-            sshDataStream.Write(namesAndAttributesBytes, 0, namesAndAttributesBytes.Length);
-            return sshDataStream.ToArray();
+            Assert.IsTrue(_data.SequenceEqual(_actual));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index a88fee21a..ca6d225b3 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -1,25 +1,38 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
 using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
     [TestClass]
     public class SftpSessionTest_Connected_RequestStatVfs
     {
+        #region SftpSession.Connect()
+
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
+        private ISftpResponseFactory _sftpMessageFactory;
         private SftpSession _sftpSession;
         private int _operationTimeout;
-        private SftpFileSytemInformation _actual;
         private Encoding _encoding;
+        private uint _protocolVersion;
+        private SftpVersionResponse _sftpVersionResponse;
+        private SftpNameResponse _sftpNameResponse;
+        private byte[] _sftpInitRequestBytes;
+        private byte[] _sftpRealPathRequestBytes;
+
+        #endregion SftpSession.Connect()
 
+        private byte[] _sftpStatVfsRequestBytes;
+        private StatVfsResponse _sftpStatVfsResponse;
         private ulong _bAvail;
+        private string _path;
+        private SftpFileSytemInformation _actual;
 
         [TestInitialize]
         public void Setup()
@@ -28,67 +41,104 @@ public void Setup()
             Act();
         }
 
-        protected void Arrange()
+        private void SetupData()
         {
             var random = new Random();
 
+            #region SftpSession.Connect()
+
             _operationTimeout = random.Next(100, 500);
             _encoding = Encoding.UTF8;
-
+            _protocolVersion = 3;
+            _sftpMessageFactory = new SftpResponseFactory();
+            _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpVersionResponse = new SftpVersionResponseBuilder().WithVersion(_protocolVersion)
+                                                                   .WithExtension("statvfs@openssh.com", "")
+                                                                   .Build();
+            _sftpRealPathRequestBytes = new SftpRealPathRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                        .WithRequestId(1)
+                                                                        .WithPath(".")
+                                                                        .WithEncoding(_encoding)
+                                                                        .Build()
+                                                                        .GetBytes();
+            _sftpNameResponse = new SftpNameResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                             .WithResponseId(1U)
+                                                             .WithEncoding(_encoding)
+                                                             .WithFile("ABC", SftpFileAttributes.Empty)
+                                                             .Build();
+
+            #endregion SftpSession.Connect()
+
+            _path = random.Next().ToString();
             _bAvail = (ulong) random.Next(0, int.MaxValue);
+            _sftpStatVfsRequestBytes = new SftpStatVfsRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                      .WithRequestId(2)
+                                                                      .WithPath(_path)
+                                                                      .WithEncoding(_encoding)
+                                                                      .Build()
+                                                                      .GetBytes();
+            _sftpStatVfsResponse = new SftpStatVfsResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                   .WithResponseId(2U)
+                                                                   .WithBAvail(_bAvail)
+                                                                   .Build();
+        }
 
+        private void CreateMocks()
+        {
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+        }
 
+        private void SetupMocks()
+        {
             var sequence = new MockSequence();
 
+            #region SftpSession.Connect()
+
             _sessionMock.InSequence(sequence).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
             _channelSessionMock.InSequence(sequence).Setup(p => p.Open());
             _channelSessionMock.InSequence(sequence).Setup(p => p.SendSubsystemRequest("sftp")).Returns(true);
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpInitRequestBytes)).Callback(
                 () =>
-                    {
-                        // generate response for SftpInitRequest
-                        var versionInfoResponse = SftpVersionResponseBuilder.Create(3)
-                                                                            .AddExtension("statvfs@openssh.com", "")
-                                                                            .Build();
-                        _channelSessionMock.Raise(
-                            c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, versionInfoResponse));
-                    });
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
+                });
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpRealPathRequestBytes)).Callback(
                 () =>
-                    {
-                        var sftpNameResponse = CreateSftpNameResponse(1, _encoding, "ABC");
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
+                });
+
+            #endregion SftpSession.Connect()
 
-                        _channelSessionMock.Raise(
-                            c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, sftpNameResponse));
-                    }
-                );
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
-            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(It.IsAny<byte[]>())).Callback(
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpStatVfsRequestBytes)).Callback(
                 () =>
-                    {
-                        var statVfsReplyBuilder = StatVfsReplyBuilder.Create(2);
-                        statVfsReplyBuilder.WithBAvail(_bAvail);
-                        var statVfsReply = statVfsReplyBuilder.Build();
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpStatVfsResponse.GetBytes()));
+                });
+        }
 
-                        _channelSessionMock.Raise(
-                            c => c.DataReceived += null,
-                            new ChannelDataEventArgs(0, statVfsReply));
-                    }
-                );
+        protected void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactory);
             _sftpSession.Connect();
         }
 
         protected void Act()
         {
-            _actual = _sftpSession.RequestStatVfs("path");
+            _actual = _sftpSession.RequestStatVfs(_path);
         }
 
         [TestMethod]
@@ -102,156 +152,5 @@ public void AvailableBlocksInReturnedValueShouldMatchValueInSftpResponse()
         {
             Assert.AreEqual(_bAvail, _actual.AvailableBlocks);
         }
-
-        private static byte[] CreateSftpNameResponse(uint responseId, Encoding encoding, params string[] names)
-        {
-            var namesAndAttributes = new List<byte>();
-            foreach (var name in names)
-            {
-                var nameBytes = encoding.GetBytes(name);
-                var attributesBytes = SftpFileAttributes.Empty.GetBytes();
-
-                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian((uint) nameBytes.Length)); // filename length
-                namesAndAttributes.AddRange(nameBytes); // filename
-                namesAndAttributes.AddRange(Pack.UInt32ToBigEndian(0U)); // longname length
-                namesAndAttributes.AddRange(attributesBytes); // attributes
-            }
-
-            var namesAndAttributesBytes = namesAndAttributes.ToArray();
-
-            var sshDataStream = new SshDataStream(4 + 1 + 4 + 4 + namesAndAttributesBytes.Length);
-            sshDataStream.Write((uint) sshDataStream.Capacity - 4);
-            sshDataStream.WriteByte((byte) SftpMessageTypes.Name);
-            sshDataStream.Write(responseId);
-            sshDataStream.Write((uint) names.Length);
-            sshDataStream.Write(namesAndAttributesBytes, 0, namesAndAttributesBytes.Length);
-            return sshDataStream.ToArray();
-        }
-
-        public class StatVfsReplyBuilder
-        {
-            private readonly uint _responseId;
-            private ulong _bsize;
-            private ulong _frsize;
-            private ulong _blocks;
-            private ulong _bfree;
-            private ulong _bavail;
-            private ulong _files;
-            private ulong _ffree;
-            private ulong _favail;
-            private ulong _sid;
-            private ulong _flag;
-            private ulong _namemax;
-
-            private StatVfsReplyBuilder(uint responseId)
-            {
-                _responseId = responseId;
-            }
-
-            public static StatVfsReplyBuilder Create(uint responseId)
-            {
-                return new StatVfsReplyBuilder(responseId);
-            }
-
-            public StatVfsReplyBuilder WithBSize(ulong bsize)
-            {
-                _bsize = bsize;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithFrSize(ulong frsize)
-            {
-                _frsize = frsize;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithBlocks(ulong blocks)
-            {
-                _blocks = blocks;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithBFree(ulong bfree)
-            {
-                _bfree = bfree;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithBAvail(ulong bavail)
-            {
-                _bavail = bavail;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithFiles(ulong files)
-            {
-                _files = files;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithFFree(ulong ffree)
-            {
-                _ffree = ffree;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithFAvail(ulong favail)
-            {
-                _favail = favail;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithSid(ulong sid)
-            {
-                _sid = sid;
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithIsReadOnly(bool isReadOnly)
-            {
-                if (isReadOnly)
-                    _flag &= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_RDONLY;
-                else
-                    _flag |= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_RDONLY;
-
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithSupportsSetUid(bool supportsSetUid)
-            {
-                if (supportsSetUid)
-                    _flag |= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_NOSUID;
-                else
-                    _flag &= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_NOSUID;
-
-                return this;
-            }
-
-            public StatVfsReplyBuilder WithNameMax(ulong nameMax)
-            {
-                _namemax = nameMax;
-                return this;
-            }
-
-            public byte[] Build()
-            {
-                var sshDataStream = new SshDataStream(4 + 1 + 4 + 88);
-                sshDataStream.Write((uint) sshDataStream.Capacity - 4);
-                sshDataStream.WriteByte((byte) SftpMessageTypes.ExtendedReply);
-                sshDataStream.Write(_responseId);
-                sshDataStream.Write(_bsize);
-                sshDataStream.Write(_frsize);
-                sshDataStream.Write(_blocks);
-                sshDataStream.Write(_bfree);
-                sshDataStream.Write(_bavail);
-                sshDataStream.Write(_files);
-                sshDataStream.Write(_ffree);
-                sshDataStream.Write(_favail);
-                sshDataStream.Write(_sid);
-                sshDataStream.Write(_flag);
-                sshDataStream.Write(_namemax);
-                return sshDataStream.ToArray();
-            }
-        }
-    }
+   }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
new file mode 100644
index 000000000..4119fcf26
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Channels;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Abstractions;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage
+    {
+        #region SftpSession.Connect()
+
+        private Mock<ISession> _sessionMock;
+        private Mock<IChannelSession> _channelSessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private SftpSession _sftpSession;
+        private int _operationTimeout;
+        private Encoding _encoding;
+        private uint _protocolVersion;
+        private byte[] _sftpInitRequestBytes;
+        private SftpVersionResponse _sftpVersionResponse;
+        private byte[] _sftpRealPathRequestBytes;
+        private SftpNameResponse _sftpNameResponse;
+        private byte[] _sftpOpenRequestBytes;
+        private byte[] _sftpHandleResponseBytes;
+        private byte[] _sftpReadRequestBytes;
+        private byte[] _sftpDataResponseBytes;
+        private byte[] _handle;
+        private uint _offset;
+        private uint _length;
+        private byte[] _data;
+        private string _path;
+        private byte[] _actualHandle;
+        private byte[] _actualData;
+
+        #endregion SftpSession.Connect()
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        private void SetupData()
+        {
+            var random = new Random();
+
+            #region SftpSession.Connect()
+
+            _operationTimeout = random.Next(100, 500);
+            _protocolVersion = (uint)random.Next(0, 3);
+            _encoding = Encoding.UTF8;
+
+            _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpVersionResponse = new SftpVersionResponseBuilder().WithVersion(_protocolVersion)
+                                                                   .Build();
+            _sftpRealPathRequestBytes = new SftpRealPathRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                        .WithRequestId(1)
+                                                                        .WithPath(".")
+                                                                        .WithEncoding(_encoding)
+                                                                        .Build()
+                                                                        .GetBytes();
+            _sftpNameResponse = new SftpNameResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                             .WithResponseId(1)
+                                                             .WithEncoding(_encoding)
+                                                             .WithFile("/ABC", SftpFileAttributes.Empty)
+                                                             .Build();
+
+            #endregion SftpSession.Connect()
+
+            _path = random.Next().ToString();
+            _handle = CryptoAbstraction.GenerateRandom(4);
+            _offset = (uint) random.Next(1, 5);
+            _length = (uint) random.Next(30, 50);
+            _data = CryptoAbstraction.GenerateRandom(200);
+            _sftpOpenRequestBytes = new SftpOpenRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(2)
+                                                                .WithFileName(_path)
+                                                                .WithFlags(Flags.Read)
+                                                                .WithEncoding(_encoding)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpHandleResponseBytes = new SftpHandleResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                      .WithResponseId(2)
+                                                                      .WithHandle(_handle)
+                                                                      .Build()
+                                                                      .GetBytes();
+            _sftpReadRequestBytes = new SftpReadRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(3)
+                                                                .WithHandle(_handle)
+                                                                .WithOffset(_offset)
+                                                                .WithLength(_length)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpDataResponseBytes = new SftpDataResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                  .WithResponseId(3)
+                                                                  .WithData(_data)
+                                                                  .Build()
+                                                                  .GetBytes();
+        }
+
+        private void CreateMocks()
+        {
+            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+        }
+
+        private void SetupMocks()
+        {
+            var sequence = new MockSequence();
+
+            #region SftpSession.Connect()
+
+            _sessionMock.InSequence(sequence).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.Open());
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendSubsystemRequest("sftp")).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpInitRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
+                                                    });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(0U, (byte)SftpMessageTypes.Version, _encoding))
+                                   .Returns(_sftpVersionResponse);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpRealPathRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
+                                                    });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte)SftpMessageTypes.Name, _encoding))
+                                   .Returns(_sftpNameResponse);
+
+            #endregion SftpSession.Connect()
+
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpOpenRequestBytes));
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpReadRequestBytes)).Callback(() =>
+                {
+                    var sshMessagePayload = new byte[_sftpHandleResponseBytes.Length + _sftpDataResponseBytes.Length];
+                    Buffer.BlockCopy(_sftpHandleResponseBytes, 0, sshMessagePayload, 0, _sftpHandleResponseBytes.Length);
+                    Buffer.BlockCopy(_sftpDataResponseBytes, 0, sshMessagePayload, _sftpHandleResponseBytes.Length, _sftpDataResponseBytes.Length);
+
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, sshMessagePayload));
+                });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Handle, _encoding))
+                                   .Returns(new SftpHandleResponse(_protocolVersion));
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
+                                   .Returns(new SftpDataResponse(_protocolVersion));
+        }
+
+        protected void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
+
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession.Connect();
+        }
+
+        protected void Act()
+        {
+            var openAsyncResult = _sftpSession.BeginOpen(_path, Flags.Read, null, null);
+            var readAsyncResult = _sftpSession.BeginRead(_handle, _offset, _length, null, null);
+
+            _actualHandle = _sftpSession.EndOpen(openAsyncResult);
+            _actualData = _sftpSession.EndRead(readAsyncResult);
+        }
+
+        [TestMethod]
+        public void ReturnedValueShouldBeDataOfSftpDataResponse()
+        {
+            Assert.IsTrue(_data.IsEqualTo(_actualData));
+        }
+
+        [TestMethod]
+        public void ReturnedHandleShouldBeHandleOfSftpHandleResponse()
+        {
+            Assert.IsTrue(_handle.IsEqualTo(_actualHandle));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
new file mode 100644
index 000000000..3eb2c9499
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
@@ -0,0 +1,207 @@
+using System;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Channels;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Abstractions;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages
+    {
+        #region SftpSession.Connect()
+
+        private Mock<ISession> _sessionMock;
+        private Mock<IChannelSession> _channelSessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private SftpSession _sftpSession;
+        private int _operationTimeout;
+        private Encoding _encoding;
+        private uint _protocolVersion;
+        private byte[] _sftpInitRequestBytes;
+        private SftpVersionResponse _sftpVersionResponse;
+        private byte[] _sftpRealPathRequestBytes;
+        private SftpNameResponse _sftpNameResponse;
+        private byte[] _sftpOpenRequestBytes;
+        private byte[] _sftpHandleResponseBytes;
+        private byte[] _sftpReadRequestBytes;
+        private byte[] _sftpDataResponseBytes;
+        private byte[] _handle;
+        private uint _offset;
+        private uint _length;
+        private byte[] _data;
+        private string _path;
+        private byte[] _actualHandle;
+        private byte[] _actualData;
+
+        #endregion SftpSession.Connect()
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        private void SetupData()
+        {
+            var random = new Random();
+
+            #region SftpSession.Connect()
+
+            _operationTimeout = random.Next(100, 500);
+            _protocolVersion = (uint)random.Next(0, 3);
+            _encoding = Encoding.UTF8;
+
+            _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpVersionResponse = new SftpVersionResponseBuilder().WithVersion(_protocolVersion)
+                                                                   .Build();
+            _sftpRealPathRequestBytes = new SftpRealPathRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                        .WithRequestId(1)
+                                                                        .WithPath(".")
+                                                                        .WithEncoding(_encoding)
+                                                                        .Build()
+                                                                        .GetBytes();
+            _sftpNameResponse = new SftpNameResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                             .WithResponseId(1)
+                                                             .WithEncoding(_encoding)
+                                                             .WithFile("/ABC", SftpFileAttributes.Empty)
+                                                             .Build();
+
+            #endregion SftpSession.Connect()
+
+            _path = random.Next().ToString();
+            _handle = CryptoAbstraction.GenerateRandom(4);
+            _offset = (uint) random.Next(1, 5);
+            _length = (uint) random.Next(30, 50);
+            _data = CryptoAbstraction.GenerateRandom(200);
+            _sftpOpenRequestBytes = new SftpOpenRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(2)
+                                                                .WithFileName(_path)
+                                                                .WithFlags(Flags.Read)
+                                                                .WithEncoding(_encoding)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpHandleResponseBytes = new SftpHandleResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                      .WithResponseId(2)
+                                                                      .WithHandle(_handle)
+                                                                      .Build()
+                                                                      .GetBytes();
+            _sftpReadRequestBytes = new SftpReadRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(3)
+                                                                .WithHandle(_handle)
+                                                                .WithOffset(_offset)
+                                                                .WithLength(_length)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpDataResponseBytes = new SftpDataResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                  .WithResponseId(3)
+                                                                  .WithData(_data)
+                                                                  .Build()
+                                                                  .GetBytes();
+        }
+
+        private void CreateMocks()
+        {
+            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+        }
+
+        private void SetupMocks()
+        {
+            var sequence = new MockSequence();
+
+            #region SftpSession.Connect()
+
+            _sessionMock.InSequence(sequence).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.Open());
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendSubsystemRequest("sftp")).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpInitRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
+                                                    });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(0U, (byte)SftpMessageTypes.Version, _encoding))
+                                   .Returns(_sftpVersionResponse);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpRealPathRequestBytes))
+                                                    .Callback(() =>
+                                                    {
+                                                        _channelSessionMock.Raise(c => c.DataReceived += null,
+                                                                                  new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
+                                                    });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte)SftpMessageTypes.Name, _encoding))
+                                   .Returns(_sftpNameResponse);
+
+            #endregion SftpSession.Connect()
+
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpOpenRequestBytes)).Callback(() =>
+                {
+                    var sshMessagePayload = new byte[_sftpHandleResponseBytes.Length + 40];
+                    Buffer.BlockCopy(_sftpHandleResponseBytes, 0, sshMessagePayload, 0, _sftpHandleResponseBytes.Length);
+                    Buffer.BlockCopy(_sftpDataResponseBytes, 0, sshMessagePayload, _sftpHandleResponseBytes.Length, 40);
+
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, sshMessagePayload));
+                });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Handle, _encoding))
+                                   .Returns(new SftpHandleResponse(_protocolVersion));
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpReadRequestBytes)).Callback(() =>
+            {
+                var sshMessagePayload = new byte[_sftpDataResponseBytes.Length - 40];
+                Buffer.BlockCopy(_sftpDataResponseBytes, 40, sshMessagePayload, 0, _sftpDataResponseBytes.Length - 40);
+
+                _channelSessionMock.Raise(c => c.DataReceived += null,
+                                          new ChannelDataEventArgs(0, sshMessagePayload));
+            });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
+                                   .Returns(new SftpDataResponse(_protocolVersion));
+        }
+
+        protected void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
+
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession.Connect();
+        }
+
+        protected void Act()
+        {
+            var openAsyncResult = _sftpSession.BeginOpen(_path, Flags.Read, null, null);
+            var readAsyncResult = _sftpSession.BeginRead(_handle, _offset, _length, null, null);
+
+            _actualHandle = _sftpSession.EndOpen(openAsyncResult);
+            _actualData = _sftpSession.EndRead(readAsyncResult);
+        }
+
+        [TestMethod]
+        public void ReturnedValueShouldBeDataOfSftpDataResponse()
+        {
+            Assert.IsTrue(_data.IsEqualTo(_actualData));
+        }
+
+        [TestMethod]
+        public void ReturnedHandleShouldBeHandleOfSftpHandleResponse()
+        {
+            Assert.IsTrue(_handle.IsEqualTo(_actualHandle));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
new file mode 100644
index 000000000..75f1d2b8f
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Channels;
+using Renci.SshNet.Common;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Abstractions;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage
+    {
+        #region SftpSession.Connect()
+
+        private Mock<ISession> _sessionMock;
+        private Mock<IChannelSession> _channelSessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private SftpSession _sftpSession;
+        private int _operationTimeout;
+        private Encoding _encoding;
+        private uint _protocolVersion;
+        private byte[] _sftpInitRequestBytes;
+        private SftpVersionResponse _sftpVersionResponse;
+        private byte[] _sftpRealPathRequestBytes;
+        private SftpNameResponse _sftpNameResponse;
+        private byte[] _sftpReadRequestBytes;
+        private byte[] _sftpDataResponseBytes;
+        private byte[] _handle;
+        private uint _offset;
+        private uint _length;
+        private byte[] _data;
+        private byte[] _actual;
+
+        #endregion SftpSession.Connect()
+
+        [TestInitialize]
+        public void Setup()
+        {
+            Arrange();
+            Act();
+        }
+
+        private void SetupData()
+        {
+            var random = new Random();
+
+            #region SftpSession.Connect()
+
+            _operationTimeout = random.Next(100, 500);
+            _protocolVersion = (uint) random.Next(0, 3);
+            _encoding = Encoding.UTF8;
+
+            _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpVersionResponse = new SftpVersionResponseBuilder().WithVersion(_protocolVersion)
+                                                                   .Build();
+            _sftpRealPathRequestBytes = new SftpRealPathRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                        .WithRequestId(1)
+                                                                        .WithPath(".")
+                                                                        .WithEncoding(_encoding)
+                                                                        .Build()
+                                                                        .GetBytes();
+            _sftpNameResponse = new SftpNameResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                             .WithResponseId(1)
+                                                             .WithEncoding(_encoding)
+                                                             .WithFile("/ABC", SftpFileAttributes.Empty)
+                                                             .Build();
+
+            #endregion SftpSession.Connect()
+
+            _handle = CryptoAbstraction.GenerateRandom(4);
+            _offset = (uint) random.Next(1, 5);
+            _length = (uint) random.Next(30, 50);
+            _data = CryptoAbstraction.GenerateRandom(200);
+            _sftpReadRequestBytes = new SftpReadRequestBuilder().WithProtocolVersion(_protocolVersion)
+                                                                .WithRequestId(2)
+                                                                .WithHandle(_handle)
+                                                                .WithOffset(_offset)
+                                                                .WithLength(_length)
+                                                                .Build()
+                                                                .GetBytes();
+            _sftpDataResponseBytes = new SftpDataResponseBuilder().WithProtocolVersion(_protocolVersion)
+                                                                  .WithResponseId(2)
+                                                                  .WithData(_data)
+                                                                  .Build()
+                                                                  .GetBytes();
+        }
+
+        private void CreateMocks()
+        {
+            _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+        }
+
+        private void SetupMocks()
+        {
+            var sequence = new MockSequence();
+
+            #region SftpSession.Connect()
+
+            _sessionMock.InSequence(sequence).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.Open());
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendSubsystemRequest("sftp")).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpInitRequestBytes))
+                                                    .Callback(() =>
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
+                });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(0U, (byte) SftpMessageTypes.Version, _encoding))
+                                   .Returns(_sftpVersionResponse);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpRealPathRequestBytes))
+                                                    .Callback(() =>
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
+                });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Name, _encoding))
+                                   .Returns(_sftpNameResponse);
+
+            #endregion SftpSession.Connect()
+
+            _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
+            _channelSessionMock.InSequence(sequence).Setup(p => p.SendData(_sftpReadRequestBytes))
+                                                    .Callback(() =>
+                {
+                    _channelSessionMock.Raise(c => c.DataReceived += null,
+                                              new ChannelDataEventArgs(0, _sftpDataResponseBytes));
+                });
+            _sftpMessageFactoryMock.InSequence(sequence)
+                                   .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
+                                   .Returns(new SftpDataResponse(_protocolVersion));
+        }
+
+        protected void Arrange()
+        {
+            SetupData();
+            CreateMocks();
+            SetupMocks();
+
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession.Connect();
+        }
+
+        protected void Act()
+        {
+            _actual = _sftpSession.RequestRead(_handle, _offset, _length);
+        }
+
+        [TestMethod]
+        public void ReturnedValueShouldBeDataOfSftpDataResponse()
+        {
+            Assert.IsTrue(_data.IsEqualTo(_actual));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsRequestBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsRequestBuilder.cs
new file mode 100644
index 000000000..71e37bd12
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsRequestBuilder.cs
@@ -0,0 +1,61 @@
+using Renci.SshNet.Sftp.Requests;
+using Renci.SshNet.Sftp.Responses;
+using System;
+using System.Text;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpStatVfsRequestBuilder
+    {
+        private uint _protocolVersion;
+        private uint _requestId;
+        private string _path;
+        private Encoding _encoding;
+        private Action<SftpExtendedReplyResponse> _extendedAction;
+        private Action<SftpStatusResponse> _statusAction;
+
+        public SftpStatVfsRequestBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpStatVfsRequestBuilder WithRequestId(uint requestId)
+        {
+            _requestId = requestId;
+            return this;
+        }
+
+        public SftpStatVfsRequestBuilder WithPath(string path)
+        {
+            _path = path;
+            return this;
+        }
+
+        public SftpStatVfsRequestBuilder WithEncoding(Encoding encoding)
+        {
+            _encoding = encoding;
+            return this;
+        }
+
+        public SftpStatVfsRequestBuilder WithExtendedAction(Action<SftpExtendedReplyResponse> extendedAction)
+        {
+            _extendedAction = extendedAction;
+            return this;
+        }
+        
+        public SftpStatVfsRequestBuilder WithStatusAction(Action<SftpStatusResponse> statusAction)
+        {
+            _statusAction = statusAction;
+            return this;
+        }
+
+        public StatVfsRequest Build()
+        {
+            var extendedAction = _extendedAction ?? ((extendedReplyResponse) => { });
+            var statusAction = _statusAction ?? ((statusResponse) => { });
+
+            return new StatVfsRequest(_protocolVersion, _requestId, _path, _encoding, extendedAction, statusAction);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
new file mode 100644
index 000000000..2d6be526e
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
@@ -0,0 +1,135 @@
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    internal class SftpStatVfsResponseBuilder
+    {
+        private uint _protocolVersion;
+        private uint _responseId;
+        private ulong _bsize;
+        private ulong _frsize;
+        private ulong _blocks;
+        private ulong _bfree;
+        private ulong _bavail;
+        private ulong _files;
+        private ulong _ffree;
+        private ulong _favail;
+        private ulong _sid;
+        private ulong _flag;
+        private ulong _namemax;
+
+        public SftpStatVfsResponseBuilder WithProtocolVersion(uint protocolVersion)
+        {
+            _protocolVersion = protocolVersion;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithResponseId(uint responseId)
+        {
+            _responseId = responseId;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithBSize(ulong bsize)
+        {
+            _bsize = bsize;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithFrSize(ulong frsize)
+        {
+            _frsize = frsize;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithBlocks(ulong blocks)
+        {
+            _blocks = blocks;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithBFree(ulong bfree)
+        {
+            _bfree = bfree;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithBAvail(ulong bavail)
+        {
+            _bavail = bavail;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithFiles(ulong files)
+        {
+            _files = files;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithFFree(ulong ffree)
+        {
+            _ffree = ffree;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithFAvail(ulong favail)
+        {
+            _favail = favail;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithSid(ulong sid)
+        {
+            _sid = sid;
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithIsReadOnly(bool isReadOnly)
+        {
+            if (isReadOnly)
+                _flag &= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_RDONLY;
+            else
+                _flag |= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_RDONLY;
+
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithSupportsSetUid(bool supportsSetUid)
+        {
+            if (supportsSetUid)
+                _flag |= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_NOSUID;
+            else
+                _flag &= SftpFileSytemInformation.SSH_FXE_STATVFS_ST_NOSUID;
+
+            return this;
+        }
+
+        public SftpStatVfsResponseBuilder WithNameMax(ulong nameMax)
+        {
+            _namemax = nameMax;
+            return this;
+        }
+
+        public StatVfsResponse Build()
+        {
+            var fileSystemInfo = new SftpFileSytemInformation(_bsize,
+                                                              _frsize,
+                                                              _blocks,
+                                                              _bfree,
+                                                              _bavail,
+                                                              _files,
+                                                              _ffree,
+                                                              _favail,
+                                                              _sid,
+                                                              _flag,
+                                                              _namemax);
+
+            return new StatVfsResponse(_protocolVersion)
+            {
+                ResponseId = _responseId,
+                Information = fileSystemInfo
+            };
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpVersionResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpVersionResponseBuilder.cs
index e5e1f6707..85f33cc1d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpVersionResponseBuilder.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpVersionResponseBuilder.cs
@@ -1,53 +1,38 @@
 using System.Collections.Generic;
-using System.Text;
-using Renci.SshNet.Common;
-using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
-    public class SftpVersionResponseBuilder
+    internal class SftpVersionResponseBuilder
     {
-        private readonly uint _version;
-        private readonly IDictionary<string, string> _extensions;
+        private uint _version;
+        private IDictionary<string, string> _extensions;
 
-        private SftpVersionResponseBuilder(uint version)
+        public SftpVersionResponseBuilder()
         {
-            _version = version;
             _extensions = new Dictionary<string, string>();
         }
 
-        public static SftpVersionResponseBuilder Create(uint version)
+        public SftpVersionResponseBuilder WithVersion(uint version)
         {
-            return new SftpVersionResponseBuilder(version);
+            _version = version;
+            return this;
         }
 
-        public SftpVersionResponseBuilder AddExtension(string name, string data)
+        public SftpVersionResponseBuilder WithExtension(string name, string data)
         {
             _extensions.Add(name, data);
             return this;
         }
 
-        public byte[] Build()
-        {
-            var extensions = BuildExtensions();
-
-            var sshDataStream = new SshDataStream(4 + 1 + 4 + extensions.Length);
-            sshDataStream.Write((uint)sshDataStream.Capacity - 4);
-            sshDataStream.WriteByte((byte)SftpMessageTypes.Version);
-            sshDataStream.Write(_version);
-            sshDataStream.Write(extensions, 0, extensions.Length);
-            return sshDataStream.ToArray();
-        }
-
-        private byte[] BuildExtensions()
+        public SftpVersionResponse Build()
         {
-            var sshDataStream = new SshDataStream(0);
-            foreach (var extensionPair in _extensions)
-            {
-                sshDataStream.Write(extensionPair.Key, Encoding.ASCII);
-                sshDataStream.Write(extensionPair.Value, Encoding.ASCII);
-            }
-            return sshDataStream.ToArray();
+            var sftpVersionResponse = new SftpVersionResponse()
+                {
+                    Version = _version,
+                    Extentions = _extensions
+                };
+            return sftpVersionResponse;
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
index f633a0b59..05f504f2b 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
@@ -10,9 +10,10 @@ public class SftpClientTest_Dispose_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<ISftpSession> _sftpSessionMock;
         private int _operationTimeout;
 
         [TestInitialize]
@@ -31,6 +32,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -44,8 +46,11 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding))
-                .Returns(_sftpSessionMock.Object);
+                               .Setup(p => p.CreateSftpMessageFactory())
+                               .Returns(_sftpMessageFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                               .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+                               .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -59,11 +64,17 @@ protected void Act()
             _sftpClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
index c29fdc169..cdf8bef6e 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
@@ -10,9 +10,11 @@ public class SftpClientTest_Dispose_Disconnected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<ISftpSession> _sftpSessionMock;
+
         private int _operationTimeout;
 
         [TestInitialize]
@@ -22,15 +24,11 @@ public void Setup()
             Act();
         }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-        }
-
         protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -44,7 +42,10 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding))
+                               .Setup(p => p.CreateSftpMessageFactory())
+                               .Returns(_sftpMessageFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
                 .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -60,11 +61,17 @@ protected void Act()
             _sftpClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
index 1d9b8b4dc..227e78f59 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
@@ -10,9 +10,10 @@ public class SftpClientTest_Dispose_Disposed
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<ISftpSession> _sftpSessionMock;
         private int _operationTimeout;
 
         [TestInitialize]
@@ -31,6 +32,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -44,7 +46,10 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding))
+                               .Setup(p => p.CreateSftpMessageFactory())
+                               .Returns(_sftpMessageFactoryMock.Object);
+            _serviceFactoryMock.InSequence(sequence)
+                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
                 .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -60,11 +65,17 @@ protected void Act()
             _sftpClient.Dispose();
         }
 
+        [TestMethod]
+        public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
+        {
+            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+        }
+
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
index 27b9b9ee2..828de9e27 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Sftp;
@@ -11,9 +10,10 @@ public class SftpClientTest_Finalize_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
+        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
-        private Mock<ISftpSession> _sftpSessionMock;
         private int _operationTimeout;
 
         [TestInitialize]
@@ -27,6 +27,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Loose);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -37,17 +38,15 @@ protected void Arrange()
             _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
                 .Returns(_sessionMock.Object);
             _sessionMock.Setup(p => p.Connect());
-            _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding))
-                .Returns(_sftpSessionMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSftpMessageFactory())
+                               .Returns(_sftpMessageFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+                               .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.Setup(p => p.Connect());
 
             _sftpClient.Connect();
             _sftpClient = null;
 
-            _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding))
-                .Returns((ISftpSession)  null);
-            _serviceFactoryMock.ResetCalls();
-
             // we need to dereference all other mocks as they might otherwise hold the target alive
             _sessionMock = null;
             _connectionInfo = null;
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
index ca47f09e7..241b49104 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSessionStub.cs
@@ -10,8 +10,8 @@ internal class SubsystemSessionStub : SubsystemSession
     {
         private int _onChannelOpenInvocationCount;
 
-        public SubsystemSessionStub(ISession session, string subsystemName, int operationTimeout, Encoding encoding)
-            : base(session, subsystemName, operationTimeout, encoding)
+        public SubsystemSessionStub(ISession session, string subsystemName, int operationTimeout)
+            : base(session, subsystemName, operationTimeout)
         {
             OnDataReceivedInvocations = new List<ChannelDataEventArgs>();
         }
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
index fa90ba560..24e868cbb 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Connected.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Connect_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private InvalidOperationException _actualException;
@@ -35,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -51,8 +49,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
index 065fed113..1d15dd6e5 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disconnected.cs
@@ -18,7 +18,6 @@ public class SubsystemSession_Connect_Disconnected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private MockSequence _sequence;
@@ -35,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -55,8 +53,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
index b500dd35b..11e6b0c63 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Connect_Disposed.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Connect_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ObjectDisposedException _actualException;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Dispose();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
index 43b28985e..f5d078135 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Connected.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Disconnect_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private MockSequence _sequence;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -50,8 +48,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
index f3e2312ac..21116a78e 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_Disposed.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Disconnect_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -33,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
index 8804f6aa7..71b161a56 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Disconnect_NeverConnected.cs
@@ -15,7 +15,6 @@ public class SubsystemSession_Disconnect_NeverConnected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -31,7 +30,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -40,8 +38,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
index dfe98c1ca..f89da65ce 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Connected.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Dispose_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -33,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
index 2111db3b4..c304ed43a 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disconnected.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Dispose_Disconnected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -33,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
index eb2e1d46a..d2f93decf 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_Disposed.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_Dispose_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -33,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
index 6c83b499c..83fab8995 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_Dispose_NeverConnected.cs
@@ -16,7 +16,6 @@ public class SubsystemSession_Dispose_NeverConnected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
 
@@ -32,7 +31,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -41,8 +39,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
index bdd03248b..f8187a90c 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Connected.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_OnChannelDataReceived_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ChannelDataEventArgs _channelDataEventArgs;
@@ -35,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _channelDataEventArgs = new ChannelDataEventArgs(
@@ -53,8 +50,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
index ec9259261..33dfac889 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_Disposed.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_OnChannelDataReceived_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ChannelDataEventArgs _channelDataEventArgs;
@@ -34,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _channelDataEventArgs = new ChannelDataEventArgs(
@@ -53,8 +50,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
index a1e014138..43b9bbe3a 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -18,7 +17,6 @@ public class SubsystemSession_OnChannelDataReceived_OnDataReceived_Exception
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ChannelDataEventArgs _channelDataEventArgs;
@@ -36,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _channelDataEventArgs = new ChannelDataEventArgs(
@@ -55,8 +52,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.OnDataReceivedException = _onDataReceivedException;
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
index 774c2e911..e283c3220 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Connected.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -18,7 +17,6 @@ public class SubsystemSession_OnChannelException_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ExceptionEventArgs _channelExceptionEventArgs;
@@ -36,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _channelExceptionEventArgs = new ExceptionEventArgs(new SystemException());
@@ -52,8 +49,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
index 50a644e6d..d9b3a162b 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnChannelException_Disposed.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_OnChannelException_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ExceptionEventArgs _channelExceptionEventArgs;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _channelExceptionEventArgs = new ExceptionEventArgs(new SystemException());
@@ -51,8 +49,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
index 49d915a4e..b6851cfcf 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Connected.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_OnSessionDisconnected_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private MockSequence _sequence;
@@ -34,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
index 094424d15..7a90eba4c 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionDisconnected_Disposed.cs
@@ -17,7 +17,6 @@ public class SubsystemSession_OnSessionDisconnected_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
             
@@ -33,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -49,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
index 66cd41730..32151eb93 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Connected.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -18,7 +17,6 @@ public class SubsystemSession_OnSessionErrorOccurred_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ExceptionEventArgs _errorOccurredEventArgs;
@@ -36,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _errorOccurredEventArgs = new ExceptionEventArgs(new SystemException());
@@ -52,8 +49,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
index e3bd8bd91..df18c0428 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_OnSessionErrorOccurred_Disposed.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_OnSessionErrorOccurred_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ExceptionEventArgs _errorOccurredEventArgs;
@@ -34,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _errorOccurredEventArgs = new ExceptionEventArgs(new SystemException());
@@ -51,8 +48,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
index ce2c6850b..11a455c77 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Connected.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_SendData_Connected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private byte[] _data;
@@ -35,7 +33,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _data = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
@@ -53,8 +50,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
index 8935fc8ed..b8ebc7fa8 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_Disposed.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_SendData_Disposed
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private ObjectDisposedException _actualException;
@@ -34,7 +32,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
 
@@ -50,8 +47,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
             _subsystemSession.Connect();
diff --git a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
index 8d36e19cb..3dd9f5cc1 100644
--- a/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SubsystemSession_SendData_NeverConnected.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Renci.SshNet.Channels;
@@ -17,7 +16,6 @@ public class SubsystemSession_SendData_NeverConnected
         private string _subsystemName;
         private SubsystemSessionStub _subsystemSession;
         private int _operationTimeout;
-        private Encoding _encoding;
         private IList<EventArgs> _disconnectedRegister;
         private IList<ExceptionEventArgs> _errorOccurredRegister;
         private InvalidOperationException _actualException;
@@ -36,7 +34,6 @@ protected void Arrange()
             var random = new Random();
             _subsystemName = random.Next().ToString(CultureInfo.InvariantCulture);
             _operationTimeout = 30000;
-            _encoding = Encoding.UTF8;
             _disconnectedRegister = new List<EventArgs>();
             _errorOccurredRegister = new List<ExceptionEventArgs>();
             _data = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
@@ -53,8 +50,7 @@ protected void Arrange()
             _subsystemSession = new SubsystemSessionStub(
                 _sessionMock.Object,
                 _subsystemName,
-                _operationTimeout,
-                _encoding);
+                _operationTimeout);
             _subsystemSession.Disconnected += (sender, args) => _disconnectedRegister.Add(args);
             _subsystemSession.ErrorOccurred += (sender, args) => _errorOccurredRegister.Add(args);
         }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 9bf0c4cd4..9fc8daefe 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -343,6 +343,7 @@
     <Compile Include="Classes\SftpClientTest_Dispose_Disconnected.cs" />
     <Compile Include="Classes\SftpClientTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\SftpClientTest_Finalize_Connected.cs" />
+    <Compile Include="Classes\Sftp\SftpDataResponseBuilder.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTestBase.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_DisposeShouldUnblockReadAndReadAhead.cs" />
     <Compile Include="Classes\Sftp\SftpFileReaderTest_LastChunkBeforeEofIsComplete.cs" />
@@ -453,8 +454,19 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs" />
     <Compile Include="Classes\Sftp\SftpFileTest.cs" />
+    <Compile Include="Classes\Sftp\SftpHandleResponseBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpInitRequestBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpNameResponseBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpOpenRequestBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpReadRequestBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpRealPathRequestBuilder.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestRead.cs" />
     <Compile Include="Classes\Sftp\SftpSessionTest_Connected_RequestStatVfs.cs" />
+    <Compile Include="Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs" />
+    <Compile Include="Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs" />
+    <Compile Include="Classes\Sftp\SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs" />
+    <Compile Include="Classes\Sftp\SftpStatVfsRequestBuilder.cs" />
+    <Compile Include="Classes\Sftp\SftpStatVfsResponseBuilder.cs" />
     <Compile Include="Classes\Sftp\SftpVersionResponseBuilder.cs" />
     <Compile Include="Classes\ShellTestTest.cs" />
     <Compile Include="Classes\ShellStreamTest.cs" />
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index 7a2c35c07..dafc09c57 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -31,10 +31,11 @@ internal partial interface IServiceFactory
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="ISftpSession"/> in.</param>
         /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <param name="encoding">The encoding.</param>
+        /// <param name="sftpMessageFactory">The factory to use for creating SFTP messages.</param>
         /// <returns>
         /// An <see cref="ISftpSession"/>.
         /// </returns>
-        ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding);
+        ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding, ISftpResponseFactory sftpMessageFactory);
 
         /// <summary>
         /// Create a new <see cref="PipeStream"/>.
@@ -59,5 +60,7 @@ internal partial interface IServiceFactory
         IKeyExchange CreateKeyExchange(IDictionary<string, Type> clientAlgorithms, string[] serverAlgorithms);
 
         ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize);
+
+        ISftpResponseFactory CreateSftpMessageFactory();
     }
 }
diff --git a/src/Renci.SshNet/Netconf/NetConfSession.cs b/src/Renci.SshNet/Netconf/NetConfSession.cs
index d2c7b35df..14ba00a6e 100644
--- a/src/Renci.SshNet/Netconf/NetConfSession.cs
+++ b/src/Renci.SshNet/Netconf/NetConfSession.cs
@@ -35,7 +35,7 @@ internal class NetConfSession : SubsystemSession, INetConfSession
         /// <param name="session">The session.</param>
         /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         public NetConfSession(ISession session, int operationTimeout)
-            : base(session, "netconf", operationTimeout, Encoding.UTF8)
+            : base(session, "netconf", operationTimeout)
         {
             ClientCapabilities = new XmlDocument();
             ClientCapabilities.LoadXml("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 7b7a2631a..28bca009e 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -172,6 +172,7 @@
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceFactory.NET.cs" />
     <Compile Include="Sftp\ISftpFileReader.cs" />
+    <Compile Include="Sftp\ISftpMessageFactory.cs" />
     <Compile Include="Sftp\ISftpSession.cs" />
     <Compile Include="Common\SshDataStream.cs" />
     <Compile Include="ExpectAsyncResult.cs" />
@@ -416,6 +417,7 @@
     <Compile Include="Sftp\Responses\SftpResponse.cs" />
     <Compile Include="Sftp\Responses\SftpStatusResponse.cs" />
     <Compile Include="Sftp\Responses\SftpVersionResponse.cs" />
+    <Compile Include="Sftp\Responses\StatVfsResponse.cs" />
     <Compile Include="Sftp\SftpCloseAsyncResult.cs" />
     <Compile Include="Sftp\SftpDownloadAsyncResult.cs" />
     <Compile Include="Sftp\SftpFile.cs" />
@@ -427,6 +429,7 @@
     </Compile>
     <Compile Include="Sftp\SftpListDirectoryAsyncResult.cs" />
     <Compile Include="Sftp\SftpMessage.cs" />
+    <Compile Include="Sftp\SftpMessageFactory.cs" />
     <Compile Include="Sftp\SftpMessageTypes.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index b9ad0e95c..f9cd7fc66 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -46,12 +46,13 @@ public ISession CreateSession(ConnectionInfo connectionInfo)
         /// <param name="session">The <see cref="ISession"/> to create the <see cref="ISftpSession"/> in.</param>
         /// <param name="operationTimeout">The number of milliseconds to wait for an operation to complete, or -1 to wait indefinitely.</param>
         /// <param name="encoding">The encoding.</param>
+        /// <param name="sftpMessageFactory">The factory to use for creating SFTP messages.</param>
         /// <returns>
         /// An <see cref="ISftpSession"/>.
         /// </returns>
-        public ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding)
+        public ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding, ISftpResponseFactory sftpMessageFactory)
         {
-            return new SftpSession(session, operationTimeout, encoding);
+            return new SftpSession(session, operationTimeout, encoding, sftpMessageFactory);
         }
 
         /// <summary>
@@ -130,5 +131,10 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
 
             return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
+
+        public ISftpResponseFactory CreateSftpMessageFactory()
+        {
+            return new SftpResponseFactory();
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/ISftpMessageFactory.cs b/src/Renci.SshNet/Sftp/ISftpMessageFactory.cs
new file mode 100644
index 000000000..afb440c10
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/ISftpMessageFactory.cs
@@ -0,0 +1,9 @@
+using System.Text;
+
+namespace Renci.SshNet.Sftp
+{
+    internal interface ISftpResponseFactory
+    {
+        SftpMessage Create(uint protocolVersion, byte messageType, Encoding encoding);
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
index 610f90b3e..f15a8dcc0 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
@@ -7,7 +7,7 @@ public override SftpMessageTypes SftpMessageType
             get { return SftpMessageTypes.Data; }
         }
 
-        public byte[] Data { get; private set; }
+        public byte[] Data { get; set; }
 
         public SftpDataResponse(uint protocolVersion)
             : base(protocolVersion)
@@ -20,5 +20,12 @@ protected override void LoadData()
             
             Data = ReadBinary();
         }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+
+            WriteBinary(Data, 0, Data.Length);
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
index 2a856139f..233e3e371 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
@@ -7,7 +7,7 @@ public override SftpMessageTypes SftpMessageType
             get { return SftpMessageTypes.Handle; }
         }
 
-        public byte[] Handle { get; private set; }
+        public byte[] Handle { get; set; }
 
         public SftpHandleResponse(uint protocolVersion)
             : base(protocolVersion)
@@ -20,5 +20,12 @@ protected override void LoadData()
             
             Handle = ReadBinary();
         }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+
+            WriteBinary(Handle, 0, Handle.Length);
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs
index ca5166b31..3750119d4 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Renci.SshNet.Common;
+using System.Collections.Generic;
 using System.Text;
 
 namespace Renci.SshNet.Sftp.Responses
@@ -14,12 +15,12 @@ public override SftpMessageTypes SftpMessageType
 
         public Encoding Encoding { get; private set; }
 
-        public KeyValuePair<string, SftpFileAttributes>[] Files { get; private set; }
+        public KeyValuePair<string, SftpFileAttributes>[] Files { get; set; }
 
         public SftpNameResponse(uint protocolVersion, Encoding encoding)
             : base(protocolVersion)
         {
-            Files = new KeyValuePair<string, SftpFileAttributes>[0];
+            Files = Array<KeyValuePair<string, SftpFileAttributes>>.Empty;
             Encoding = encoding;
         }
 
@@ -29,14 +30,42 @@ protected override void LoadData()
             
             Count = ReadUInt32();
             Files = new KeyValuePair<string, SftpFileAttributes>[Count];
-            
+
             for (var i = 0; i < Count; i++)
             {
                 var fileName = ReadString(Encoding);
-                ReadString(Encoding);   //  skip longname
-                var attributes = ReadAttributes();
-                Files[i] = new KeyValuePair<string, SftpFileAttributes>(fileName, attributes);
+                if (SupportsLongName(ProtocolVersion))
+                {
+                    ReadString(Encoding); // skip longname
+                }
+                Files[i] = new KeyValuePair<string, SftpFileAttributes>(fileName, ReadAttributes());
             }
         }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+
+            Write((uint) Files.Length); // count
+
+            for (var i = 0; i < Files.Length; i++)
+            {
+                var file = Files[i];
+
+                Write(file.Key, Encoding); // filename
+
+                if (SupportsLongName(ProtocolVersion))
+                {
+                    Write(0U); // longname
+                }
+
+                Write(file.Value.GetBytes()); // attrs
+            }
+        }
+
+        private static bool SupportsLongName(uint protocolVersion)
+        {
+            return protocolVersion <= 3U;
+        }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpResponse.cs
index 44fafef1e..3b784bf09 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpResponse.cs
@@ -1,10 +1,8 @@
-using System;
-
-namespace Renci.SshNet.Sftp.Responses
+namespace Renci.SshNet.Sftp.Responses
 {
     internal abstract class SftpResponse : SftpMessage
     {
-        public uint ResponseId { get; private set; }
+        public uint ResponseId { get; set; }
 
         public uint ProtocolVersion { get; private set; }
 
@@ -22,7 +20,9 @@ protected override void LoadData()
 
         protected override void SaveData()
         {
-            throw new InvalidOperationException("Response cannot be saved.");
+            base.SaveData();
+
+            Write(ResponseId);
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpVersionResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpVersionResponse.cs
index 642bd8060..87c9f13f3 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpVersionResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpVersionResponse.cs
@@ -9,9 +9,9 @@ public override SftpMessageTypes SftpMessageType
             get { return SftpMessageTypes.Version; }
         }
 
-        public uint Version { get; private set; }
+        public uint Version { get; set; }
 
-        public IDictionary<string, string> Extentions { get; private set; }
+        public IDictionary<string, string> Extentions { get; set; }
 
         protected override void LoadData()
         {
diff --git a/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs b/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs
index 6a6d36a92..e7b6c2edf 100644
--- a/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs
@@ -2,10 +2,10 @@
 {
     internal class StatVfsResponse : SftpExtendedReplyResponse
     {
-        public SftpFileSytemInformation Information { get; private set; }
+        public SftpFileSytemInformation Information { get; set; }
 
-        public StatVfsResponse()
-            : base(0)
+        public StatVfsResponse(uint protocolVersion)
+            : base(protocolVersion)
         {
         }
 
@@ -13,12 +13,25 @@ protected override void LoadData()
         {
             base.LoadData();
 
-            this.Information = new SftpFileSytemInformation(this.ReadUInt64(), this.ReadUInt64(),
-                                                                     this.ReadUInt64(), this.ReadUInt64(),
-                                                                     this.ReadUInt64(), this.ReadUInt64(),
-                                                                     this.ReadUInt64(), this.ReadUInt64(),
-                                                                     this.ReadUInt64(), this.ReadUInt64(),
-                                                                     this.ReadUInt64());
+            Information = new SftpFileSytemInformation(ReadUInt64(), // FileSystemBlockSize
+                                                       ReadUInt64(), // BlockSize
+                                                       ReadUInt64(), // TotalBlocks
+                                                       ReadUInt64(), // FreeBlocks
+                                                       ReadUInt64(), // AvailableBlocks
+                                                       ReadUInt64(), // TotalNodes
+                                                       ReadUInt64(), // FreeNodes
+                                                       ReadUInt64(), // AvailableNodes
+                                                       ReadUInt64(), // Sid
+                                                       ReadUInt64(), // Flags
+                                                       ReadUInt64()  // MaxNameLenght
+                                                       );
+        }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+
+            Information.SaveData(DataStream);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet/Sftp/SftpFileSystemInformation.cs b/src/Renci.SshNet/Sftp/SftpFileSystemInformation.cs
index a8b731073..bff9295be 100644
--- a/src/Renci.SshNet/Sftp/SftpFileSystemInformation.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileSystemInformation.cs
@@ -1,4 +1,6 @@
-namespace Renci.SshNet.Sftp
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Sftp
 {
     /// <summary>
     /// Contains File system information exposed by statvfs@openssh.com request.
@@ -140,5 +142,20 @@ internal SftpFileSytemInformation(ulong bsize, ulong frsize, ulong blocks, ulong
             _flag = flag;
             MaxNameLenght = namemax;
         }
+
+        internal void SaveData(SshDataStream stream)
+        {
+            stream.Write(FileSystemBlockSize);
+            stream.Write(BlockSize);
+            stream.Write(TotalBlocks);
+            stream.Write(FreeBlocks);
+            stream.Write(AvailableBlocks);
+            stream.Write(TotalNodes);
+            stream.Write(FreeNodes);
+            stream.Write(AvailableNodes);
+            stream.Write(Sid);
+            stream.Write(_flag);
+            stream.Write(MaxNameLenght);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Renci.SshNet/Sftp/SftpMessage.cs b/src/Renci.SshNet/Sftp/SftpMessage.cs
index d61614972..8f131fa79 100644
--- a/src/Renci.SshNet/Sftp/SftpMessage.cs
+++ b/src/Renci.SshNet/Sftp/SftpMessage.cs
@@ -1,21 +1,11 @@
-using System;
-using System.IO;
+using System.IO;
 using Renci.SshNet.Common;
 using System.Globalization;
-using Renci.SshNet.Sftp.Responses;
-using System.Text;
 
 namespace Renci.SshNet.Sftp
 {
     internal abstract class SftpMessage : SshData
     {
-        public static SftpMessage Load(uint protocolVersion, byte[] data, int offset, int count, Encoding encoding)
-        {
-            var messageType = (SftpMessageTypes) data[offset];
-
-            return Load(protocolVersion, messageType, data, offset + 1, count - 1, encoding);
-        }
-
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -79,42 +69,6 @@ protected SftpFileAttributes ReadAttributes()
             return SftpFileAttributes.FromBytes(DataStream);
         }
 
-        private static SftpMessage Load(uint protocolVersion, SftpMessageTypes messageType, byte[] data, int offset, int count, Encoding encoding)
-        {
-            SftpMessage message;
-
-            switch (messageType)
-            {
-                case SftpMessageTypes.Version:
-                    message = new SftpVersionResponse();
-                    break;
-                case SftpMessageTypes.Status:
-                    message = new SftpStatusResponse(protocolVersion);
-                    break;
-                case SftpMessageTypes.Data:
-                    message = new SftpDataResponse(protocolVersion);
-                    break;
-                case SftpMessageTypes.Handle:
-                    message = new SftpHandleResponse(protocolVersion);
-                    break;
-                case SftpMessageTypes.Name:
-                    message = new SftpNameResponse(protocolVersion, encoding);
-                    break;
-                case SftpMessageTypes.Attrs:
-                    message = new SftpAttrsResponse(protocolVersion);
-                    break;
-                case SftpMessageTypes.ExtendedReply:
-                    message = new SftpExtendedReplyResponse(protocolVersion);
-                    break;
-                default:
-                    throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Message type '{0}' is not supported.", messageType));
-            }
-
-            message.Load(data, offset, count);
-
-            return message;
-        }
-
         public override string ToString()
         {
             return string.Format(CultureInfo.CurrentCulture, "SFTP Message : {0}", SftpMessageType);
diff --git a/src/Renci.SshNet/Sftp/SftpMessageFactory.cs b/src/Renci.SshNet/Sftp/SftpMessageFactory.cs
new file mode 100644
index 000000000..4fcbec1e6
--- /dev/null
+++ b/src/Renci.SshNet/Sftp/SftpMessageFactory.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using Renci.SshNet.Sftp.Responses;
+using System.Globalization;
+
+namespace Renci.SshNet.Sftp
+{
+    internal sealed class SftpResponseFactory : ISftpResponseFactory
+    {
+        public SftpMessage Create(uint protocolVersion, byte messageType, Encoding encoding)
+        {
+            var sftpMessageType = (SftpMessageTypes) messageType;
+
+            SftpMessage message;
+
+            switch (sftpMessageType)
+            {
+                case SftpMessageTypes.Version:
+                    message = new SftpVersionResponse();
+                    break;
+                case SftpMessageTypes.Status:
+                    message = new SftpStatusResponse(protocolVersion);
+                    break;
+                case SftpMessageTypes.Data:
+                    message = new SftpDataResponse(protocolVersion);
+                    break;
+                case SftpMessageTypes.Handle:
+                    message = new SftpHandleResponse(protocolVersion);
+                    break;
+                case SftpMessageTypes.Name:
+                    message = new SftpNameResponse(protocolVersion, encoding);
+                    break;
+                case SftpMessageTypes.Attrs:
+                    message = new SftpAttrsResponse(protocolVersion);
+                    break;
+                case SftpMessageTypes.ExtendedReply:
+                    message = new SftpExtendedReplyResponse(protocolVersion);
+                    break;
+                default:
+                    throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Message type '{0}' is not supported.", sftpMessageType));
+            }
+
+            return message;
+        }
+
+        public 
+    }
+}
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index 4f74f8843..71846bdbd 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -11,15 +11,21 @@ namespace Renci.SshNet.Sftp
 {
     internal class SftpSession : SubsystemSession, ISftpSession
     {
-        private const int MaximumSupportedVersion = 3;
+        internal const int MaximumSupportedVersion = 3;
         private const int MinimumSupportedVersion = 0;
 
         private readonly Dictionary<uint, SftpRequest> _requests = new Dictionary<uint, SftpRequest>();
+        private readonly ISftpResponseFactory _sftpMessageFactory;
         //FIXME: obtain from SftpClient!
         private readonly List<byte> _data = new List<byte>(32 * 1024);
         private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false);
         private IDictionary<string, string> _supportedExtensions;
 
+        /// <summary>
+        /// Gets the character encoding to use.
+        /// </summary>
+        protected Encoding Encoding { get; private set; }
+
         /// <summary>
         /// Gets the remote working directory.
         /// </summary>
@@ -49,9 +55,11 @@ public uint NextRequestId
             }
         }
 
-        public SftpSession(ISession session, int operationTimeout, Encoding encoding)
-            : base(session, "sftp", operationTimeout, encoding)
+        public SftpSession(ISession session, int operationTimeout, Encoding encoding, ISftpResponseFactory sftpMessageFactory)
+            : base(session, "sftp", operationTimeout)
         {
+            Encoding = encoding;
+            _sftpMessageFactory = sftpMessageFactory;
         }
 
         /// <summary>
@@ -263,7 +271,7 @@ protected override void OnDataReceived(byte[] data)
                 // remove loaded data and bytes for length from _data holder
                 if (_data.Count == packetTotalLength)
                 {
-                    // the only buffered data is the data we're processing 
+                    // the only buffered data is the data we're processing
                     _data.Clear();
                 }
                 else
@@ -282,8 +290,10 @@ protected override void OnDataReceived(byte[] data)
 
         private bool TryLoadSftpMessage(byte[] packetData, int offset, int count)
         {
-            //  Load SFTP Message and handle it
-            var response = SftpMessage.Load(ProtocolVersion, packetData, offset, count, Encoding);
+            // Create SFTP message
+            var response = _sftpMessageFactory.Create(ProtocolVersion, packetData[offset], Encoding);
+            // Load message data into it
+            response.Load(packetData, offset + 1, count - 1);
 
             try
             {
@@ -1513,6 +1523,8 @@ public uint CalculateOptimalReadLength(uint bufferSize)
             // bytes 6 to 9: response id
             // bytes 10 to 13: length of payload‏
             //
+            // WinSCP uses a payload length of 32755 bytes
+            //
             // most ssh servers limit the size of the payload of a SSH_MSG_CHANNEL_DATA
             // response to 16 KB; if we requested 16 KB of data, then the SSH_FXP_DATA
             // payload of the SSH_MSG_CHANNEL_DATA message would be too big (16 KB + 13 bytes), and
@@ -1544,6 +1556,10 @@ public uint CalculateOptimalWriteLength(uint bufferSize, byte[] handle)
             // <handle>
             // 14-21: offset
             // 22-25: data length
+
+            // Putty uses data length of 4096 bytes
+            // WinSCP uses data length of 32739 bytes (total 32768 bytes; 32739 + 25 + 4 bytes for handle)
+
             var lengthOfNonDataProtocolFields = 25u + (uint)handle.Length;
             var maximumPacketSize = Channel.RemotePacketSize;
             return Math.Min(bufferSize, maximumPacketSize) - lengthOfNonDataProtocolFields;
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index d6b83aa23..2de6cbfe0 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -240,7 +240,7 @@ internal SftpClient(ConnectionInfo connectionInfo, bool ownsConnectionInfo, ISer
             : base(connectionInfo, ownsConnectionInfo, serviceFactory)
         {
             _operationTimeout = SshNet.Session.Infinite;
-            BufferSize = 1024 * 32;
+            _bufferSize = 1024 * 32;
         }
 
         #endregion Constructors
@@ -1375,8 +1375,7 @@ public SftpFileStream OpenWrite(string path)
         {
             CheckDisposed();
 
-            return new SftpFileStream(_sftpSession, path, FileMode.OpenOrCreate, FileAccess.Write,
-                (int) _bufferSize);
+            return new SftpFileStream(_sftpSession, path, FileMode.OpenOrCreate, FileAccess.Write, (int) _bufferSize);
         }
 
         /// <summary>
@@ -2123,7 +2122,7 @@ protected override void OnConnected()
         {
             base.OnConnected();
 
-            _sftpSession = ServiceFactory.CreateSftpSession(Session, _operationTimeout, ConnectionInfo.Encoding);
+            _sftpSession = ServiceFactory.CreateSftpSession(Session, _operationTimeout, ConnectionInfo.Encoding, ServiceFactory.CreateSftpMessageFactory());
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet/SubsystemSession.cs b/src/Renci.SshNet/SubsystemSession.cs
index d8a64305d..4aa52d5c9 100644
--- a/src/Renci.SshNet/SubsystemSession.cs
+++ b/src/Renci.SshNet/SubsystemSession.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Text;
 using System.Threading;
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Channels;
@@ -72,32 +71,23 @@ public bool IsOpen
             get { return _channel != null && _channel.IsOpen; }
         }
 
-        /// <summary>
-        /// Gets the character encoding to use.
-        /// </summary>
-        protected Encoding Encoding { get; private set; }
-
         /// <summary>
         /// Initializes a new instance of the SubsystemSession class.
         /// </summary>
         /// <param name="session">The session.</param>
         /// <param name="subsystemName">Name of the subsystem.</param>
         /// <param name="operationTimeout">The number of milliseconds to wait for a given operation to complete, or -1 to wait indefinitely.</param>
-        /// <param name="encoding">The character encoding to use.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="session" /> or <paramref name="subsystemName" /> or <paramref name="encoding"/> is <c>null</c>.</exception>
-        protected SubsystemSession(ISession session, string subsystemName, int operationTimeout, Encoding encoding)
+        /// <exception cref="ArgumentNullException"><paramref name="session" /> or <paramref name="subsystemName" /> is <c>null</c>.</exception>
+        protected SubsystemSession(ISession session, string subsystemName, int operationTimeout)
         {
             if (session == null)
                 throw new ArgumentNullException("session");
             if (subsystemName == null)
                 throw new ArgumentNullException("subsystemName");
-            if (encoding == null)
-                throw new ArgumentNullException("encoding");
 
             _session = session;
             _subsystemName = subsystemName;
             OperationTimeout = operationTimeout;
-            Encoding = encoding;
         }
 
         /// <summary>

From b5486225243ac3c031f102a297e44fe63c04e522 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 6 Aug 2017 20:11:09 +0200
Subject: [PATCH 114/128] Rename (I)SftpMessageFactory to
 (I)SftpResponseFactory.

---
 src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj   |  8 +++++++-
 .../Sftp/SftpSessionTest_Connected_RequestRead.cs  |  6 +++---
 .../SftpSessionTest_Connected_RequestStatVfs.cs    |  6 +++---
 ...d_MultipleSftpMessagesInSingleSshDataMessage.cs | 14 +++++++-------
 ...SftpMessagesSplitOverMultipleSshDataMessages.cs | 14 +++++++-------
 ...taReceived_SingleSftpMessageInSshDataMessage.cs | 12 ++++++------
 .../Classes/SftpClientTest_Dispose_Connected.cs    | 14 +++++++-------
 .../Classes/SftpClientTest_Dispose_Disconnected.cs | 14 +++++++-------
 .../Classes/SftpClientTest_Dispose_Disposed.cs     | 14 +++++++-------
 .../Classes/SftpClientTest_Finalize_Connected.cs   | 10 +++++-----
 src/Renci.SshNet/IServiceFactory.cs                |  2 +-
 src/Renci.SshNet/Renci.SshNet.csproj               |  4 ++--
 src/Renci.SshNet/ServiceFactory.cs                 |  2 +-
 ...tpMessageFactory.cs => ISftpResponseFactory.cs} |  0
 ...ftpMessageFactory.cs => SftpResponseFactory.cs} |  2 --
 src/Renci.SshNet/Sftp/SftpSession.cs               |  8 ++++----
 src/Renci.SshNet/SftpClient.cs                     |  5 ++++-
 17 files changed, 71 insertions(+), 64 deletions(-)
 rename src/Renci.SshNet/Sftp/{ISftpMessageFactory.cs => ISftpResponseFactory.cs} (100%)
 rename src/Renci.SshNet/Sftp/{SftpMessageFactory.cs => SftpResponseFactory.cs} (99%)

diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index b7024bcd4..4c0c06abc 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -743,6 +743,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -899,6 +902,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -947,7 +953,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
index 4aec52175..49f50ff28 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs
@@ -18,7 +18,7 @@ public class SftpSessionTest_Connected_RequestRead
 
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private ISftpResponseFactory _sftpMessageFactory;
+        private ISftpResponseFactory _sftpResponseFactory;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private Encoding _encoding;
@@ -54,7 +54,7 @@ private void SetupData()
             _operationTimeout = random.Next(100, 500);
             _protocolVersion = (uint) random.Next(0, 3);
             _encoding = Encoding.UTF8;
-            _sftpMessageFactory = new SftpResponseFactory();
+            _sftpResponseFactory = new SftpResponseFactory();
             _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
                                                                 .Build()
                                                                 .GetBytes();
@@ -144,7 +144,7 @@ private void Arrange()
             CreateMocks();
             SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactory);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpResponseFactory);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
index ca6d225b3..84cc4565a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs
@@ -16,7 +16,7 @@ public class SftpSessionTest_Connected_RequestStatVfs
 
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private ISftpResponseFactory _sftpMessageFactory;
+        private ISftpResponseFactory _sftpResponseFactory;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private Encoding _encoding;
@@ -50,7 +50,7 @@ private void SetupData()
             _operationTimeout = random.Next(100, 500);
             _encoding = Encoding.UTF8;
             _protocolVersion = 3;
-            _sftpMessageFactory = new SftpResponseFactory();
+            _sftpResponseFactory = new SftpResponseFactory();
             _sftpInitRequestBytes = new SftpInitRequestBuilder().WithVersion(SftpSession.MaximumSupportedVersion)
                                                                 .Build()
                                                                 .GetBytes();
@@ -132,7 +132,7 @@ protected void Arrange()
             CreateMocks();
             SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactory);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpResponseFactory);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
index 4119fcf26..2b4f14e18 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs
@@ -17,7 +17,7 @@ public class SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMes
 
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private Encoding _encoding;
@@ -111,7 +111,7 @@ private void CreateMocks()
         {
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
@@ -130,7 +130,7 @@ private void SetupMocks()
                                                         _channelSessionMock.Raise(c => c.DataReceived += null,
                                                                                   new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
                                                     });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(0U, (byte)SftpMessageTypes.Version, _encoding))
                                    .Returns(_sftpVersionResponse);
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
@@ -140,7 +140,7 @@ private void SetupMocks()
                                                         _channelSessionMock.Raise(c => c.DataReceived += null,
                                                                                   new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
                                                     });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte)SftpMessageTypes.Name, _encoding))
                                    .Returns(_sftpNameResponse);
 
@@ -158,10 +158,10 @@ private void SetupMocks()
                     _channelSessionMock.Raise(c => c.DataReceived += null,
                                               new ChannelDataEventArgs(0, sshMessagePayload));
                 });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Handle, _encoding))
                                    .Returns(new SftpHandleResponse(_protocolVersion));
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
                                    .Returns(new SftpDataResponse(_protocolVersion));
         }
@@ -172,7 +172,7 @@ protected void Arrange()
             CreateMocks();
             SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpResponseFactoryMock.Object);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
index 3eb2c9499..ab5a646b0 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs
@@ -17,7 +17,7 @@ public class SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleS
 
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private Encoding _encoding;
@@ -111,7 +111,7 @@ private void CreateMocks()
         {
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
@@ -130,7 +130,7 @@ private void SetupMocks()
                                                         _channelSessionMock.Raise(c => c.DataReceived += null,
                                                                                   new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
                                                     });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(0U, (byte)SftpMessageTypes.Version, _encoding))
                                    .Returns(_sftpVersionResponse);
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
@@ -140,7 +140,7 @@ private void SetupMocks()
                                                         _channelSessionMock.Raise(c => c.DataReceived += null,
                                                                                   new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
                                                     });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte)SftpMessageTypes.Name, _encoding))
                                    .Returns(_sftpNameResponse);
 
@@ -156,7 +156,7 @@ private void SetupMocks()
                     _channelSessionMock.Raise(c => c.DataReceived += null,
                                               new ChannelDataEventArgs(0, sshMessagePayload));
                 });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Handle, _encoding))
                                    .Returns(new SftpHandleResponse(_protocolVersion));
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
@@ -168,7 +168,7 @@ private void SetupMocks()
                 _channelSessionMock.Raise(c => c.DataReceived += null,
                                           new ChannelDataEventArgs(0, sshMessagePayload));
             });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
                                    .Returns(new SftpDataResponse(_protocolVersion));
         }
@@ -179,7 +179,7 @@ protected void Arrange()
             CreateMocks();
             SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpResponseFactoryMock.Object);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
index 75f1d2b8f..4c55d66f1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs
@@ -17,7 +17,7 @@ public class SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage
 
         private Mock<ISession> _sessionMock;
         private Mock<IChannelSession> _channelSessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private SftpSession _sftpSession;
         private int _operationTimeout;
         private Encoding _encoding;
@@ -94,7 +94,7 @@ private void CreateMocks()
         {
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
         }
 
         private void SetupMocks()
@@ -113,7 +113,7 @@ private void SetupMocks()
                     _channelSessionMock.Raise(c => c.DataReceived += null,
                                               new ChannelDataEventArgs(0, _sftpVersionResponse.GetBytes()));
                 });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(0U, (byte) SftpMessageTypes.Version, _encoding))
                                    .Returns(_sftpVersionResponse);
             _channelSessionMock.InSequence(sequence).Setup(p => p.IsOpen).Returns(true);
@@ -123,7 +123,7 @@ private void SetupMocks()
                     _channelSessionMock.Raise(c => c.DataReceived += null,
                                               new ChannelDataEventArgs(0, _sftpNameResponse.GetBytes()));
                 });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Name, _encoding))
                                    .Returns(_sftpNameResponse);
 
@@ -136,7 +136,7 @@ private void SetupMocks()
                     _channelSessionMock.Raise(c => c.DataReceived += null,
                                               new ChannelDataEventArgs(0, _sftpDataResponseBytes));
                 });
-            _sftpMessageFactoryMock.InSequence(sequence)
+            _sftpResponseFactoryMock.InSequence(sequence)
                                    .Setup(p => p.Create(_protocolVersion, (byte) SftpMessageTypes.Data, _encoding))
                                    .Returns(new SftpDataResponse(_protocolVersion));
         }
@@ -147,7 +147,7 @@ protected void Arrange()
             CreateMocks();
             SetupMocks();
 
-            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpMessageFactoryMock.Object);
+            _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _sftpResponseFactoryMock.Object);
             _sftpSession.Connect();
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
index 05f504f2b..ba7d080fb 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
@@ -10,7 +10,7 @@ public class SftpClientTest_Dispose_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -46,10 +46,10 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSftpMessageFactory())
-                               .Returns(_sftpMessageFactoryMock.Object);
+                               .Setup(p => p.CreateSftpResponseFactory())
+                               .Returns(_sftpResponseFactoryMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+                               .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object))
                                .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -67,14 +67,14 @@ protected void Act()
         [TestMethod]
         public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSftpResponseFactory(), Times.Once);
         }
 
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
index cdf8bef6e..516b8aebf 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
@@ -10,7 +10,7 @@ public class SftpClientTest_Dispose_Disconnected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
@@ -28,7 +28,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -42,10 +42,10 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSftpMessageFactory())
-                               .Returns(_sftpMessageFactoryMock.Object);
+                               .Setup(p => p.CreateSftpResponseFactory())
+                               .Returns(_sftpResponseFactoryMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object))
                 .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -64,14 +64,14 @@ protected void Act()
         [TestMethod]
         public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSftpResponseFactory(), Times.Once);
         }
 
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
index 227e78f59..73b07ad46 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
@@ -10,7 +10,7 @@ public class SftpClientTest_Dispose_Disposed
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
@@ -32,7 +32,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -46,10 +46,10 @@ protected void Arrange()
                 .Returns(_sessionMock.Object);
             _sessionMock.InSequence(sequence).Setup(p => p.Connect());
             _serviceFactoryMock.InSequence(sequence)
-                               .Setup(p => p.CreateSftpMessageFactory())
-                               .Returns(_sftpMessageFactoryMock.Object);
+                               .Setup(p => p.CreateSftpResponseFactory())
+                               .Returns(_sftpResponseFactoryMock.Object);
             _serviceFactoryMock.InSequence(sequence)
-                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+                .Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object))
                 .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
             _sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
@@ -68,14 +68,14 @@ protected void Act()
         [TestMethod]
         public void CreateSftpMessageFactoryOnServiceFactoryShouldBeInvokedOnce()
         {
-            _serviceFactoryMock.Verify(p => p.CreateSftpMessageFactory(), Times.Once);
+            _serviceFactoryMock.Verify(p => p.CreateSftpResponseFactory(), Times.Once);
         }
 
         [TestMethod]
         public void CreateSftpSessionOnServiceFactoryShouldBeInvokedOnce()
         {
             _serviceFactoryMock.Verify(
-                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object),
+                p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object),
                 Times.Once);
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
index 828de9e27..1c1328d75 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Finalize_Connected.cs
@@ -10,7 +10,7 @@ public class SftpClientTest_Finalize_Connected
     {
         private Mock<IServiceFactory> _serviceFactoryMock;
         private Mock<ISession> _sessionMock;
-        private Mock<ISftpResponseFactory> _sftpMessageFactoryMock;
+        private Mock<ISftpResponseFactory> _sftpResponseFactoryMock;
         private Mock<ISftpSession> _sftpSessionMock;
         private SftpClient _sftpClient;
         private ConnectionInfo _connectionInfo;
@@ -27,7 +27,7 @@ protected void Arrange()
         {
             _serviceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Loose);
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _sftpMessageFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
+            _sftpResponseFactoryMock = new Mock<ISftpResponseFactory>(MockBehavior.Strict);
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 
             _connectionInfo = new ConnectionInfo("host", "user", new NoneAuthenticationMethod("userauth"));
@@ -38,9 +38,9 @@ protected void Arrange()
             _serviceFactoryMock.Setup(p => p.CreateSession(_connectionInfo))
                 .Returns(_sessionMock.Object);
             _sessionMock.Setup(p => p.Connect());
-            _serviceFactoryMock.Setup(p => p.CreateSftpMessageFactory())
-                               .Returns(_sftpMessageFactoryMock.Object);
-            _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpMessageFactoryMock.Object))
+            _serviceFactoryMock.Setup(p => p.CreateSftpResponseFactory())
+                               .Returns(_sftpResponseFactoryMock.Object);
+            _serviceFactoryMock.Setup(p => p.CreateSftpSession(_sessionMock.Object, _operationTimeout, _connectionInfo.Encoding, _sftpResponseFactoryMock.Object))
                                .Returns(_sftpSessionMock.Object);
             _sftpSessionMock.Setup(p => p.Connect());
 
diff --git a/src/Renci.SshNet/IServiceFactory.cs b/src/Renci.SshNet/IServiceFactory.cs
index dafc09c57..34e41d939 100644
--- a/src/Renci.SshNet/IServiceFactory.cs
+++ b/src/Renci.SshNet/IServiceFactory.cs
@@ -61,6 +61,6 @@ internal partial interface IServiceFactory
 
         ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize);
 
-        ISftpResponseFactory CreateSftpMessageFactory();
+        ISftpResponseFactory CreateSftpResponseFactory();
     }
 }
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 28bca009e..69db33242 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -172,7 +172,7 @@
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceFactory.NET.cs" />
     <Compile Include="Sftp\ISftpFileReader.cs" />
-    <Compile Include="Sftp\ISftpMessageFactory.cs" />
+    <Compile Include="Sftp\ISftpResponseFactory.cs" />
     <Compile Include="Sftp\ISftpSession.cs" />
     <Compile Include="Common\SshDataStream.cs" />
     <Compile Include="ExpectAsyncResult.cs" />
@@ -429,7 +429,7 @@
     </Compile>
     <Compile Include="Sftp\SftpListDirectoryAsyncResult.cs" />
     <Compile Include="Sftp\SftpMessage.cs" />
-    <Compile Include="Sftp\SftpMessageFactory.cs" />
+    <Compile Include="Sftp\SftpResponseFactory.cs" />
     <Compile Include="Sftp\SftpMessageTypes.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs
index f9cd7fc66..eadfe6eac 100644
--- a/src/Renci.SshNet/ServiceFactory.cs
+++ b/src/Renci.SshNet/ServiceFactory.cs
@@ -132,7 +132,7 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
             return sftpSession.CreateFileReader(handle, sftpSession, chunkSize, maxPendingReads, fileSize);
         }
 
-        public ISftpResponseFactory CreateSftpMessageFactory()
+        public ISftpResponseFactory CreateSftpResponseFactory()
         {
             return new SftpResponseFactory();
         }
diff --git a/src/Renci.SshNet/Sftp/ISftpMessageFactory.cs b/src/Renci.SshNet/Sftp/ISftpResponseFactory.cs
similarity index 100%
rename from src/Renci.SshNet/Sftp/ISftpMessageFactory.cs
rename to src/Renci.SshNet/Sftp/ISftpResponseFactory.cs
diff --git a/src/Renci.SshNet/Sftp/SftpMessageFactory.cs b/src/Renci.SshNet/Sftp/SftpResponseFactory.cs
similarity index 99%
rename from src/Renci.SshNet/Sftp/SftpMessageFactory.cs
rename to src/Renci.SshNet/Sftp/SftpResponseFactory.cs
index 4fcbec1e6..ad6b22913 100644
--- a/src/Renci.SshNet/Sftp/SftpMessageFactory.cs
+++ b/src/Renci.SshNet/Sftp/SftpResponseFactory.cs
@@ -42,7 +42,5 @@ public SftpMessage Create(uint protocolVersion, byte messageType, Encoding encod
 
             return message;
         }
-
-        public 
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index 71846bdbd..283ff6179 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -15,7 +15,7 @@ internal class SftpSession : SubsystemSession, ISftpSession
         private const int MinimumSupportedVersion = 0;
 
         private readonly Dictionary<uint, SftpRequest> _requests = new Dictionary<uint, SftpRequest>();
-        private readonly ISftpResponseFactory _sftpMessageFactory;
+        private readonly ISftpResponseFactory _sftpResponseFactory;
         //FIXME: obtain from SftpClient!
         private readonly List<byte> _data = new List<byte>(32 * 1024);
         private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false);
@@ -55,11 +55,11 @@ public uint NextRequestId
             }
         }
 
-        public SftpSession(ISession session, int operationTimeout, Encoding encoding, ISftpResponseFactory sftpMessageFactory)
+        public SftpSession(ISession session, int operationTimeout, Encoding encoding, ISftpResponseFactory sftpResponseFactory)
             : base(session, "sftp", operationTimeout)
         {
             Encoding = encoding;
-            _sftpMessageFactory = sftpMessageFactory;
+            _sftpResponseFactory = sftpResponseFactory;
         }
 
         /// <summary>
@@ -291,7 +291,7 @@ protected override void OnDataReceived(byte[] data)
         private bool TryLoadSftpMessage(byte[] packetData, int offset, int count)
         {
             // Create SFTP message
-            var response = _sftpMessageFactory.Create(ProtocolVersion, packetData[offset], Encoding);
+            var response = _sftpResponseFactory.Create(ProtocolVersion, packetData[offset], Encoding);
             // Load message data into it
             response.Load(packetData, offset + 1, count - 1);
 
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 2de6cbfe0..5cfc6a8bb 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -2122,7 +2122,10 @@ protected override void OnConnected()
         {
             base.OnConnected();
 
-            _sftpSession = ServiceFactory.CreateSftpSession(Session, _operationTimeout, ConnectionInfo.Encoding, ServiceFactory.CreateSftpMessageFactory());
+            _sftpSession = ServiceFactory.CreateSftpSession(Session,
+                                                            _operationTimeout,
+                                                            ConnectionInfo.Encoding,
+                                                            ServiceFactory.CreateSftpResponseFactory());
             _sftpSession.Connect();
         }
 

From 36f94c26cc8b941d26dfaf2621bca0f589d4dc5d Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 6 Aug 2017 21:54:59 +0200
Subject: [PATCH 115/128] Move StatVfsResponse to tests.

---
 .../Sftp/SftpStatVfsResponseBuilder.cs        | 35 ++++++++++++++++++
 src/Renci.SshNet/Renci.SshNet.csproj          |  1 -
 .../Sftp/Responses/StatVfsResponse.cs         | 37 -------------------
 3 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100644 src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
index 2d6be526e..1331160b1 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpStatVfsResponseBuilder.cs
@@ -132,4 +132,39 @@ public StatVfsResponse Build()
             };
         }
     }
+
+    internal class StatVfsResponse : SftpExtendedReplyResponse
+    {
+        public SftpFileSytemInformation Information { get; set; }
+
+        public StatVfsResponse(uint protocolVersion)
+            : base(protocolVersion)
+        {
+        }
+
+        protected override void LoadData()
+        {
+            base.LoadData();
+
+            Information = new SftpFileSytemInformation(ReadUInt64(), // FileSystemBlockSize
+                                                        ReadUInt64(), // BlockSize
+                                                        ReadUInt64(), // TotalBlocks
+                                                        ReadUInt64(), // FreeBlocks
+                                                        ReadUInt64(), // AvailableBlocks
+                                                        ReadUInt64(), // TotalNodes
+                                                        ReadUInt64(), // FreeNodes
+                                                        ReadUInt64(), // AvailableNodes
+                                                        ReadUInt64(), // Sid
+                                                        ReadUInt64(), // Flags
+                                                        ReadUInt64()  // MaxNameLenght
+                                                        );
+        }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+
+            Information.SaveData(DataStream);
+        }
+    }
 }
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 69db33242..e21472545 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -417,7 +417,6 @@
     <Compile Include="Sftp\Responses\SftpResponse.cs" />
     <Compile Include="Sftp\Responses\SftpStatusResponse.cs" />
     <Compile Include="Sftp\Responses\SftpVersionResponse.cs" />
-    <Compile Include="Sftp\Responses\StatVfsResponse.cs" />
     <Compile Include="Sftp\SftpCloseAsyncResult.cs" />
     <Compile Include="Sftp\SftpDownloadAsyncResult.cs" />
     <Compile Include="Sftp\SftpFile.cs" />
diff --git a/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs b/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs
deleted file mode 100644
index e7b6c2edf..000000000
--- a/src/Renci.SshNet/Sftp/Responses/StatVfsResponse.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace Renci.SshNet.Sftp.Responses
-{
-    internal class StatVfsResponse : SftpExtendedReplyResponse
-    {
-        public SftpFileSytemInformation Information { get; set; }
-
-        public StatVfsResponse(uint protocolVersion)
-            : base(protocolVersion)
-        {
-        }
-
-        protected override void LoadData()
-        {
-            base.LoadData();
-
-            Information = new SftpFileSytemInformation(ReadUInt64(), // FileSystemBlockSize
-                                                       ReadUInt64(), // BlockSize
-                                                       ReadUInt64(), // TotalBlocks
-                                                       ReadUInt64(), // FreeBlocks
-                                                       ReadUInt64(), // AvailableBlocks
-                                                       ReadUInt64(), // TotalNodes
-                                                       ReadUInt64(), // FreeNodes
-                                                       ReadUInt64(), // AvailableNodes
-                                                       ReadUInt64(), // Sid
-                                                       ReadUInt64(), // Flags
-                                                       ReadUInt64()  // MaxNameLenght
-                                                       );
-        }
-
-        protected override void SaveData()
-        {
-            base.SaveData();
-
-            Information.SaveData(DataStream);
-        }
-    }
-}
\ No newline at end of file

From e30319a8488757747724379a070e35fdfc79b807 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gertdriesen@msn.com>
Date: Sun, 6 Aug 2017 22:06:02 +0200
Subject: [PATCH 116/128] Sync project files.

---
 .../Renci.SshNet.Silverlight.csproj           |  8 +++-
 .../Renci.SshNet.Silverlight5.csproj          |  8 +++-
 .../Renci.SshNet.Tests.NET35.csproj           | 38 ++++++++++++++++++-
 .../Renci.SshNet.UAP10.csproj                 |  9 +++--
 .../Renci.SshNet.WindowsPhone.csproj          |  6 +++
 .../Renci.SshNet.WindowsPhone8.csproj         |  8 +++-
 6 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index a4d20aa55..6d8cf1c5e 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -731,6 +731,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -887,6 +890,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -940,7 +946,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 062514725..d7ad59f41 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -740,6 +740,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -896,6 +899,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -946,7 +952,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 928789069..b4795ce33 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1016,6 +1016,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\Responses\SftpVersionResponseTest.cs">
       <Link>Classes\Sftp\Responses\SftpVersionResponseTest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpDataResponseBuilder.cs">
+      <Link>Classes\Sftp\SftpDataResponseBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpDownloadAsyncResultTest.cs">
       <Link>Classes\Sftp\SftpDownloadAsyncResultTest.cs</Link>
     </Compile>
@@ -1253,15 +1256,48 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileTest.cs">
       <Link>Classes\Sftp\SftpFileTest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpHandleResponseBuilder.cs">
+      <Link>Classes\Sftp\SftpHandleResponseBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpInitRequestBuilder.cs">
+      <Link>Classes\Sftp\SftpInitRequestBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpListDirectoryAsyncResultTest.cs">
       <Link>Classes\Sftp\SftpListDirectoryAsyncResultTest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpNameResponseBuilder.cs">
+      <Link>Classes\Sftp\SftpNameResponseBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpOpenRequestBuilder.cs">
+      <Link>Classes\Sftp\SftpOpenRequestBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpReadRequestBuilder.cs">
+      <Link>Classes\Sftp\SftpReadRequestBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpRealPathRequestBuilder.cs">
+      <Link>Classes\Sftp\SftpRealPathRequestBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSessionTest_Connected_RequestRead.cs">
       <Link>Classes\Sftp\SftpSessionTest_Connected_RequestRead.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSessionTest_Connected_RequestStatVfs.cs">
       <Link>Classes\Sftp\SftpSessionTest_Connected_RequestStatVfs.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs">
+      <Link>Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesInSingleSshDataMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs">
+      <Link>Classes\Sftp\SftpSessionTest_DataReceived_MultipleSftpMessagesSplitOverMultipleSshDataMessages.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs">
+      <Link>Classes\Sftp\SftpSessionTest_DataReceived_SingleSftpMessageInSshDataMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpStatVfsRequestBuilder.cs">
+      <Link>Classes\Sftp\SftpStatVfsRequestBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpStatVfsResponseBuilder.cs">
+      <Link>Classes\Sftp\SftpStatVfsResponseBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpSynchronizeDirectoriesAsyncResultTest.cs">
       <Link>Classes\Sftp\SftpSynchronizeDirectoriesAsyncResultTest.cs</Link>
     </Compile>
@@ -1475,7 +1511,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 8849e6ae3..78f7dde1c 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -807,6 +807,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -924,9 +927,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpCloseAsyncResult.cs">
       <Link>Sftp\SftpCloseAsyncResult.cs</Link>
     </Compile>
@@ -966,6 +966,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 944fc24bd..469de360d 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -719,6 +719,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -875,6 +878,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index b99bb0c5e..f8a730313 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -766,6 +766,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\ISftpFileReader.cs">
       <Link>Sftp\ISftpFileReader.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\ISftpResponseFactory.cs">
+      <Link>Sftp\ISftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\ISftpSession.cs">
       <Link>Sftp\ISftpSession.cs</Link>
     </Compile>
@@ -922,6 +925,9 @@
     <Compile Include="..\Renci.SshNet\Sftp\SftpRealPathAsyncResult.cs">
       <Link>Sftp\SftpRealPathAsyncResult.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\SftpResponseFactory.cs">
+      <Link>Sftp\SftpResponseFactory.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpSession.cs">
       <Link>Sftp\SftpSession.cs</Link>
     </Compile>
@@ -973,7 +979,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From b4841baa10b3935f5687336a4ffc703e1dd74a62 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 7 Aug 2017 21:11:15 +0200
Subject: [PATCH 117/128] Do not create a List.

---
 src/Renci.SshNet/Abstractions/ReflectionAbstraction.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Renci.SshNet/Abstractions/ReflectionAbstraction.cs b/src/Renci.SshNet/Abstractions/ReflectionAbstraction.cs
index b7a6fa374..3384eadc1 100644
--- a/src/Renci.SshNet/Abstractions/ReflectionAbstraction.cs
+++ b/src/Renci.SshNet/Abstractions/ReflectionAbstraction.cs
@@ -16,7 +16,7 @@ public static IEnumerable<T> GetCustomAttributes<T>(this Type type, bool inherit
             return type.GetTypeInfo().GetCustomAttributes<T>(inherit);
 #else
             var attributes = type.GetCustomAttributes(typeof(T), inherit);
-            return new List<T>(attributes.Cast<T>());
+            return attributes.Cast<T>();
 #endif
         }
     }

From ea36b240aaf8edc208687acf19f33e936c0d91fe Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 7 Aug 2017 21:12:28 +0200
Subject: [PATCH 118/128] Reduce allocations.

---
 src/Renci.SshNet/Messages/Message.cs | 40 +++++++++++++++++++---------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/Renci.SshNet/Messages/Message.cs b/src/Renci.SshNet/Messages/Message.cs
index 5946ebc3f..2bbfb7b9e 100644
--- a/src/Renci.SshNet/Messages/Message.cs
+++ b/src/Renci.SshNet/Messages/Message.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Linq;
 using Renci.SshNet.Common;
 using System.Globalization;
 using Renci.SshNet.Abstractions;
@@ -31,13 +30,22 @@ protected override int BufferCapacity
         /// </summary>
         protected override void WriteBytes(SshDataStream stream)
         {
-            var messageAttribute = GetType().GetCustomAttributes<MessageAttribute>(true).FirstOrDefault();
-
-            if (messageAttribute == null)
-                throw new SshException(string.Format(CultureInfo.CurrentCulture, "Type '{0}' is not a valid message type.", GetType().AssemblyQualifiedName));
+            var enumerator = GetType().GetCustomAttributes<MessageAttribute>(true).GetEnumerator();
+            try
+            {
+                if (!enumerator.MoveNext())
+                {
+                    throw new SshException(string.Format(CultureInfo.CurrentCulture, "Type '{0}' is not a valid message type.", GetType().AssemblyQualifiedName));
+                }
 
-            stream.WriteByte(messageAttribute.Number);
-            base.WriteBytes(stream);
+                var messageAttribute = enumerator.Current;
+                stream.WriteByte(messageAttribute.Number);
+                base.WriteBytes(stream);
+            }
+            finally
+            {
+                enumerator.Dispose();
+            }
         }
 
         internal byte[] GetPacket(byte paddingMultiplier, Compressor compressor)
@@ -155,12 +163,20 @@ private static byte GetPaddingLength(byte paddingMultiplier, long packetLength)
         /// </returns>
         public override string ToString()
         {
-            var messageAttribute = GetType().GetCustomAttributes<MessageAttribute>(true).SingleOrDefault();
-
-            if (messageAttribute == null)
-                return string.Format(CultureInfo.CurrentCulture, "'{0}' without Message attribute.", GetType().FullName);
+            var enumerator = GetType().GetCustomAttributes<MessageAttribute>(true).GetEnumerator();
+            try
+            {
+                if (!enumerator.MoveNext())
+                {
+                    return string.Format(CultureInfo.CurrentCulture, "'{0}' without Message attribute.", GetType().FullName);
+                }
 
-            return messageAttribute.Name;
+                return enumerator.Current.Name;
+            }
+            finally
+            {
+                enumerator.Dispose();
+            }
         }
 
         /// <summary>

From c2552e4e4bfa6b9d12032452e8a5c44aa6abb314 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 13 Aug 2017 10:54:40 +0200
Subject: [PATCH 119/128] SftpFileStream: Only allow Append mode when combined
 with write-only access. Fixes issue #267.

---
 ...Test_Ctor_FileModeAppend_FileAccessRead.cs |   2 +-
 ...Ctor_FileModeAppend_FileAccessReadWrite.cs | 143 ++----------------
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |   5 +
 3 files changed, 21 insertions(+), 129 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
index 4da49ac7d..09423c6bd 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessRead.cs
@@ -48,7 +48,7 @@ public void CtorShouldHaveThrownArgumentException()
         {
             Assert.IsNotNull(_actualException);
             Assert.IsNull(_actualException.InnerException);
-            Assert.AreEqual(string.Format("Combining {0}: {1} with {2}: {3} is invalid.", typeof(FileMode).Name, _fileMode, typeof(FileAccess).Name, _fileAccess), _actualException.Message);
+            Assert.AreEqual(string.Format("{0} mode can be requested only when combined with write-only access.", _fileMode), _actualException.Message);
             Assert.IsNull(_actualException.ParamName);
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
index 4af2e540a..8f31995ce 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite.cs
@@ -1,10 +1,7 @@
 using System;
 using System.IO;
-using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
 using Renci.SshNet.Sftp;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Sftp
 {
@@ -16,11 +13,7 @@ public class SftpFileStreamTest_Ctor_FileModeAppend_FileAccessReadWrite : SftpFi
         private FileMode _fileMode;
         private FileAccess _fileAccess;
         private int _bufferSize;
-        private uint _readBufferSize;
-        private uint _writeBufferSize;
-        private byte[] _handle;
-        private SftpFileStream _target;
-        private SftpFileAttributes _fileAttributes;
+        private ArgumentException _actualException;
 
         protected override void SetupData()
         {
@@ -31,138 +24,32 @@ protected override void SetupData()
             _fileMode = FileMode.Append;
             _fileAccess = FileAccess.ReadWrite;
             _bufferSize = _random.Next(5, 1000);
-            _readBufferSize = (uint) _random.Next(5, 1000);
-            _writeBufferSize = (uint) _random.Next(5, 1000);
-            _handle = GenerateRandom(_random.Next(1, 10), _random);
-            _fileAttributes = new SftpFileAttributesBuilder().WithLastAccessTime(DateTime.Now.AddSeconds(_random.Next()))
-                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(_random.Next()))
-                                                             .WithSize(_random.Next())
-                                                             .WithUserId(_random.Next())
-                                                             .WithGroupId(_random.Next())
-                                                             .WithPermissions((uint)_random.Next())
-                                                             .Build();
         }
 
         protected override void SetupMocks()
         {
-            SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false))
-                           .Returns(_handle);
-            SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalReadLength((uint)_bufferSize))
-                           .Returns(_readBufferSize);
-            SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.CalculateOptimalWriteLength((uint)_bufferSize, _handle))
-                           .Returns(_writeBufferSize);
-            SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestFStat(_handle, false))
-                           .Returns(_fileAttributes);
         }
 
         protected override void Act()
         {
-            _target = new SftpFileStream(SftpSessionMock.Object,
-                                         _path,
-                                         _fileMode,
-                                         _fileAccess,
-                                         _bufferSize);
+            try
+            {
+                new SftpFileStream(SftpSessionMock.Object, _path, _fileMode, _fileAccess, _bufferSize);
+                Assert.Fail();
+            }
+            catch (ArgumentException ex)
+            {
+                _actualException = ex;
+            }
         }
 
         [TestMethod]
-        public void CanReadShouldReturnTrue()
+        public void CtorShouldHaveThrownArgumentException()
         {
-            Assert.IsTrue(_target.CanRead);
-        }
-
-        [TestMethod]
-        public void CanSeekShouldReturnTrue()
-        {
-            Assert.IsTrue(_target.CanSeek);
-        }
-
-        [TestMethod]
-        public void CanWriteShouldReturnTrue()
-        {
-            Assert.IsTrue(_target.CanWrite);
-        }
-
-        [TestMethod]
-        public void CanTimeoutShouldReturnTrue()
-        {
-            Assert.IsTrue(_target.CanTimeout);
-        }
-
-        [TestMethod]
-        public void PositionShouldReturnSizeOfFile()
-        {
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
-
-            var actual = _target.Position;
-
-            Assert.AreEqual(_fileAttributes.Size, actual);
-
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
-        }
-
-        [TestMethod]
-        public void ReadShouldStartReadingAtEndOfFile()
-        {
-            var buffer = new byte[8];
-            var data = new byte[] {5, 4, 3, 2, 1};
-            var expected = new byte[] {0, 5, 4, 3, 2, 1, 0, 0};
-
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)_fileAttributes.Size, _readBufferSize)).Returns(data);
-
-            var actual = _target.Read(buffer, 1, data.Length);
-
-            Assert.AreEqual(data.Length, actual);
-            Assert.IsTrue(buffer.IsEqualTo(expected));
-
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
-            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_fileAttributes.Size, _readBufferSize), Times.Once);
-        }
-
-        [TestMethod]
-        public void ReadByteShouldStartReadingAtEndOfFile()
-        {
-            var data = GenerateRandom(5, _random);
-
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong) _fileAttributes.Size, _readBufferSize)).Returns(data);
-
-            var actual = _target.ReadByte();
-
-            Assert.AreEqual(data[0], actual);
-
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
-            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong) _fileAttributes.Size, _readBufferSize), Times.Once);
-        }
-
-        [TestMethod]
-        public void WriteShouldStartWritingAtEndOfFile()
-        {
-            var buffer = new byte[_writeBufferSize];
-
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
-            SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestWrite(_handle, (ulong) _fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null));
-
-            _target.Write(buffer, 0, buffer.Length);
-
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(1));
-            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (ulong) _fileAttributes.Size, buffer, 0, buffer.Length, It.IsNotNull<AutoResetEvent>(), null), Times.Once);
-        }
-
-        [TestMethod]
-        public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
-        {
-            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Read | Flags.Write | Flags.Append, false), Times.Once);
-        }
-
-        [TestMethod]
-        public void RequestFStatOnSftpSessionShouldBeInvokedOnce()
-        {
-            SftpSessionMock.Verify(p => p.RequestFStat(_handle, false), Times.Once);
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format("{0} mode can be requested only when combined with write-only access.", _fileMode), _actualException.Message);
+            Assert.IsNull(_actualException.ParamName);
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 500e1ba9c..bae457459 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -202,6 +202,11 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
                     throw new ArgumentOutOfRangeException("access");
             }
 
+            if ((access & FileAccess.Read) != 0 && mode == FileMode.Append)
+            {
+                throw new ArgumentException(string.Format("{0} mode can be requested only when combined with write-only access.", mode.ToString("G")));
+            }
+
             if ((access & FileAccess.Write) == 0)
             {
                 if (mode == FileMode.Create || mode == FileMode.CreateNew || mode == FileMode.Truncate || mode == FileMode.Append)

From f38c7ce3afc6fd47c998c5cb550d432a453a9731 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 13 Aug 2017 13:40:35 +0200
Subject: [PATCH 120/128] SftpFileStream: In Append mode, create the remote
 file if it does not already exist.

SftpFileStream: In Append mode, create the remote file if it does not
already exist.
Fixes issue #266.
---
 .../SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs | 4 ++--
 src/Renci.SshNet/Sftp/SftpFileStream.cs                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
index 0a581c4d2..d8c4904cc 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Ctor_FileModeAppend_FileAccessWrite.cs
@@ -46,7 +46,7 @@ protected override void SetupData()
         protected override void SetupMocks()
         {
             SftpSessionMock.InSequence(MockSequence)
-                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false))
+                           .Setup(p => p.RequestOpen(_path, Flags.Write | Flags.Append | Flags.CreateNewOrOpen, false))
                            .Returns(_handle);
             SftpSessionMock.InSequence(MockSequence)
                            .Setup(p => p.CalculateOptimalReadLength((uint) _bufferSize))
@@ -161,7 +161,7 @@ public void WriteShouldStartWritingAtEndOfFile()
         [TestMethod]
         public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         {
-            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Append, false), Times.Once);
+            SftpSessionMock.Verify(p => p.RequestOpen(_path, Flags.Write | Flags.Append | Flags.CreateNewOrOpen, false), Times.Once);
         }
 
         [TestMethod]
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index bae457459..16d3fe644 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -222,7 +222,7 @@ internal SftpFileStream(ISftpSession session, string path, FileMode mode, FileAc
             switch (mode)
             {
                 case FileMode.Append:
-                    flags |= Flags.Append;
+                    flags |= Flags.Append | Flags.CreateNewOrOpen;
                     break;
                 case FileMode.Create:
                     _handle = _session.RequestOpen(path, flags | Flags.Truncate, true);

From 48205c7f6d0f9be17576cf1f85e163c20e7a90b6 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 13 Aug 2017 15:05:44 +0200
Subject: [PATCH 121/128] Improve SetLength compatibility with FileStream: *
 Flush any buffers before epand or shrink the stream. * If the specified value
 is less than the current length of the stream, the current position is moved
 to the last byte of the stream.

---
 src/Renci.SshNet/Sftp/SftpFileStream.cs | 31 ++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 16d3fe644..02b20d2e6 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -602,13 +602,26 @@ public override long Seek(long offset, SeekOrigin origin)
         }
 
         /// <summary>
-        /// When overridden in a derived class, sets the length of the current stream.
+        /// Sets the length of the current stream.
         /// </summary>
         /// <param name="value">The desired length of the current stream in bytes.</param>
         /// <exception cref="IOException">An I/O error occurs.</exception>
-        /// <exception cref="NotSupportedException">The stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output.</exception>
+        /// <exception cref="NotSupportedException">The stream does not support both writing and seeking.</exception>
         /// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
         /// <exception cref="ArgumentOutOfRangeException"><paramref name="value"/> must be greater than zero.</exception>
+        /// <remarks>
+        /// <para>
+        /// Buffers are first flushed.
+        /// </para>
+        /// <para>
+        /// If the specified value is less than the current length of the stream, the stream is truncated and - if the
+        /// current position is greater than the new length - the current position is moved to the last byte of the stream.
+        /// </para>
+        /// <para>
+        /// If the given value is greater than the current length of the stream, the stream is expanded and the current
+        /// position remains the same.
+        /// </para>
+        /// </remarks>
         public override void SetLength(long value)
         {
             if (value < 0)
@@ -622,11 +635,23 @@ public override void SetLength(long value)
                 if (!CanSeek)
                     throw new NotSupportedException("Seek is not supported.");
 
-                SetupWrite();
+                if (_bufferOwnedByWrite)
+                {
+                    FlushWriteBuffer();
+                }
+                else
+                {
+                    SetupWrite();
+                }
 
                 var attributes = _session.RequestFStat(_handle, false);
                 attributes.Size = value;
                 _session.RequestFSetStat(_handle, attributes);
+
+                if (_position > value)
+                {
+                    _position = value;
+                }
             }
         }
 

From 7bc67f3aca140bda524a25a41b0326b996326811 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Sun, 13 Aug 2017 21:36:55 +0200
Subject: [PATCH 122/128] Harden tests.

---
 ...ionIsConnectedAndChannelIsOpen_EofNotReceived.cs | 13 ++++++++++---
 ...ndChannelIsOpen_EofNotReceived_SendEofInvoked.cs | 10 +++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived.cs b/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived.cs
index e671e780b..d002e20ad 100644
--- a/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived.cs
+++ b/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived.cs
@@ -21,6 +21,7 @@ public class ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceiv
         private uint _remotePacketSize;
         private ChannelStub _channel;
         private Stopwatch _closeTimer;
+        private ManualResetEvent _channelClosedWaitHandle;
         private List<ChannelEventArgs> _channelClosedRegister;
         private IList<ExceptionEventArgs> _channelExceptionRegister;
 
@@ -42,6 +43,7 @@ private void Arrange()
             _remotePacketSize = (uint)random.Next(0, int.MaxValue);
             _closeTimer = new Stopwatch();
             _channelClosedRegister = new List<ChannelEventArgs>();
+            _channelClosedWaitHandle = new ManualResetEvent(false);
             _channelExceptionRegister = new List<ExceptionEventArgs>();
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
@@ -61,8 +63,7 @@ private void Arrange()
                                 // SSH_MSG_CHANNEL_CLOSE message from server which is waited on after
                                 // sending the SSH_MSG_CHANNEL_CLOSE message to the server
                                 _sessionMock.Raise(s => s.ChannelCloseReceived += null,
-                                    new MessageEventArgs<ChannelCloseMessage>(
-                                        new ChannelCloseMessage(_localChannelNumber)));
+                                                   new MessageEventArgs<ChannelCloseMessage>(new ChannelCloseMessage(_localChannelNumber)));
                             }).Start();
                         _closeTimer.Start();
                         try
@@ -76,7 +77,11 @@ private void Arrange()
                     });
 
             _channel = new ChannelStub(_sessionMock.Object, _localChannelNumber, _localWindowSize, _localPacketSize);
-            _channel.Closed += (sender, args) => _channelClosedRegister.Add(args);
+            _channel.Closed += (sender, args) =>
+                {
+                    _channelClosedRegister.Add(args);
+                    _channelClosedWaitHandle.Set();
+                };
             _channel.Exception += (sender, args) => _channelExceptionRegister.Add(args);
             _channel.InitializeRemoteChannelInfo(_remoteChannelNumber, _remoteWindowSize, _remotePacketSize);
             _channel.SetIsOpen(true);
@@ -124,6 +129,8 @@ public void WaitOnHandleOnSessionShouldWaitForChannelCloseMessageToBeReceived()
         [TestMethod]
         public void ClosedEventShouldHaveFiredOnce()
         {
+            _channelClosedWaitHandle.WaitOne(100);
+
             Assert.AreEqual(1, _channelClosedRegister.Count);
             Assert.AreEqual(_localChannelNumber, _channelClosedRegister[0].ChannelNumber);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs b/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs
index 9cb4d9d85..373922086 100644
--- a/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs
+++ b/src/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs
@@ -21,6 +21,7 @@ public class ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceiv
         private uint _remotePacketSize;
         private ChannelStub _channel;
         private Stopwatch _closeTimer;
+        private ManualResetEvent _channelClosedWaitHandle;
         private List<ChannelEventArgs> _channelClosedRegister;
         private IList<ExceptionEventArgs> _channelExceptionRegister;
 
@@ -41,6 +42,7 @@ private void Arrange()
             _remoteWindowSize = (uint)random.Next(0, int.MaxValue);
             _remotePacketSize = (uint)random.Next(0, int.MaxValue);
             _closeTimer = new Stopwatch();
+            _channelClosedWaitHandle = new ManualResetEvent(false);
             _channelClosedRegister = new List<ChannelEventArgs>();
             _channelExceptionRegister = new List<ExceptionEventArgs>();
 
@@ -75,7 +77,11 @@ private void Arrange()
                 });
 
             _channel = new ChannelStub(_sessionMock.Object, _localChannelNumber, _localWindowSize, _localPacketSize);
-            _channel.Closed += (sender, args) => _channelClosedRegister.Add(args);
+            _channel.Closed += (sender, args) =>
+                {
+                    _channelClosedRegister.Add(args);
+                    _channelClosedWaitHandle.Set();
+                };
             _channel.Exception += (sender, args) => _channelExceptionRegister.Add(args);
             _channel.InitializeRemoteChannelInfo(_remoteChannelNumber, _remoteWindowSize, _remotePacketSize);
             _channel.SetIsOpen(true);
@@ -124,6 +130,8 @@ public void WaitOnHandleOnSessionShouldWaitForChannelCloseMessageToBeReceived()
         [TestMethod]
         public void ClosedEventShouldHaveFiredOnce()
         {
+            _channelClosedWaitHandle.WaitOne(100);
+
             Assert.AreEqual(1, _channelClosedRegister.Count);
             Assert.AreEqual(_localChannelNumber, _channelClosedRegister[0].ChannelNumber);
         }

From 9444f214619a3cc4bc3de7a48748a7e9d1ef44fc Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 14 Aug 2017 20:23:01 +0200
Subject: [PATCH 123/128] Added more tests for SftpFileStream.SetLength(long).

---
 .../Classes/Sftp/SftpFileStreamTestBase.cs    |  17 ++
 ...eadBuffer_NewLengthGreatherThanPosition.cs | 170 +++++++++++++++
 ...aInReadBuffer_NewLengthLessThanPosition.cs | 171 +++++++++++++++
 ...iteBuffer_NewLengthGreatherThanPosition.cs | 193 +++++++++++++++++
 ...InWriteBuffer_NewLengthLessThanPosition.cs | 194 ++++++++++++++++++
 .../Common/DictionaryAssert.cs                |  38 ++++
 src/Renci.SshNet.Tests/Common/Extensions.cs   |  33 +++
 .../Common/SftpFileAttributesBuilder.cs       |  11 +-
 .../Renci.SshNet.Tests.csproj                 |   5 +
 9 files changed, 828 insertions(+), 4 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
 create mode 100644 src/Renci.SshNet.Tests/Common/DictionaryAssert.cs

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
index a77222cfb..19497c6de 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTestBase.cs
@@ -38,11 +38,28 @@ public void SetUp()
 
         protected abstract void Act();
 
+        protected byte[] GenerateRandom(int length)
+        {
+            return GenerateRandom(length, new Random());
+        }
+
         protected byte[] GenerateRandom(int length, Random random)
         {
             var buffer = new byte[length];
             random.NextBytes(buffer);
             return buffer;
         }
+
+        protected byte[] GenerateRandom(uint length)
+        {
+            return GenerateRandom(length, new Random());
+        }
+
+        protected byte[] GenerateRandom(uint length, Random random)
+        {
+            var buffer = new byte[length];
+            random.NextBytes(buffer);
+            return buffer;
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
new file mode 100644
index 000000000..aafde5c27
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System.Threading;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    /// <summary>
+    /// - In read mode
+    /// - Bytes in (read) buffer
+    /// - New length greater than client position and greater than server position
+    /// </summary>
+    [TestClass]
+    public class SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private MockSequence _sequence;
+        private long _length;
+
+        private SftpFileAttributes _fileAttributes;
+        private SftpFileAttributes _originalFileAttributes;
+        private SftpFileAttributes _newFileAttributes;
+        private byte[] _readBytes;
+        private byte[] _actualReadBytes;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = GenerateRandom(random.Next(2, 6), random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(100, 1000);
+            _readBytes = new byte[5];
+            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
+            _length = _readBytes.Length + 2;
+
+            _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
+                                                             .WithExtension("V", "VValue")
+                                                             .WithGroupId(random.Next())
+                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithPermissions((uint)random.Next())
+                                                             .WithSize(_length + 100)
+                                                             .WithUserId(random.Next())
+                                                             .Build();
+            _originalFileAttributes = _fileAttributes.Clone();
+            _newFileAttributes = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            _sequence = new MockSequence();
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
+                           .Returns(_actualReadBytes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
+                           .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _newFileAttributes = attributes.Clone());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _sftpFileStream = new SftpFileStream(SftpSessionMock.Object, _path, FileMode.Open, FileAccess.ReadWrite, (int)_bufferSize);
+            _sftpFileStream.Read(_readBytes, 0, _readBytes.Length);
+        }
+
+        protected override void Act()
+        {
+            _sftpFileStream.SetLength(_length);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSamePositionAsBeforeSetLength()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_readBytes.Length, _sftpFileStream.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void RequestFSetStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFSetStat(_handle, _fileAttributes), Times.Once);
+        }
+
+        [TestMethod]
+        public void SizeOfSftpFileAttributesShouldBeModifiedToNewLengthBeforePassedToRequestFSetStat()
+        {
+            DictionaryAssert.AreEqual(_originalFileAttributes.Extensions, _newFileAttributes.Extensions);
+            Assert.AreEqual(_originalFileAttributes.GroupId, _newFileAttributes.GroupId);
+            Assert.AreEqual(_originalFileAttributes.LastAccessTime, _newFileAttributes.LastAccessTime);
+            Assert.AreEqual(_originalFileAttributes.LastWriteTime, _newFileAttributes.LastWriteTime);
+            Assert.AreEqual(_originalFileAttributes.Permissions, _newFileAttributes.Permissions);
+            Assert.AreEqual(_originalFileAttributes.UserId, _newFileAttributes.UserId);
+
+            Assert.AreEqual(_length, _newFileAttributes.Size);
+        }
+
+        [TestMethod]
+        public void ReadShouldReadStartFromSamePositionAsBeforeSetLength()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, (uint) _readBytes.Length, _readBufferSize))
+                           .Returns(new byte[] { 0x0f });
+
+            var byteRead = _sftpFileStream.ReadByte();
+
+            Assert.AreEqual(0x0f, byteRead);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint) _readBytes.Length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartFromSamePositionAsBeforeSetLength()
+        {
+            var bytesToWrite = GenerateRandom(5);
+
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
+                           {
+                               wait.Set();
+                           });
+
+            _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
+            _sftpFileStream.Flush();
+
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
new file mode 100644
index 000000000..ca2df8804
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System.Threading;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    /// <summary>
+    /// - In read mode
+    /// - Bytes in (read) buffer
+    /// - New length less than client position and greater than server position
+    /// </summary>
+    [TestClass]
+    public class SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private MockSequence _sequence;
+        private long _length;
+
+        private SftpFileAttributes _fileAttributes;
+        private SftpFileAttributes _originalFileAttributes;
+        private SftpFileAttributes _newFileAttributes;
+        private byte[] _readBytes;
+        private byte[] _actualReadBytes;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = GenerateRandom(random.Next(2, 6), random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = (uint)random.Next(1, 1000);
+            _writeBufferSize = (uint)random.Next(100, 1000);
+            _readBytes = new byte[5];
+            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
+            _length = _readBytes.Length - 2;
+
+            _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
+                                                             .WithExtension("V", "VValue")
+                                                             .WithGroupId(random.Next())
+                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithPermissions((uint)random.Next())
+                                                             .WithSize(_length + 100)
+                                                             .WithUserId(random.Next())
+                                                             .Build();
+            _originalFileAttributes = _fileAttributes.Clone();
+            _newFileAttributes = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            _sequence = new MockSequence();
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
+                           .Returns(_actualReadBytes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
+                           .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _newFileAttributes = attributes.Clone());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _sftpFileStream = new SftpFileStream(SftpSessionMock.Object, _path, FileMode.Open, FileAccess.ReadWrite, (int)_bufferSize);
+            _sftpFileStream.Read(_readBytes, 0, _readBytes.Length);
+        }
+
+        protected override void Act()
+        {
+            _sftpFileStream.SetLength(_length);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnLengthOfStream()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_length, _sftpFileStream.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void RequestFSetStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFSetStat(_handle, _fileAttributes), Times.Once);
+        }
+
+        [TestMethod]
+        public void SizeOfSftpFileAttributesShouldBeModifiedToNewLengthBeforePassedToRequestFSetStat()
+        {
+            DictionaryAssert.AreEqual(_originalFileAttributes.Extensions, _newFileAttributes.Extensions);
+            Assert.AreEqual(_originalFileAttributes.GroupId, _newFileAttributes.GroupId);
+            Assert.AreEqual(_originalFileAttributes.LastAccessTime, _newFileAttributes.LastAccessTime);
+            Assert.AreEqual(_originalFileAttributes.LastWriteTime, _newFileAttributes.LastWriteTime);
+            Assert.AreEqual(_originalFileAttributes.Permissions, _newFileAttributes.Permissions);
+            Assert.AreEqual(_originalFileAttributes.UserId, _newFileAttributes.UserId);
+
+            Assert.AreEqual(_length, _newFileAttributes.Size);
+        }
+
+        [TestMethod]
+        public void ReadShouldStartFromEndOfStream()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
+                           .Returns(Array<byte>.Empty);
+
+            var byteRead = _sftpFileStream.ReadByte();
+
+            Assert.AreEqual(-1, byteRead);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint) _length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartFromEndOfStream()
+        {
+            var bytesToWrite = GenerateRandom(5);
+
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
+                           {
+                               wait.Set();
+                           });
+
+            _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
+            _sftpFileStream.Flush();
+
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint)_length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
new file mode 100644
index 000000000..863bae290
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System.Threading;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    /// <summary>
+    /// - In write mode
+    /// - Bytes in (write) buffer
+    /// - New length greater than client position and greater than server position
+    /// </summary>
+    [TestClass]
+    public class SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreaterThanPosition : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private MockSequence _sequence;
+        private long _length;
+
+        private SftpFileAttributes _fileAttributes;
+        private SftpFileAttributes _originalFileAttributes;
+        private SftpFileAttributes _newFileAttributes;
+        private byte[] _readBytes;
+        private byte[] _actualReadBytes;
+        private byte[] _writeBytes;
+        private byte[] _actualWrittenBytes;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = GenerateRandom(random.Next(2, 6), random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(100, 1000);
+            _readBytes = new byte[5];
+            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
+            _writeBytes = new byte[] { 0x01, 0x02, 0x03, 0x04 };
+            _length = _readBytes.Length + _writeBytes.Length + 2;
+            _actualWrittenBytes = null;
+
+            _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
+                                                             .WithExtension("V", "VValue")
+                                                             .WithGroupId(random.Next())
+                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithPermissions((uint)random.Next())
+                                                             .WithSize(_length + 100)
+                                                             .WithUserId(random.Next())
+                                                             .Build();
+            _originalFileAttributes = _fileAttributes.Clone();
+            _newFileAttributes = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            _sequence = new MockSequence();
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
+                           .Returns(_actualReadBytes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, _writeBytes.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
+                               =>
+                           {
+                               _actualWrittenBytes = data.Take(0, _writeBytes.Length);
+                               wait.Set();
+                           });
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
+                           .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _newFileAttributes = attributes.Clone());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _sftpFileStream = new SftpFileStream(SftpSessionMock.Object, _path, FileMode.Open, FileAccess.ReadWrite, (int)_bufferSize);
+            _sftpFileStream.Read(_readBytes, 0, _readBytes.Length);
+            _sftpFileStream.Write(new byte[] { 0x01, 0x02, 0x03, 0x04 }, 0, 4);
+        }
+
+        protected override void Act()
+        {
+            _sftpFileStream.SetLength(_length);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSamePositionAsBeforeSetLength()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_readBytes.Length + _writeBytes.Length, _sftpFileStream.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+
+        [TestMethod]
+        public void RequestFSetStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFSetStat(_handle, _fileAttributes), Times.Once);
+        }
+
+        [TestMethod]
+        public void SizeOfSftpFileAttributesShouldBeModifiedToNewLengthBeforePassedToRequestFSetStat()
+        {
+            DictionaryAssert.AreEqual(_originalFileAttributes.Extensions, _newFileAttributes.Extensions);
+            Assert.AreEqual(_originalFileAttributes.GroupId, _newFileAttributes.GroupId);
+            Assert.AreEqual(_originalFileAttributes.LastAccessTime, _newFileAttributes.LastAccessTime);
+            Assert.AreEqual(_originalFileAttributes.LastWriteTime, _newFileAttributes.LastWriteTime);
+            Assert.AreEqual(_originalFileAttributes.Permissions, _newFileAttributes.Permissions);
+            Assert.AreEqual(_originalFileAttributes.UserId, _newFileAttributes.UserId);
+
+            Assert.AreEqual(_length, _newFileAttributes.Size);
+        }
+
+        [TestMethod]
+        public void WrittenBytesShouldByFlushedToServer()
+        {
+            Assert.IsNotNull(_actualWrittenBytes);
+            CollectionAssert.AreEqual(_writeBytes, _actualWrittenBytes);
+        }
+
+        [TestMethod]
+        public void ReadShouldReadStartFromSamePositionAsBeforeSetLength()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, (uint) (_readBytes.Length + _writeBytes.Length), _readBufferSize))
+                           .Returns(new byte[] { 0x0f });
+
+            var byteRead = _sftpFileStream.ReadByte();
+
+            Assert.AreEqual(0x0f, byteRead);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint) (_readBytes.Length + _writeBytes.Length), _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartFromSamePositionAsBeforeSetLength()
+        {
+            var bytesToWrite = GenerateRandom(5);
+
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint)(_readBytes.Length + _writeBytes.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
+                                {
+                                    wait.Set();
+                                });
+
+            _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
+            _sftpFileStream.Flush();
+
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) (_readBytes.Length + _writeBytes.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
new file mode 100644
index 000000000..434fc0ab2
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Globalization;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System.Threading;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    /// <summary>
+    /// - In write mode
+    /// - Bytes in (write) buffer
+    /// - New length less than client position and less than server position
+    /// </summary>
+    [TestClass]
+    public class SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition : SftpFileStreamTestBase
+    {
+        private string _path;
+        private SftpFileStream _sftpFileStream;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private MockSequence _sequence;
+        private long _length;
+
+        private SftpFileAttributes _fileAttributes;
+        private SftpFileAttributes _originalFileAttributes;
+        private SftpFileAttributes _newFileAttributes;
+        private byte[] _readBytes;
+        private byte[] _actualReadBytes;
+        private byte[] _writeBytes;
+        private byte[] _actualWrittenBytes;
+
+        protected override void SetupData()
+        {
+            var random = new Random();
+
+            _path = random.Next().ToString(CultureInfo.InvariantCulture);
+            _handle = GenerateRandom(random.Next(2, 6), random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(100, 1000);
+            _readBytes = new byte[5];
+            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
+            _writeBytes = new byte[] { 0x01, 0x02, 0x03, 0x04 };
+            _length = _readBytes.Length - 2;
+            _actualWrittenBytes = null;
+
+            _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
+                                                             .WithExtension("V", "VValue")
+                                                             .WithGroupId(random.Next())
+                                                             .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
+                                                             .WithPermissions((uint) random.Next())
+                                                             .WithSize(_length + 100)
+                                                             .WithUserId(random.Next())
+                                                             .Build();
+            _originalFileAttributes = _fileAttributes.Clone();
+            _newFileAttributes = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            _sequence = new MockSequence();
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, 0, _readBufferSize))
+                           .Returns(_actualReadBytes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, _writeBytes.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
+                               =>
+                                   {
+                                       _actualWrittenBytes = data.Take(0, _writeBytes.Length);
+                                       wait.Set();
+                                   });
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFStat(_handle, false))
+                           .Returns(_fileAttributes);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestFSetStat(_handle, _fileAttributes))
+                           .Callback<byte[], SftpFileAttributes>((bytes, attributes) => _newFileAttributes = attributes.Clone());
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _sftpFileStream = new SftpFileStream(SftpSessionMock.Object, _path, FileMode.Open, FileAccess.ReadWrite, (int) _bufferSize);
+            _sftpFileStream.Read(_readBytes, 0, _readBytes.Length);
+            _sftpFileStream.Write(new byte[] { 0x01, 0x02, 0x03, 0x04 }, 0, 4);
+        }
+
+        protected override void Act()
+        {
+            _sftpFileStream.SetLength(_length);
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnLengthOfStream()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+
+            Assert.AreEqual(_length, _sftpFileStream.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+
+        [TestMethod]
+        public void RequestFSetStatOnSftpSessionShouldBeInvokedOnce()
+        {
+            SftpSessionMock.Verify(p => p.RequestFSetStat(_handle, _fileAttributes), Times.Once);
+        }
+
+        [TestMethod]
+        public void SizeOfSftpFileAttributesShouldBeModifiedToNewLengthBeforePassedToRequestFSetStat()
+        {
+            DictionaryAssert.AreEqual(_originalFileAttributes.Extensions, _newFileAttributes.Extensions);
+            Assert.AreEqual(_originalFileAttributes.GroupId, _newFileAttributes.GroupId);
+            Assert.AreEqual(_originalFileAttributes.LastAccessTime, _newFileAttributes.LastAccessTime);
+            Assert.AreEqual(_originalFileAttributes.LastWriteTime, _newFileAttributes.LastWriteTime);
+            Assert.AreEqual(_originalFileAttributes.Permissions, _newFileAttributes.Permissions);
+            Assert.AreEqual(_originalFileAttributes.UserId, _newFileAttributes.UserId);
+
+            Assert.AreEqual(_length, _newFileAttributes.Size);
+        }
+
+        [TestMethod]
+        public void WrittenBytesShouldByFlushedToServer()
+        {
+            Assert.IsNotNull(_actualWrittenBytes);
+            CollectionAssert.AreEqual(_writeBytes, _actualWrittenBytes);
+        }
+
+        [TestMethod]
+        public void ReadShouldStartFromEndOfStream()
+        {
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
+                           .Returns(Array<byte>.Empty);
+
+            var byteRead = _sftpFileStream.ReadByte();
+
+            Assert.AreEqual(-1, byteRead);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint)_length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+
+        [TestMethod]
+        public void WriteShouldStartFromEndOfStream()
+        {
+            var bytesToWrite = GenerateRandom(5);
+
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
+                           {
+                               wait.Set();
+                           });
+
+            _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
+            _sftpFileStream.Flush();
+
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Common/DictionaryAssert.cs b/src/Renci.SshNet.Tests/Common/DictionaryAssert.cs
new file mode 100644
index 000000000..0df1c5049
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Common/DictionaryAssert.cs
@@ -0,0 +1,38 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+
+namespace Renci.SshNet.Tests.Common
+{
+    public static class DictionaryAssert
+    {
+        public static void AreEqual<TKey, TValue>(IDictionary<TKey, TValue> expected, IDictionary<TKey, TValue> actual)
+        {
+            if (ReferenceEquals(expected, actual))
+                return;
+
+            if (expected == null)
+                throw new AssertFailedException("Expected dictionary to be null, but was not null.");
+
+            if (actual == null)
+                throw new AssertFailedException("Expected dictionary not to be null, but was null.");
+
+            if (expected.Count != actual.Count)
+                throw new AssertFailedException(string.Format("Expected dictionary to contain {0} entries, but was {1}.",
+                                                              expected.Count, actual.Count));
+
+            foreach (var expectedEntry in expected)
+            {
+                TValue actualValue;
+                if (!actual.TryGetValue(expectedEntry.Key, out actualValue))
+                {
+                    throw new AssertFailedException(string.Format("Dictionary contains no entry with key '{0}'.", expectedEntry.Key));
+                }
+
+                if (!Equals(expectedEntry.Value, actualValue))
+                {
+                    throw new AssertFailedException(string.Format("Value for key '{0}' does not match.", expectedEntry.Key));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Common/Extensions.cs b/src/Renci.SshNet.Tests/Common/Extensions.cs
index 6bb1e45ea..911f34139 100644
--- a/src/Renci.SshNet.Tests/Common/Extensions.cs
+++ b/src/Renci.SshNet.Tests/Common/Extensions.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Renci.SshNet.Common;
 using System;
+using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet.Tests.Common
 {
@@ -24,5 +25,37 @@ public static byte[] Copy(this byte[] buffer)
             Buffer.BlockCopy(buffer, 0, copy, 0, buffer.Length);
             return copy;
         }
+
+        /// <summary>
+        /// Creates a deep clone of the current instance.
+        /// </summary>
+        /// <returns>
+        /// A deep clone of the current instance.
+        /// </returns>
+        internal static SftpFileAttributes Clone(this SftpFileAttributes value)
+        {
+            Dictionary<string, string> clonedExtensions;
+
+            if (value.Extensions != null)
+            {
+                clonedExtensions = new Dictionary<string, string>(value.Extensions.Count);
+                foreach (var entry in value.Extensions)
+                {
+                    clonedExtensions.Add(entry.Key, entry.Value);
+                }
+            }
+            else
+            {
+                clonedExtensions = null;
+            }
+
+            return new SftpFileAttributes(value.LastAccessTime,
+                                          value.LastWriteTime,
+                                          value.Size,
+                                          value.UserId,
+                                          value.GroupId,
+                                          value.Permissions,
+                                          clonedExtensions);
+        }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
index 9003fc3d7..2468c8271 100644
--- a/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
+++ b/src/Renci.SshNet.Tests/Common/SftpFileAttributesBuilder.cs
@@ -14,6 +14,11 @@ public class SftpFileAttributesBuilder
         private uint? _permissions;
         private IDictionary<string, string> _extensions;
 
+        public SftpFileAttributesBuilder()
+        {
+            _extensions = new Dictionary<string, string>();
+        }
+
         public SftpFileAttributesBuilder WithLastAccessTime(DateTime lastAccessTime)
         {
             _lastAccessTime = lastAccessTime;
@@ -50,9 +55,9 @@ public SftpFileAttributesBuilder WithPermissions(uint permissions)
             return this;
         }
 
-        public SftpFileAttributesBuilder WithExtensions(IDictionary<string, string> extensions)
+        public SftpFileAttributesBuilder WithExtension(string name, string value)
         {
-            _extensions = extensions;
+            _extensions.Add(name, value);
             return this;
         }
 
@@ -79,7 +84,5 @@ public SftpFileAttributes Build()
                                           _permissions.Value,
                                           _extensions);
         }
-
-
     }
 }
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 9fc8daefe..5076c4b47 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -444,6 +444,10 @@
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_NoBuffering.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Seek_PositionedAtMiddleOfStream_OriginBeginAndOffsetZero_ReadBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionNotOpen.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs" />
@@ -513,6 +517,7 @@
     <Compile Include="Classes\SubsystemSession_SendData_Disposed.cs" />
     <Compile Include="Classes\SubsystemSession_SendData_NeverConnected.cs" />
     <Compile Include="Common\AsyncSocketListener.cs" />
+    <Compile Include="Common\DictionaryAssert.cs" />
     <Compile Include="Common\Extensions.cs" />
     <Compile Include="Common\HttpProxyStub.cs" />
     <Compile Include="Common\HttpRequest.cs" />

From 30054463e1313de07c263ae8f831f1d66773a99d Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Mon, 14 Aug 2017 20:35:21 +0200
Subject: [PATCH 124/128] Sync project file.

---
 .../Renci.SshNet.Tests.NET35.csproj            | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index b4795ce33..29add3501 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -1232,6 +1233,18 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_SetLength_Closed.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_SetLength_Disposed.cs</Link>
     </Compile>
@@ -1424,6 +1437,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Common\AsyncSocketListener.cs">
       <Link>Common\AsyncSocketListener.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Common\DictionaryAssert.cs">
+      <Link>Common\DictionaryAssert.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Common\Extensions.cs">
       <Link>Common\Extensions.cs</Link>
     </Compile>
@@ -1511,7 +1527,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 79c9a4baeadf82abf1d1b64639c88c9464bf9a2a Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 16 Aug 2017 08:56:33 +0200
Subject: [PATCH 125/128] SftpFileStream: Position in stream should be left
 untouched when clearing read buffer.

---
 .../Renci.SshNet.Tests.NET35.csproj           |  23 ++-
 ...ReadMode_DataInBuffer_NotReadFromBuffer.cs | 112 +++++++++++++
 ...sh_ReadMode_DataInBuffer_ReadFromBuffer.cs | 118 ++++++++++++++
 ...treamTest_Flush_ReadMode_NoDataInBuffer.cs | 112 +++++++++++++
 ...SftpFileStreamTest_Flush_SessionNotOpen.cs |  81 ++++++++++
 ...StreamTest_Flush_WriteMode_DataInBuffer.cs | 149 ++++++++++++++++++
 ...reamTest_Flush_WriteMode_NoDataInBuffer.cs | 117 ++++++++++++++
 ...eadBuffer_NewLengthGreatherThanPosition.cs |  43 +++--
 ...aInReadBuffer_NewLengthLessThanPosition.cs |  17 +-
 ...iteBuffer_NewLengthGreatherThanPosition.cs |  13 +-
 ...InWriteBuffer_NewLengthLessThanPosition.cs |  13 +-
 src/Renci.SshNet.Tests/Common/ArrayBuilder.cs |  31 ++++
 .../Renci.SshNet.Tests.csproj                 |   7 +
 src/Renci.SshNet/Sftp/SftpFileStream.cs       |  11 +-
 14 files changed, 803 insertions(+), 44 deletions(-)
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_SessionNotOpen.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs
 create mode 100644 src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs
 create mode 100644 src/Renci.SshNet.Tests/Common/ArrayBuilder.cs

diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 29add3501..6c40d33de 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -1200,6 +1200,24 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_SessionNotOpen.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_SessionNotOpen.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs">
+      <Link>Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs">
       <Link>Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs</Link>
     </Compile>
@@ -1434,6 +1452,9 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\SubsystemSession_SendData_NeverConnected.cs">
       <Link>Classes\SubsystemSession_SendData_NeverConnected.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Common\ArrayBuilder.cs">
+      <Link>Common\ArrayBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Common\AsyncSocketListener.cs">
       <Link>Common\AsyncSocketListener.cs</Link>
     </Compile>
@@ -1527,7 +1548,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs
new file mode 100644
index 000000000..f743eb6fc
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs
@@ -0,0 +1,112 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.IO;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _readBytes;
+        private byte[] _serverBytes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = 100;
+            _writeBufferSize = 500;
+            _readBytes = new byte[random.Next(1, (int) _readBufferSize - 10)];
+            _serverBytes = GenerateRandom(_readBytes.Length + 5); // store 5 bytes in read buffer
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverBytes);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
+            _target.Read(_readBytes, 0, _readBytes.Length);
+        }
+
+        protected override void Act()
+        {
+            _target.Flush();
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSameValueAsBeforeFlush()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(_readBytes.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            var serverBytes2 = GenerateRandom(5);
+            var readBytes2 = new byte[5];
+            var expectedReadBytes = new ArrayBuilder<byte>().Add(new byte[2])
+                                                            .Add(serverBytes2.Take(0, 3))
+                                                            .Build();
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, (ulong)_readBytes.Length, _readBufferSize))
+                           .Returns(serverBytes2);
+
+            var bytesRead = _target.Read(readBytes2, 2, 3);
+
+            Assert.AreEqual(3, bytesRead);
+            CollectionAssert.AreEqual(expectedReadBytes, readBytes2);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_readBytes.Length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs
new file mode 100644
index 000000000..cd4c223fb
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs
@@ -0,0 +1,118 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.IO;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _readBytes1;
+        private byte[] _readBytes2;
+        private byte[] _serverBytes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = 100;
+            _writeBufferSize = 500;
+            _readBytes1 = new byte[random.Next(1, (int) _readBufferSize - 10)];
+            _readBytes2 = new byte[random.Next(1, 3)];
+            _serverBytes = GenerateRandom(_readBytes1.Length + 10); // store 5 bytes in read buffer
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverBytes);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int)_bufferSize);
+            _target.Read(_readBytes1, 0, _readBytes1.Length);
+            _target.Read(_readBytes2, 0, _readBytes2.Length);
+        }
+
+        protected override void Act()
+        {
+            _target.Flush();
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSameValueAsBeforeFlush()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(_readBytes1.Length + _readBytes2.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            var serverBytes3 = GenerateRandom(5);
+            var readBytes3 = new byte[3];
+            var expectedReadBytes = new ArrayBuilder<byte>().Add(new byte[1])
+                                                            .Add(serverBytes3.Take(0, 2))
+                                                            .Build();
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, (ulong) (_readBytes1.Length + _readBytes2.Length), _readBufferSize))
+                           .Returns(serverBytes3);
+
+            var bytesRead = _target.Read(readBytes3, 1, 2);
+
+            Assert.AreEqual(2, bytesRead);
+            CollectionAssert.AreEqual(expectedReadBytes, readBytes3);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)(_readBytes1.Length + _readBytes2.Length), _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs
new file mode 100644
index 000000000..4e5dea478
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs
@@ -0,0 +1,112 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.IO;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _readBytes;
+        private byte[] _serverBytes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = 100;
+            _writeBufferSize = 500;
+            _readBytes = new byte[random.Next(1, (int) _readBufferSize)];
+            _serverBytes = GenerateRandom(_readBytes.Length);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, 0UL, _readBufferSize))
+                           .Returns(_serverBytes);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+            _target.Read(_readBytes, 0, _readBytes.Length);
+        }
+
+        protected override void Act()
+        {
+            _target.Flush();
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSameValueAsBeforeFlush()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(_readBytes.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            var serverBytes2 = GenerateRandom(5);
+            var readBytes2 = new byte[5];
+            var expectedReadBytes = new ArrayBuilder<byte>().Add(new byte[2])
+                                                            .Add(serverBytes2.Take(0, 3))
+                                                            .Build();
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, (ulong) _readBytes.Length, _readBufferSize))
+                           .Returns(serverBytes2);
+
+            var bytesRead = _target.Read(readBytes2, 2, 3);
+
+            Assert.AreEqual(3, bytesRead);
+            CollectionAssert.AreEqual(expectedReadBytes, readBytes2);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)_readBytes.Length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_SessionNotOpen.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_SessionNotOpen.cs
new file mode 100644
index 000000000..6aea777a7
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_SessionNotOpen.cs
@@ -0,0 +1,81 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using System;
+using System.IO;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_SessionNotOpen : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private ObjectDisposedException _actualException;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = 20;
+            _writeBufferSize = 500;
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(false);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.Read,
+                                         (int) _bufferSize);
+        }
+
+        protected override void Act()
+        {
+            try
+            {
+                _target.Flush();
+                Assert.Fail();
+            }
+            catch (ObjectDisposedException ex)
+            {
+                _actualException = ex;
+            }
+        }
+
+        [TestMethod]
+        public void FlushShouldHaveThrownObjectDisposedException()
+        {
+            Assert.IsNotNull(_actualException);
+            Assert.IsNull(_actualException.InnerException);
+            Assert.AreEqual(string.Format("Cannot access a closed SFTP session.{0}Object name: '{1}'.", Environment.NewLine, _actualException.ObjectName), _actualException.Message);
+            Assert.AreEqual(typeof(SftpFileStream).FullName, _actualException.ObjectName);
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs
new file mode 100644
index 000000000..3c9011338
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs
@@ -0,0 +1,149 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.IO;
+using System.Threading;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_WriteMode_DataInBuffer : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _writeBytes1;
+        private byte[] _writeBytes2;
+        private byte[] _writeBytes3;
+        private byte[] _flushedBytes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = 100;
+            _writeBufferSize = 500;
+            _writeBytes1 = GenerateRandom(_writeBufferSize);
+            _writeBytes2 = GenerateRandom(2);
+            _writeBytes3 = GenerateRandom(3);
+            _flushedBytes = null;
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, 0UL, It.IsAny<byte[]>(), 0, _writeBytes1.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
+                               =>
+                           {
+                               wait.Set();
+                           });
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, (ulong) _writeBytes1.Length, It.IsAny<byte[]>(), 0, _writeBytes2.Length + _writeBytes3.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
+                               =>
+                           {
+                               _flushedBytes = data.Take(offset, length);
+                               wait.Set();
+                           });
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int)_bufferSize);
+            _target.Write(_writeBytes1, 0, _writeBytes1.Length);
+            _target.Write(_writeBytes2, 0, _writeBytes2.Length);
+            _target.Write(_writeBytes3, 0, _writeBytes3.Length);
+        }
+
+        protected override void Act()
+        {
+            _target.Flush();
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSameValueAsBeforeFlush()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(_writeBytes1.Length + _writeBytes2.Length + _writeBytes3.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+        }
+
+        [TestMethod]
+        public void BufferedBytesShouldHaveBeenWrittenToTheServer()
+        {
+            var expected = new ArrayBuilder<byte>().Add(_writeBytes2)
+                                                   .Add(_writeBytes3)
+                                                   .Build();
+
+            Assert.IsNotNull(_flushedBytes);
+            CollectionAssert.AreEqual(expected, _flushedBytes);
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            var serverBytes = GenerateRandom(5);
+            var readBytes = new byte[5];
+            var expectedReadBytes = new ArrayBuilder<byte>().Add(new byte[2])
+                                                            .Add(serverBytes.Take(0, 3))
+                                                            .Build();
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, (ulong) (_writeBytes1.Length + _writeBytes2.Length + _writeBytes3.Length), _readBufferSize))
+                           .Returns(serverBytes);
+
+            var bytesRead = _target.Read(readBytes, 2, 3);
+
+            Assert.AreEqual(3, bytesRead);
+            CollectionAssert.AreEqual(expectedReadBytes, readBytes);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong)(_writeBytes1.Length + _writeBytes2.Length + _writeBytes3.Length), _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs
new file mode 100644
index 000000000..895d444ee
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs
@@ -0,0 +1,117 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Renci.SshNet.Sftp;
+using Renci.SshNet.Sftp.Responses;
+using Renci.SshNet.Tests.Common;
+using System;
+using System.IO;
+using System.Threading;
+
+namespace Renci.SshNet.Tests.Classes.Sftp
+{
+    [TestClass]
+    public class SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer : SftpFileStreamTestBase
+    {
+        private SftpFileStream _target;
+        private string _path;
+        private byte[] _handle;
+        private uint _bufferSize;
+        private uint _readBufferSize;
+        private uint _writeBufferSize;
+        private byte[] _writeBytes;
+        private byte[] _requestWriteBytes;
+
+        protected override void SetupData()
+        {
+            base.SetupData();
+
+            var random = new Random();
+            _path = random.Next().ToString();
+            _handle = GenerateRandom(5, random);
+            _bufferSize = (uint)random.Next(1, 1000);
+            _readBufferSize = 100;
+            _writeBufferSize = 500;
+            _writeBytes = GenerateRandom(_writeBufferSize);
+        }
+
+        protected override void SetupMocks()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestOpen(_path, Flags.Read | Flags.Write, false))
+                           .Returns(_handle);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalReadLength(_bufferSize))
+                           .Returns(_readBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.CalculateOptimalWriteLength(_bufferSize, _handle))
+                           .Returns(_writeBufferSize);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestWrite(_handle, 0UL, It.IsAny<byte[]>(), 0, _writeBytes.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
+                               =>
+                           {
+                               wait.Set();
+                           });
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+        }
+
+        protected override void Arrange()
+        {
+            base.Arrange();
+
+            _target = new SftpFileStream(SftpSessionMock.Object,
+                                         _path,
+                                         FileMode.Open,
+                                         FileAccess.ReadWrite,
+                                         (int) _bufferSize);
+            _target.Write(_writeBytes, 0, _writeBytes.Length);
+        }
+
+        protected override void Act()
+        {
+            _target.Flush();
+        }
+
+        [TestMethod]
+        public void PositionShouldReturnSameValueAsBeforeFlush()
+        {
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+
+            Assert.AreEqual(_writeBytes.Length, _target.Position);
+
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+
+        [TestMethod]
+        public void ReadShouldReadFromServer()
+        {
+            var serverBytes = GenerateRandom(5);
+            var readBytes = new byte[5];
+            var expectedReadBytes = new ArrayBuilder<byte>().Add(new byte[2])
+                                                            .Add(serverBytes.Take(0, 3))
+                                                            .Build();
+
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
+            SftpSessionMock.InSequence(MockSequence)
+                           .Setup(p => p.RequestRead(_handle, (ulong) _writeBytes.Length, _readBufferSize))
+                           .Returns(serverBytes);
+
+            var bytesRead = _target.Read(readBytes, 2, 3);
+
+            Assert.AreEqual(3, bytesRead);
+            CollectionAssert.AreEqual(expectedReadBytes, readBytes);
+
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (ulong) _writeBytes.Length, _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
index aafde5c27..3975fcf93 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThanPosition.cs
@@ -12,7 +12,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp
 {
     /// <summary>
     /// - In read mode
-    /// - Bytes in (read) buffer
+    /// - Bytes read from (read) buffer
     /// - New length greater than client position and greater than server position
     /// </summary>
     [TestClass]
@@ -30,7 +30,8 @@ public class SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthGreatherThan
         private SftpFileAttributes _fileAttributes;
         private SftpFileAttributes _originalFileAttributes;
         private SftpFileAttributes _newFileAttributes;
-        private byte[] _readBytes;
+        private byte[] _readBytes1;
+        private byte[] _readBytes2;
         private byte[] _actualReadBytes;
 
         protected override void SetupData()
@@ -42,16 +43,17 @@ protected override void SetupData()
             _bufferSize = (uint) random.Next(1, 1000);
             _readBufferSize = (uint) random.Next(1, 1000);
             _writeBufferSize = (uint) random.Next(100, 1000);
-            _readBytes = new byte[5];
-            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
-            _length = _readBytes.Length + 2;
+            _readBytes1 = new byte[5];
+            _readBytes2 = new byte[random.Next(1, 3)];
+            _actualReadBytes = GenerateRandom(_readBytes1.Length + _readBytes2.Length + 2, random); // server returns more bytes than the caller requested
+            _length = _readBytes1.Length + _readBytes2.Length + 5;
 
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
                                                              .WithExtension("V", "VValue")
                                                              .WithGroupId(random.Next())
                                                              .WithLastAccessTime(DateTime.Now.AddSeconds(random.Next()))
                                                              .WithLastWriteTime(DateTime.Now.AddSeconds(random.Next()))
-                                                             .WithPermissions((uint)random.Next())
+                                                             .WithPermissions((uint) random.Next())
                                                              .WithSize(_length + 100)
                                                              .WithUserId(random.Next())
                                                              .Build();
@@ -80,6 +82,9 @@ protected override void SetupMocks()
             SftpSessionMock.InSequence(_sequence)
                            .Setup(p => p.IsOpen)
                            .Returns(true);
+            SftpSessionMock.InSequence(_sequence)
+                           .Setup(p => p.IsOpen)
+                           .Returns(true);
             SftpSessionMock.InSequence(_sequence)
                            .Setup(p => p.RequestFStat(_handle, false))
                            .Returns(_fileAttributes);
@@ -93,7 +98,8 @@ protected override void Arrange()
             base.Arrange();
 
             _sftpFileStream = new SftpFileStream(SftpSessionMock.Object, _path, FileMode.Open, FileAccess.ReadWrite, (int)_bufferSize);
-            _sftpFileStream.Read(_readBytes, 0, _readBytes.Length);
+            _sftpFileStream.Read(_readBytes1, 0, _readBytes1.Length);
+            _sftpFileStream.Read(_readBytes2, 0, _readBytes2.Length); // this will return bytes from the buffer
         }
 
         protected override void Act()
@@ -106,9 +112,9 @@ public void PositionShouldReturnSamePositionAsBeforeSetLength()
         {
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
 
-            Assert.AreEqual(_readBytes.Length, _sftpFileStream.Position);
+            Assert.AreEqual(_readBytes1.Length + _readBytes2.Length, _sftpFileStream.Position);
 
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
 
         [TestMethod]
@@ -135,35 +141,38 @@ public void ReadShouldReadStartFromSamePositionAsBeforeSetLength()
         {
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence)
-                           .Setup(p => p.RequestRead(_handle, (uint) _readBytes.Length, _readBufferSize))
+                           .Setup(p => p.RequestRead(_handle, (uint) (_readBytes1.Length + _readBytes2.Length), _readBufferSize))
                            .Returns(new byte[] { 0x0f });
 
             var byteRead = _sftpFileStream.ReadByte();
 
             Assert.AreEqual(0x0f, byteRead);
 
-            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint) _readBytes.Length, _readBufferSize), Times.Once);
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
+            SftpSessionMock.Verify(p => p.RequestRead(_handle, (uint)(_readBytes1.Length + _readBytes2.Length), _readBufferSize), Times.Once);
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
 
         [TestMethod]
         public void WriteShouldStartFromSamePositionAsBeforeSetLength()
         {
-            var bytesToWrite = GenerateRandom(5);
+            var bytesToWrite = GenerateRandom(_writeBufferSize);
+            byte[] bytesWritten = null;
 
-            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence)
-                           .Setup(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Setup(p => p.RequestWrite(_handle, (uint) (_readBytes1.Length + _readBytes2.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
                            {
+                               bytesWritten = data.Take(offset, length);
                                wait.Set();
                            });
 
             _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
-            _sftpFileStream.Flush();
 
-            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) _readBytes.Length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
+            Assert.IsNotNull(bytesWritten);
+            CollectionAssert.AreEqual(bytesToWrite, bytesWritten);
+
+            SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint)(_readBytes1.Length + _readBytes2.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
             SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
index ca2df8804..ae3952cc6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs
@@ -13,8 +13,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
 {
     /// <summary>
     /// - In read mode
-    /// - Bytes in (read) buffer
-    /// - New length less than client position and greater than server position
+    /// - Bytes in (read) buffer, but not read from
+    /// - New length less than client position and less than server position
     /// </summary>
     [TestClass]
     public class SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition : SftpFileStreamTestBase
@@ -44,7 +44,7 @@ protected override void SetupData()
             _readBufferSize = (uint)random.Next(1, 1000);
             _writeBufferSize = (uint)random.Next(100, 1000);
             _readBytes = new byte[5];
-            _actualReadBytes = GenerateRandom(_readBytes.Length, random);
+            _actualReadBytes = GenerateRandom(_readBytes.Length + 2, random); // add 2 bytes in read buffer
             _length = _readBytes.Length - 2;
 
             _fileAttributes = new SftpFileAttributesBuilder().WithExtension("X", "ABC")
@@ -150,22 +150,25 @@ public void ReadShouldStartFromEndOfStream()
         [TestMethod]
         public void WriteShouldStartFromEndOfStream()
         {
-            var bytesToWrite = GenerateRandom(5);
+            var bytesToWrite = GenerateRandom(_writeBufferSize);
+            byte[] bytesWritten = null;
 
-            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence)
                            .Setup(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
                            {
+                               bytesWritten = data.Take(offset, length);
                                wait.Set();
                            });
 
             _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
-            _sftpFileStream.Flush();
+
+            Assert.IsNotNull(bytesWritten);
+            CollectionAssert.AreEqual(bytesToWrite, bytesWritten);
 
             SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint)_length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(3));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
index 863bae290..ed5bef9c6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthGreatherThanPosition.cs
@@ -172,22 +172,25 @@ public void ReadShouldReadStartFromSamePositionAsBeforeSetLength()
         [TestMethod]
         public void WriteShouldStartFromSamePositionAsBeforeSetLength()
         {
-            var bytesToWrite = GenerateRandom(5);
+            var bytesToWrite = GenerateRandom(_writeBufferSize);
+            byte[] bytesWritten = null;
 
-            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence)
-                           .Setup(p => p.RequestWrite(_handle, (uint)(_readBytes.Length + _writeBytes.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
+                           .Setup(p => p.RequestWrite(_handle, (uint) (_readBytes.Length + _writeBytes.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
                                 {
+                                    bytesWritten = data.Take(offset, length);
                                     wait.Set();
                                 });
 
             _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
-            _sftpFileStream.Flush();
+
+            Assert.IsNotNull(bytesWritten);
+            CollectionAssert.AreEqual(bytesToWrite, bytesWritten);
 
             SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) (_readBytes.Length + _writeBytes.Length), It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
index 434fc0ab2..cfcf23155 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs
@@ -93,7 +93,7 @@ protected override void SetupMocks()
                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted)
                                =>
                                    {
-                                       _actualWrittenBytes = data.Take(0, _writeBytes.Length);
+                                       _actualWrittenBytes = data.Take(offset, length);
                                        wait.Set();
                                    });
             SftpSessionMock.InSequence(_sequence)
@@ -173,22 +173,25 @@ public void ReadShouldStartFromEndOfStream()
         [TestMethod]
         public void WriteShouldStartFromEndOfStream()
         {
-            var bytesToWrite = GenerateRandom(5);
+            var bytesToWrite = GenerateRandom(_writeBufferSize);
+            byte[] bytesWritten = null;
 
-            SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
             SftpSessionMock.InSequence(_sequence)
                            .Setup(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null))
                            .Callback<byte[], ulong, byte[], int, int, AutoResetEvent, Action<SftpStatusResponse>>((handle, serverOffset, data, offset, length, wait, writeCompleted) =>
                            {
+                               bytesWritten = data.Take(offset, length);
                                wait.Set();
                            });
 
             _sftpFileStream.Write(bytesToWrite, 0, bytesToWrite.Length);
-            _sftpFileStream.Flush();
+
+            Assert.IsNotNull(bytesWritten);
+            CollectionAssert.AreEqual(bytesToWrite, bytesWritten);
 
             SftpSessionMock.Verify(p => p.RequestWrite(_handle, (uint) _length, It.IsAny<byte[]>(), 0, bytesToWrite.Length, It.IsAny<AutoResetEvent>(), null), Times.Once);
-            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(5));
+            SftpSessionMock.Verify(p => p.IsOpen, Times.Exactly(4));
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Common/ArrayBuilder.cs b/src/Renci.SshNet.Tests/Common/ArrayBuilder.cs
new file mode 100644
index 000000000..cff2e4c32
--- /dev/null
+++ b/src/Renci.SshNet.Tests/Common/ArrayBuilder.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Renci.SshNet.Tests.Common
+{
+    public class ArrayBuilder<T>
+    {
+        private List<T> _buffer;
+
+        public ArrayBuilder()
+        {
+            _buffer = new List<T>();
+        }
+
+        public ArrayBuilder<T> Add(T[] array)
+        {
+            return Add(array, 0, array.Length);
+        }
+
+        public ArrayBuilder<T> Add(T[] array, int index, int length)
+        {
+            for (var i = 0; i < length; i++)
+                _buffer.Add(array[index + i]);
+            return this;
+        }
+
+        public T[] Build()
+        {
+            return _buffer.ToArray();
+        }
+    }
+}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 5076c4b47..ba8825b3b 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -434,6 +434,12 @@
     <Compile Include="Classes\Sftp\Responses\SftpVersionResponseTest.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Dispose_Disposed.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Finalize_SessionOpen.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_NotReadFromBuffer.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_DataInBuffer_ReadFromBuffer.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_ReadMode_NoDataInBuffer.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_SessionNotOpen.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_DataInBuffer.cs" />
+    <Compile Include="Classes\Sftp\SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_LessDataThanReadBufferSizeAvailable.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs" />
     <Compile Include="Classes\Sftp\SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs" />
@@ -516,6 +522,7 @@
     <Compile Include="Classes\SubsystemSession_SendData_Disconnected.cs" />
     <Compile Include="Classes\SubsystemSession_SendData_Disposed.cs" />
     <Compile Include="Classes\SubsystemSession_SendData_NeverConnected.cs" />
+    <Compile Include="Common\ArrayBuilder.cs" />
     <Compile Include="Common\AsyncSocketListener.cs" />
     <Compile Include="Common\DictionaryAssert.cs" />
     <Compile Include="Common\Extensions.cs" />
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 02b20d2e6..8f51250ce 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -837,15 +837,8 @@ private byte[] GetOrCreateWriteBuffer()
         /// </summary>
         private void FlushReadBuffer()
         {
-            if (_canSeek)
-            {
-                if (_bufferPosition < _bufferLen)
-                {
-                    _position -= _bufferPosition;
-                }
-                _bufferPosition = 0;
-                _bufferLen = 0;
-            }
+            _bufferPosition = 0;
+            _bufferLen = 0;
         }
 
         /// <summary>

From 1b21b6dd146bc1bd9edf660474dac5d78f86ade7 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 16 Aug 2017 10:31:10 +0200
Subject: [PATCH 126/128] To improve compatibility of SftpClient with
 System.IO.File, the following methods now use UTF-8 encoding without a
 Byte-Order Mark (BOM): void AppendAllLines(string path, IEnumerable<string>
 contents) void AppendAllText(string path, string contents) StreamWriter
 AppendText(string path) StreamWriter CreateText(string path) void
 WriteAllLines(string path, IEnumerable<string> contents) void
 WriteAllLines(string path, string[] contents) void WriteAllText(string path,
 string contents)

---
 src/Renci.SshNet/SftpClient.cs | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 5cfc6a8bb..86e8368ef 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -18,6 +18,8 @@ namespace Renci.SshNet
     /// </summary>
     public class SftpClient : BaseClient
     {
+        private static readonly Encoding Utf8NoBOM = new UTF8Encoding(false, true);
+
         /// <summary>
         /// Holds the <see cref="ISftpSession"/> instance that is used to communicate to the
         /// SFTP server.
@@ -1006,6 +1008,9 @@ public SftpFileSytemInformation GetStatus(string path)
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM)
+        /// </remarks>
         public void AppendAllLines(string path, IEnumerable<string> contents)
         {
             CheckDisposed();
@@ -1057,6 +1062,9 @@ public void AppendAllLines(string path, IEnumerable<string> contents, Encoding e
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </remarks>
         public void AppendAllText(string path, string contents)
         {
             using (var stream = AppendText(path))
@@ -1088,7 +1096,8 @@ public void AppendAllText(string path, string contents, Encoding encoding)
         /// </summary>
         /// <param name="path">The path to the file to append to.</param>
         /// <returns>
-        /// A <see cref="StreamWriter"/> that appends UTF-8 encoded text to an existing file.
+        /// A <see cref="StreamWriter"/> that appends text to a file using UTF-8 encoding without a
+        /// Byte-Order Mark (BOM).
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
@@ -1096,7 +1105,7 @@ public void AppendAllText(string path, string contents, Encoding encoding)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public StreamWriter AppendText(string path)
         {
-            return AppendText(path, Encoding.UTF8);
+            return AppendText(path, Utf8NoBOM);
         }
 
         /// <summary>
@@ -1167,10 +1176,12 @@ public SftpFileStream Create(string path, int bufferSize)
         /// </summary>
         /// <param name="path">The file to be opened for writing.</param>
         /// <returns>
-        /// A <see cref="StreamWriter"/> that writes to the specified file using UTF-8 encoding.
+        /// A <see cref="StreamWriter"/> that writes text to a file using UTF-8 encoding without
+        /// a Byte-Order Mark (BOM).
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1182,7 +1193,7 @@ public SftpFileStream Create(string path, int bufferSize)
         /// </remarks>
         public StreamWriter CreateText(string path)
         {
-            return CreateText(path, Encoding.UTF8);
+            return CreateText(path, Utf8NoBOM);
         }
 
         /// <summary>
@@ -1586,6 +1597,9 @@ public void WriteAllBytes(string path, byte[] bytes)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </para>
+        /// <para>
         /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
         /// </para>
         /// <para>
@@ -1594,7 +1608,7 @@ public void WriteAllBytes(string path, byte[] bytes)
         /// </remarks>
         public void WriteAllLines(string path, IEnumerable<string> contents)
         {
-            WriteAllLines(path, contents, Encoding.UTF8);
+            WriteAllLines(path, contents, Utf8NoBOM);
         }
 
         /// <summary>
@@ -1607,6 +1621,9 @@ public void WriteAllLines(string path, IEnumerable<string> contents)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
+        /// </para>
+        /// <para>
         /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
         /// </para>
         /// <para>
@@ -1615,7 +1632,7 @@ public void WriteAllLines(string path, IEnumerable<string> contents)
         /// </remarks>
         public void WriteAllLines(string path, string[] contents)
         {
-            WriteAllLines(path, contents, Encoding.UTF8);
+            WriteAllLines(path, contents, Utf8NoBOM);
         }
 
         /// <summary>
@@ -1682,10 +1699,10 @@ public void WriteAllLines(string path, string[] contents, Encoding encoding)
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
+        /// <remarks>
         /// <para>
-        /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
+        /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
         /// </para>
-        /// <remarks>
         /// <para>
         /// If the target file already exists, it is overwritten. It is not first truncated to zero bytes.
         /// </para>

From 8f777f1fc74660785a295364af43dbafa9404cc0 Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 16 Aug 2017 10:36:07 +0200
Subject: [PATCH 127/128] SftpClient: Document that the following overloads
 create the specified file if it does not already exist: AppendAllLines
 AppendAllText AppendText

---
 src/Renci.SshNet/SftpClient.cs | 40 ++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 86e8368ef..6403ce88d 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1000,13 +1000,13 @@ public SftpFileSytemInformation GetStatus(string path)
         #region File Methods
 
         /// <summary>
-        /// Appends lines to a file, and closes the file.
+        /// Appends lines to a file, creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The file to append the lines to. The file is created if it does not already exist.</param>
         /// <param name="contents">The lines to append to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is<b>null</b> <para>-or-</para> <paramref name="contents"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM)
@@ -1028,14 +1028,14 @@ public void AppendAllLines(string path, IEnumerable<string> contents)
         }
 
         /// <summary>
-        /// Appends lines to a file by using a specified encoding, and closes the file.
+        /// Appends lines to a file by using a specified encoding, creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The file to append the lines to. The file is created if it does not already exist.</param>
         /// <param name="contents">The lines to append to the file.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void AppendAllLines(string path, IEnumerable<string> contents, Encoding encoding)
         {
@@ -1054,13 +1054,13 @@ public void AppendAllLines(string path, IEnumerable<string> contents, Encoding e
         }
 
         /// <summary>
-        /// Appends the specified string to the file, and closes the file. 
+        /// Appends the specified string to the file, creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The file to append the specified string to.</param>
         /// <param name="contents">The string to append to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// The characters are written to the file using UTF-8 encoding without a Byte-Order Mark (BOM).
@@ -1074,14 +1074,14 @@ public void AppendAllText(string path, string contents)
         }
 
         /// <summary>
-        /// Appends the specified string to the file, and closes the file.
+        /// Appends the specified string to the file, creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The file to append the specified string to.</param>
         /// <param name="contents">The string to append to the file.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="contents"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void AppendAllText(string path, string contents, Encoding encoding)
         {
@@ -1092,7 +1092,8 @@ public void AppendAllText(string path, string contents, Encoding encoding)
         }
 
         /// <summary>
-        /// Creates a <see cref="StreamWriter"/> that appends UTF-8 encoded text to an existing file.
+        /// Creates a <see cref="StreamWriter"/> that appends UTF-8 encoded text to the specified file,
+        /// creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The path to the file to append to.</param>
         /// <returns>
@@ -1101,7 +1102,7 @@ public void AppendAllText(string path, string contents, Encoding encoding)
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public StreamWriter AppendText(string path)
         {
@@ -1109,16 +1110,17 @@ public StreamWriter AppendText(string path)
         }
 
         /// <summary>
-        /// Creates a <see cref="StreamWriter"/> that appends text to an existing file using the specified encoding.
+        /// Creates a <see cref="StreamWriter"/> that appends text to a file using the specified
+        /// encoding, creating the file if it does not already exist.
         /// </summary>
         /// <param name="path">The path to the file to append to.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <returns>
-        /// A <see cref="StreamWriter"/> that appends text to an existing file using the specified encoding.
+        /// A <see cref="StreamWriter"/> that appends text to a file using the specified encoding.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>. <para>-or-</para> <paramref name="encoding"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
-        /// <exception cref="SftpPathNotFoundException"><paramref name="path"/> was not found on the remote host.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public StreamWriter AppendText(string path, Encoding encoding)
         {
@@ -1139,6 +1141,7 @@ public StreamWriter AppendText(string path, Encoding encoding)
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// If the target file already exists, it is first truncated to zero bytes.
@@ -1160,6 +1163,7 @@ public SftpFileStream Create(string path)
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// If the target file already exists, it is first truncated to zero bytes.
@@ -1202,10 +1206,11 @@ public StreamWriter CreateText(string path)
         /// <param name="path">The file to be opened for writing.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <returns>
-        /// A <see cref="StreamWriter"/> that writes to the specified file using the specified encoding.
+        /// A <see cref="StreamWriter"/> that writes to a file using the specified encoding.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1570,6 +1575,7 @@ public void SetLastWriteTimeUtc(string path, DateTime lastWriteTimeUtc)
         /// <param name="bytes">The bytes to write to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1594,6 +1600,7 @@ public void WriteAllBytes(string path, byte[] bytes)
         /// <param name="contents">The lines to write to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1618,6 +1625,7 @@ public void WriteAllLines(string path, IEnumerable<string> contents)
         /// <param name="contents">The string array to write to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1643,6 +1651,7 @@ public void WriteAllLines(string path, string[] contents)
         /// <param name="encoding">The character encoding to use.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1671,6 +1680,7 @@ public void WriteAllLines(string path, IEnumerable<string> contents, Encoding en
         /// <param name="encoding">An <see cref="Encoding"/> object that represents the character encoding applied to the string array.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1698,6 +1708,7 @@ public void WriteAllLines(string path, string[] contents, Encoding encoding)
         /// <param name="contents">The string to write to the file.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>
@@ -1726,6 +1737,7 @@ public void WriteAllText(string path, string contents)
         /// <param name="encoding">The encoding to apply to the string.</param>
         /// <exception cref="ArgumentNullException"><paramref name="path"/> is <b>null</b>.</exception>
         /// <exception cref="SshConnectionException">Client is not connected.</exception>
+        /// <exception cref="SftpPathNotFoundException">The specified path is invalid, or its directory was not found on the remote host.</exception>
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         /// <remarks>
         /// <para>

From b34e1c05a46b2458b45f209d774dfcfc54b5785e Mon Sep 17 00:00:00 2001
From: Gert Driesen <gert.driesen@telenet.be>
Date: Wed, 16 Aug 2017 18:58:24 +0200
Subject: [PATCH 128/128] Do not set DEBUG and TRACE for Release config.

---
 src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
index f68f35c6f..e8d4ac91a 100644
--- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
+++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyTitle>SSH.NET</AssemblyTitle>
     <TargetFramework>netstandard1.3</TargetFramework>
-    <WarningsAsErrors>true</WarningsAsErrors>
+	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Renci.SshNet</AssemblyName>
     <AssemblyOriginatorKeyFile>../Renci.SshNet.snk</AssemblyOriginatorKeyFile>
@@ -102,7 +102,7 @@
     <Compile Update="..\Renci.SshNet\Sftp\SftpMessageFactory.cs" Link="Sftp\SftpResponseFactory.cs" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>TRACE;DEBUG;FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
+    <DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugType>portable</DebugType>